diff Indoor.cpp @ 1025:8b492d4722d4

Intersection
author Ritor1
date Tue, 21 May 2013 12:42:57 +0600
parents 0d96349d8c87
children 6afa77761a00
line wrap: on
line diff
--- a/Indoor.cpp	Wed May 15 09:32:39 2013 +0600
+++ b/Indoor.cpp	Tue May 21 12:42:57 2013 +0600
@@ -395,36 +395,36 @@
 }
 
 //----- (004C0EF2) --------------------------------------------------------
-void BLVFace::FromODM(ODMFace *a2)
+void BLVFace::FromODM(ODMFace *face)
 {
-  this->pFacePlane_old.vNormal.x = a2->pFacePlane.vNormal.x;
-  this->pFacePlane_old.vNormal.y = a2->pFacePlane.vNormal.y;
-  this->pFacePlane_old.vNormal.z = a2->pFacePlane.vNormal.z;
-  this->pFacePlane_old.dist = a2->pFacePlane.dist;
-  this->pFacePlane.vNormal.x = (double)(a2->pFacePlane.vNormal.x & 0xFFFF) * 0.000015259022
-                             + (double)(a2->pFacePlane.vNormal.x >> 16);
-  this->pFacePlane.vNormal.y = (double)(a2->pFacePlane.vNormal.y & 0xFFFF) * 0.000015259022
-                             + (double)(a2->pFacePlane.vNormal.y >> 16);
-  this->pFacePlane.vNormal.z = (double)(a2->pFacePlane.vNormal.z & 0xFFFF) * 0.000015259022
-                             + (double)(a2->pFacePlane.vNormal.z >> 16);
-  this->pFacePlane.dist = (double)(a2->pFacePlane.dist & 0xFFFF) * 0.000015259022 + (double)(a2->pFacePlane.dist >> 16);
-  this->uAttributes = a2->uAttributes;
-  this->pBounding.x1 = a2->pBoundingBox.x1;
-  this->pBounding.y1 = a2->pBoundingBox.y1;
-  this->pBounding.z1 = a2->pBoundingBox.z1;
-  this->pBounding.x2 = a2->pBoundingBox.x2;
-  this->pBounding.y2 = a2->pBoundingBox.y2;
-  this->pBounding.z2 = a2->pBoundingBox.z2;
-  this->zCalc1 = a2->zCalc1;
-  this->zCalc2 = a2->zCalc2;
-  this->zCalc3 = a2->zCalc3;
-  this->pXInterceptDisplacements = a2->pXInterceptDisplacements;
-  this->pYInterceptDisplacements = a2->pYInterceptDisplacements;
-  this->pZInterceptDisplacements = a2->pZInterceptDisplacements;
-  this->uPolygonType = (PolygonType)a2->uPolygonType;
-  this->uNumVertices = a2->uNumVertices;
-  this->uBitmapID = a2->uTextureID;
-  this->pVertexIDs = a2->pVertexIDs;
+  this->pFacePlane_old.vNormal.x = face->pFacePlane.vNormal.x;
+  this->pFacePlane_old.vNormal.y = face->pFacePlane.vNormal.y;
+  this->pFacePlane_old.vNormal.z = face->pFacePlane.vNormal.z;
+  this->pFacePlane_old.dist = face->pFacePlane.dist;
+  this->pFacePlane.vNormal.x = (double)(face->pFacePlane.vNormal.x & 0xFFFF) * 0.000015259022
+                             + (double)(face->pFacePlane.vNormal.x >> 16);
+  this->pFacePlane.vNormal.y = (double)(face->pFacePlane.vNormal.y & 0xFFFF) * 0.000015259022
+                             + (double)(face->pFacePlane.vNormal.y >> 16);
+  this->pFacePlane.vNormal.z = (double)(face->pFacePlane.vNormal.z & 0xFFFF) * 0.000015259022
+                             + (double)(face->pFacePlane.vNormal.z >> 16);
+  this->pFacePlane.dist = (double)(face->pFacePlane.dist & 0xFFFF) * 0.000015259022 + (double)(face->pFacePlane.dist >> 16);
+  this->uAttributes = face->uAttributes;
+  this->pBounding.x1 = face->pBoundingBox.x1;
+  this->pBounding.y1 = face->pBoundingBox.y1;
+  this->pBounding.z1 = face->pBoundingBox.z1;
+  this->pBounding.x2 = face->pBoundingBox.x2;
+  this->pBounding.y2 = face->pBoundingBox.y2;
+  this->pBounding.z2 = face->pBoundingBox.z2;
+  this->zCalc1 = face->zCalc1;
+  this->zCalc2 = face->zCalc2;
+  this->zCalc3 = face->zCalc3;
+  this->pXInterceptDisplacements = face->pXInterceptDisplacements;
+  this->pYInterceptDisplacements = face->pYInterceptDisplacements;
+  this->pZInterceptDisplacements = face->pZInterceptDisplacements;
+  this->uPolygonType = (PolygonType)face->uPolygonType;
+  this->uNumVertices = face->uNumVertices;
+  this->uBitmapID = face->uTextureID;
+  this->pVertexIDs = face->pVertexIDs;
 }
 
 //----- (004B0A25) --------------------------------------------------------