diff Indoor.cpp @ 1294:6bbd50bda571

Слияние
author Ritor1
date Mon, 17 Jun 2013 09:09:30 +0600
parents 24bc24b64ec2 8a196c858180
children 86a83e12d795
line wrap: on
line diff
--- a/Indoor.cpp	Mon Jun 17 09:09:03 2013 +0600
+++ b/Indoor.cpp	Mon Jun 17 09:09:30 2013 +0600
@@ -347,7 +347,7 @@
 		  v4 = pRenderer->uTargetSurfacePitch * pNode->field_C._viewport_space_y;
 		  if ( pNode->field_C._viewport_space_y <= pNode->field_C._viewport_space_w )
 		  {
-			//v5 = (char *)&pBspRenderer->nodes[0].field_C.viewport_right_side[pNode->field_C._viewport_space_y + v7];
+			//v5 = (char *)&pBspRenderer->nodes[0].field_C.array_3D8[pNode->field_C._viewport_space_y + v7];
 			v5 = &pNode->field_C.viewport_right_side[pNode->field_C._viewport_space_y];
 			v8 = &pNode->field_C.viewport_left_side[pNode->field_C._viewport_space_y];
 			do
@@ -1259,8 +1259,8 @@
   //stru170 *v4; // ebx@1
   //BLVFace *v5; // eax@1
   //int v6; // ecx@2
-  unsigned __int16 TransitionSectorID; // ax@11
-  //Vec3_short_ *v8; // esi@15
+  unsigned __int16 v7; // ax@11
+  Vec3_short_ *v8; // esi@15
   int v9; // edx@15
   //signed int v10; // eax@18
   //signed int v11; // edi@19
@@ -1326,16 +1326,16 @@
                                           + pBLVRenderParams->vPartyPos.y * pFace->pFacePlane_old.vNormal.y
                                           + pBLVRenderParams->vPartyPos.z * pFace->pFacePlane_old.vNormal.z) <= 589824 ) // we sure are standing at the portal plane
       {
-        TransitionSectorID = pFace->uSectorID;
-        if ( nodes[0].uSectorID == TransitionSectorID )  // draw back sector
-          TransitionSectorID = pFace->uBackSectorID;
-        nodes[num_nodes].uSectorID = TransitionSectorID;
+        v7 = pFace->uSectorID;
+        if ( nodes[0].uSectorID == v7 )  // draw back sector
+          v7 = pFace->uBackSectorID;
+        nodes[num_nodes].uSectorID = v7;
         nodes[num_nodes].uFaceID = uFaceID;
         nodes[num_nodes].uViewportX = pBLVRenderParams->uViewportX;
         nodes[num_nodes].uViewportZ = pBLVRenderParams->uViewportZ;
         nodes[num_nodes].uViewportY = pBLVRenderParams->uViewportY;
         nodes[num_nodes].uViewportW = pBLVRenderParams->uViewportW;
-        nodes[num_nodes].field_C.GetViewportData(pBLVRenderParams->uViewportX, pBLVRenderParams->uViewportY,
+        nodes[num_nodes].field_C._43F9E1(pBLVRenderParams->uViewportX, pBLVRenderParams->uViewportY,
                                          pBLVRenderParams->uViewportZ, pBLVRenderParams->uViewportW);
         AddBspNodeToRenderList(++num_nodes - 1);
         return;
@@ -1344,10 +1344,10 @@
       //v6 = a0;
     }
 
-    //  
-    v9 = pFace->pFacePlane_old.vNormal.x * (pIndoor->pVertices[pFace->pVertexIDs[0]].x - pBLVRenderParams->vPartyPos.x)
-       + pFace->pFacePlane_old.vNormal.y * (pIndoor->pVertices[pFace->pVertexIDs[0]].y - pBLVRenderParams->vPartyPos.y)
-       + pFace->pFacePlane_old.vNormal.z * (pIndoor->pVertices[pFace->pVertexIDs[0]].z - pBLVRenderParams->vPartyPos.z);
+    v8 = &pIndoor->pVertices[pFace->pVertexIDs[0]];
+    v9 = pFace->pFacePlane_old.vNormal.x * (v8->x - pBLVRenderParams->vPartyPos.x)
+       + pFace->pFacePlane_old.vNormal.y * (v8->y - pBLVRenderParams->vPartyPos.y)
+       + pFace->pFacePlane_old.vNormal.z * (v8->z - pBLVRenderParams->vPartyPos.z);
     if (p->uSectorID != pFace->uSectorID)
       v9 = -v9;
     if (v9 >= 0)
@@ -1491,7 +1491,7 @@
         v3->nodes[v3->num_nodes].uViewportZ = LOWORD(pBLVRenderParams->uViewportZ);
         v3->nodes[v3->num_nodes].uViewportY = LOWORD(pBLVRenderParams->uViewportY);
         v3->nodes[v3->num_nodes].uViewportW = LOWORD(pBLVRenderParams->uViewportW);
-        v3->nodes[v3->num_nodes++].field_C.GetViewportData(
+        v3->nodes[v3->num_nodes++].field_C._43F9E1(
           SLOWORD(pBLVRenderParams->uViewportX),
           pBLVRenderParams->uViewportY,
           SLOWORD(pBLVRenderParams->uViewportZ),