diff Outdoor.cpp @ 2153:d28d3c006077

Some Render decoupling.
author Nomad
date Thu, 09 Jan 2014 02:34:20 +0200
parents d44b7775fc06
children 9bd7522cdbbb eaaaa50d34e9
line wrap: on
line diff
--- a/Outdoor.cpp	Thu Jan 09 01:37:34 2014 +0200
+++ b/Outdoor.cpp	Thu Jan 09 02:34:20 2014 +0200
@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
 #include "stru6.h"
 #include "Weather.h"
 #include "Sprites.h"
@@ -93,7 +89,7 @@
   if (viewparams->draw_d3d_outlines)
     pGame->pIndoorCameraD3D->debug_flags |= ODM_RENDER_DRAW_D3D_OUTLINES;
 
-  if (bRedraw || pRenderer->pRenderD3D)
+  if (bRedraw || true/*pRenderer->pRenderD3D*/)
   {
     //pODMRenderParams->RotationToInts();
     sub_481ED9_MessWithODMRenderParams();
@@ -112,16 +108,15 @@
   pOutdoor->UpdateFog();
   //pGame->pIndoorCameraD3D->sr_Reset_list_0037C();
 
-  if (pRenderer->pRenderD3D) // d3d - redraw always
+  //if (pRenderer->pRenderD3D) // d3d - redraw always
   {
     pRenderer->DrawOutdoorSkyD3D();
     pRenderer->DrawBuildingsD3D();
     pRenderer->RenderTerrainD3D();
   }
-  else
+  /*else
   {
-    __debugbreak(); // no SW Rendering
-    /*if (!bRedraw)
+    if (!bRedraw)
       pRenderer->OnOutdoorRedrawSW();
     else
     {
@@ -129,8 +124,8 @@
       pRenderer->DrawBezierTerrain();
       sr_sub_486F92_MessWithEdgesAndSpans();
       pODMRenderParams->ApplyLightmapsSW();
-    }*/
-  }
+    }
+  }*/
 
 
   pMobileLightsStack->uNumLightsActive = 0;
@@ -149,7 +144,7 @@
     pOutdoor->UpdateDiscoveredArea(v5, v4, 1);
   }
   pGame->uFlags2 &= 0xFFFFFFFEu;
-  if (pRenderer->pRenderD3D && pRenderer->bUsingSpecular)
+  if (/*pRenderer->pRenderD3D*/true && pRenderer->bUsingSpecular)
     pGame->pLightmapBuilder->uFlags |= 1u;
   else
     pGame->pLightmapBuilder->uFlags &= 0xFFFFFFFEu;