diff Render.cpp @ 1441:b67a3e0d6fc3

Слияние
author Ritor1
date Sat, 27 Jul 2013 09:36:55 +0600
parents 468f434a8d8a 38df78aba732
children a8b1bbac95d4
line wrap: on
line diff
--- a/Render.cpp	Sat Jul 27 09:36:29 2013 +0600
+++ b/Render.cpp	Sat Jul 27 09:36:55 2013 +0600
@@ -25,7 +25,6 @@
 #include "Time.h"
 #include "Game.h"
 #include "LightmapBuilder.h"
-#include "stru220.h"
 #include "ObjectList.h"
 #include "SpriteObject.h"
 #include "DecorationList.h"
@@ -517,7 +516,7 @@
       v6 = abs(v83);//v6 = 13108
       --X;
       //__debugbreak(); // uncoment & refactor following large if
-      v93 = (int)&stru_76E5C8[(v5 << 7) + v6];
+      v93 = (int)&terrain_76E5C8[(v5 << 7) + v6];
       /*if ( !v93->field_0 || ((v7 = 48 * v4, v8 = &pVerticesSR_806210[v4], a2 = v8, !v82) ? (v9 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7),
                                                                        v10 = &pVerticesSR_806210[1] + v7) : (v9 = &pVerticesSR_806210[1] + v7, v10 = (RenderVertexSoft *)((char *)&pVerticesSR_801A10 + v7)),
              ((a8 = v9,
@@ -538,8 +537,8 @@
                WorldPosToGridCellZ(sY),
                !byte_4D864C)
            || !(pGame->uFlags & 0x80))
-          && !sub_481EFA(v8, v9, v101, pVertices, 1)) )*/
-      /*if ( !&stru_76E5C8[(v5 << 7) + v6] )
+          && !_481EFA_clip_terrain_poly(v8, v9, v101, pVertices, 1)) )*/
+      /*if ( !&terrain_76E5C8[(v5 << 7) + v6] )
         goto LABEL_162*/
       v8 = &pVerticesSR_806210[v4];
       //pVertices2 = &pVerticesSR_801A10[v4 + 1];
@@ -560,7 +559,7 @@
       v97 = WorldPosToGridCellZ(floorf((pVertices->vWorldPosition.z + v8->vWorldPosition.z) / 2 + 0.5f));
       /*WorldPosToGridCellX(sX);
       WorldPosToGridCellZ(sY);
-      if ((!byte_4D864C || !(pGame->uFlags & 0x80)) && !sub_481EFA(v8, pVertices, v101, pVertices2, 1))
+      if ((!byte_4D864C || !(pGame->uFlags & 0x80)) && !_481EFA_clip_terrain_poly(v8, pVertices, v101, pVertices2, 1))
         if ( v8->vWorldPosition.y != pVertices->vWorldPosition.y || pVertices->vWorldPosition.y != pVertices2->vWorldPosition.y 
              || pVertices2->vWorldPosition.y != v101->vWorldPosition.y )
           break;*/
@@ -572,6 +571,7 @@
           pTile->field_32 = 0;
           pTile->field_59 = 1;
           pTile->terrain_grid_x = (char)v97;
+          __debugbreak(); // warning C4700: uninitialized local variable 'v93' used
           pTile->field_34 = *(_WORD *)(v93 + 2);
           pTile->terrain_grid_z = v89;
           v22 = pTerrainNormalIndices[2 * (v97 + 128 * v89) + 1];
@@ -589,12 +589,13 @@
           if ( pOutdoorCamera->uNumPolygons >= 1999 )
             return;
           ++pOutdoorCamera->uNumPolygons;
-          //if ( !sub_481FC9(v8, pVertices, v101, v16) )//Ritor1: It's temporary
+          //if ( !_481FC9_terrain(v8, pVertices, v101, v16) )//Ritor1: It's temporary
           //goto LABEL_126;
           //{
             //--pOutdoorCamera->uNumPolygons;
             //goto LABEL_162;
           //}
+          __debugbreak(); // warning C4700: uninitialized local variable 'v102' used
           memcpy(&array_50AC10[0], v102, 0x30u);
           array_50AC10[0]._rhw = 1.0 / (v102->vWorldViewPosition.x + 0.0000001000000011686097);
           array_50AC10[0].u = 0.0;
@@ -603,6 +604,7 @@
           array_50AC10[1]._rhw = 1.0 / (pVertices->vWorldViewPosition.x + 0.0000001000000011686097);
           array_50AC10[1].u = 0.0;
           array_50AC10[1].v = 1.0;
+          __debugbreak(); // warning C4700: uninitialized local variable 'pVertices2' used
           memcpy(&array_50AC10[2], pVertices2, sizeof(array_50AC10[2]));
           array_50AC10[2]._rhw = 1.0 / (pVertices2->vWorldViewPosition.x + 0.0000001000000011686097);
           array_50AC10[2].u = 1.0;
@@ -728,7 +730,7 @@
       if ( pOutdoorCamera->uNumPolygons >= 1999 )
         return;
       ++pOutdoorCamera->uNumPolygons;
-      /*if ( !sub_481FC9(pVertices, pVertices2, v8, v40) ) // Ritor1: It's temporary
+      /*if ( !_481FC9_terrain(pVertices, pVertices2, v8, v40) ) // Ritor1: It's temporary
         //goto LABEL_77;
         {
           --pOutdoorCamera->uNumPolygons;
@@ -857,7 +859,7 @@
       if ( pOutdoorCamera->uNumPolygons >= 1999 )
         return;
       ++pOutdoorCamera->uNumPolygons;
-      if ( !sub_481FC9(v101, v102, pVertices2, v59) )
+      if ( !_481FC9_terrain(v101, v102, pVertices2, v59) )
       {
 //LABEL_126:
         --pOutdoorCamera->uNumPolygons;
@@ -1012,11 +1014,12 @@
     billboard.uFlags = pBillboard->field_1E;
     if (pBillboard->uHwSpriteID != -1)
     {
-      if (pRenderer->pRenderD3D)
+      if (!pRenderer->pRenderD3D) __debugbreak(); // no sw rendering
+      //if (pRenderer->pRenderD3D)
         pRenderer->TransformBillboard(&billboard,
                                       &pSprites_LOD->pHardwareSprites[pBillboard->uHwSpriteID],
                                       pBillboard->dimming_level, pBillboard);
-      else
+      /*else
       {
           assert(false);
 
@@ -1024,7 +1027,7 @@
           if ( *(v1 - 10) & 2 )
             v9 = PaletteManager::Get_Dark_or_Red_LUT(*((short *)v1 - 7), 0, 1);
           else
-            v9 = GetBillboardPalette((RenderBillboard *)(v1 - 40), *((short *)v1 - 7), pBillboard->sZValue, *((short *)v1 + 1));
+            v9 = sr_GetBillboardPalette((RenderBillboard *)(v1 - 40), *((short *)v1 - 7), pBillboard->sZValue, *((short *)v1 + 1));
           v10 = (*(v1 - 9) & 1) == 0;
           billboard.pPalette = v9;
           if ( !v10 )
@@ -1039,7 +1042,7 @@
           v13 = *((short *)v1 - 8);
           if ( v13 >= 0 )
             pSprites_LOD->pSpriteHeaders[v13].DrawSprite_sw(&billboard, 1);
-      }
+      }*/
     }
   }
 }
@@ -2356,6 +2359,7 @@
     if ( v9 == v10 )
     {
       ddsd2.dwFlags = 0x1007u;
+      __debugbreak(); // warning C4700: uninitialized local variable 'v11' used
       ddsd2.ddsCaps.dwCaps = v11;
       goto LABEL_12;
     }
@@ -3076,7 +3080,9 @@
         Dst = 124;
         if ( !pRenderer->LockSurface_DDraw4(pRenderer->pBackBuffer4, (DDSURFACEDESC2 *)&Dst, DDLOCK_WAIT) )
           return;
+        __debugbreak(); // warning C4700: uninitialized local variable 'v20' used
         v42 = v20;
+        __debugbreak(); // warning C4700: uninitialized local variable 'v19' used
         v6 = v19 >> 1;
         v3 = 0;
       }
@@ -4794,6 +4800,7 @@
     pFrontBuffer = (IDirectDrawSurface *)v1->pFrontBuffer2;
     ppBackBuffer = (IDirectDrawSurface **)&v1->pBackBuffer2;
   }
+  __debugbreak(); // warning C4700: uninitialized local variable 'v6' used
   v9 = (int)v6;
   v10 = pFrontBuffer;                           // BUG
 
@@ -5457,6 +5464,7 @@
           {
             d3d_vertex_buffer[i].specular = 0;
 		  }
+          __debugbreak(); // warning C4700: uninitialized local variable 'v20' used
 		  d3d_vertex_buffer[i].specular = v20;
 		  d3d_vertex_buffer[i].texcoord.x = array_50AC10[i].u;
 		  d3d_vertex_buffer[i].texcoord.y = array_50AC10[i].v;