Mercurial > mm7

diff stru10.cpp @ 1640:afc1c3514dd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
author Nomad
date Tue, 17 Sep 2013 17:40:59 +0200
parents c4ab816fcc5e
children 30c2b575d25c
line wrap: on
line diff
--- a/stru10.cpp	Tue Sep 17 15:40:36 2013 +0200
+++ b/stru10.cpp	Tue Sep 17 17:40:59 2013 +0200
@@ -668,9 +668,9 @@
   RenderVertexSoft v25; // [sp+10h] [bp-90h]@20
   memcpy(&v25, pOutBounding, sizeof(RenderVertexSoft));
 
-  float _dp = (v25.vWorldPosition.x - pBLVRenderParams->vPartyPos.x) * a1.x +
-              (v25.vWorldPosition.y - pBLVRenderParams->vPartyPos.y) * a1.y +
-              (v25.vWorldPosition.z - pBLVRenderParams->vPartyPos.z) * a1.z;
+  float _dp = (v25.vWorldPosition.x - pGame->pIndoorCameraD3D->vPartyPos.x) * a1.x +
+              (v25.vWorldPosition.y - pGame->pIndoorCameraD3D->vPartyPos.y) * a1.y +
+              (v25.vWorldPosition.z - pGame->pIndoorCameraD3D->vPartyPos.z) * a1.z;
   if (fabs(_dp) < 1e-6f)
   {
     memcpy(&v25, &pOutBounding[1], sizeof(RenderVertexSoft));
@@ -784,9 +784,9 @@
 char stru10::_49C720(RenderVertexSoft *pFaceBounding, IndoorCameraD3D_Vec4 *pPortalDataFrustum)
 {
   Vec3_float_ pRayStart; // [sp+4h] [bp-34h]@1
-  pRayStart.x = (double)pBLVRenderParams->vPartyPos.x;
-  pRayStart.y = (double)pBLVRenderParams->vPartyPos.y;
-  pRayStart.z = (double)pBLVRenderParams->vPartyPos.z;
+  pRayStart.x = (double)pGame->pIndoorCameraD3D->vPartyPos.x;
+  pRayStart.y = (double)pGame->pIndoorCameraD3D->vPartyPos.y;
+  pRayStart.z = (double)pGame->pIndoorCameraD3D->vPartyPos.z;
 
   if (FindFaceNormal(&pFaceBounding[0], &pFaceBounding[1], &pRayStart, &pPortalDataFrustum[0]) &&
       FindFaceNormal(&pFaceBounding[1], &pFaceBounding[2], &pRayStart, &pPortalDataFrustum[1]) &&