diff IndoorCameraD3D.cpp @ 182:6416ded80dcf

Слияние
author Ritor1
date Thu, 14 Feb 2013 22:38:54 +0600
parents ee11772d0ad2
children ecfb1b3c9a39
line wrap: on
line diff
--- a/IndoorCameraD3D.cpp	Thu Feb 14 22:38:44 2013 +0600
+++ b/IndoorCameraD3D.cpp	Thu Feb 14 22:38:54 2013 +0600
@@ -1336,7 +1336,7 @@
       v8 += 48;
       *(float *)(pOutNumVerticesa + v9) = *(float *)v9;
       *(float *)(pVerticesa + v9) = *(float *)(v9 + 28);
-      *(float *)((char *)&static_4371C3_array_50E5E0[0].flt_20 - (char *)v6 + v9) = *(float *)(v9 + 32);
+      *(float *)((char *)&static_4371C3_array_50E5E0[0]._rhw - (char *)v6 + v9) = *(float *)(v9 + 32);
       v9 += 48;
     }
     while ( v12 < (signed int)*v7 );
@@ -1368,7 +1368,7 @@
   if ( (signed int)uNumInVertices > 0 )
   {
     pOutVertices_ = (char *)&pOutVertices->vWorldViewProjY;
-    v7 = (char *)&pInVertices->flt_20;
+    v7 = (char *)&pInVertices->_rhw;
     v8 = (char *)pOutVertices - (char *)pInVertices;
     a2a = uNumInVertices;
     do
@@ -1451,7 +1451,7 @@
           v10 = pOutVertices;
         }
         v10[*pOutNumVertices_].vWorldViewPosition.x = v6;
-        v10[*pOutNumVertices_].flt_20 = 1.0 / v6;
+        v10[*pOutNumVertices_]._rhw = 1.0 / v6;
         if ( v7 )
         {
           v13 = (unsigned int)&v10[*pOutNumVertices_];
@@ -1478,7 +1478,7 @@
         if ( a1a )
         {
           memcpy(&v10[*pOutNumVertices_], v8 - 36, sizeof(v10[*pOutNumVertices_]));
-          pOutVertices[*pOutNumVertices_].flt_20 = 1.0 / (*((float *)v8 - 6) + 0.0000001);
+          pOutVertices[*pOutNumVertices_]._rhw = 1.0 / (*((float *)v8 - 6) + 0.0000001);
           pOutVertices[(*pOutNumVertices_)++].flt_2C = *((float *)v8 + 2);
         }
         v7 = a1a;
@@ -1548,7 +1548,7 @@
           v8 = pOutVertices;
         }
         v8[*pOutNumVertices].vWorldViewPosition.x = 8.0;
-        v8[*pOutNumVertices].flt_20 = 0.125;
+        v8[*pOutNumVertices]._rhw = 0.125;
         if ( v5 )
         {
           v11 = (unsigned int)&v8[*pOutNumVertices];
@@ -1575,7 +1575,7 @@
         if ( a1a )
         {
           memcpy(&v8[*pOutNumVertices], v6 - 36, sizeof(v8[*pOutNumVertices]));
-          pOutVertices[(*pOutNumVertices)++].flt_20 = 1.0 / (*((float *)v6 - 6) + 0.0000001);
+          pOutVertices[(*pOutNumVertices)++]._rhw = 1.0 / (*((float *)v6 - 6) + 0.0000001);
         }
         v5 = a1a;
         v6 += 48;