Mercurial > mm7

diff Outdoor.cpp @ 1391:cc9a3a24d61d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved stru11, stru12 and some SW Rendering stuff to the archives. stru148 -> struct Polygon
author Nomad
date Thu, 18 Jul 2013 14:42:54 +0200
parents 9749edd941c6
children 38df78aba732
line wrap: on
line diff
--- a/Outdoor.cpp	Thu Jul 18 04:08:20 2013 +0200
+++ b/Outdoor.cpp	Thu Jul 18 14:42:54 2013 +0200
@@ -36,6 +36,7 @@
 
 #include "MapInfo.h"
 #include "OutdoorCamera.h"
+#include "Outdoor_stuff.h"
 #include "BSPModel.h"
 #include "GUIWindow.h"
 
@@ -46,7 +47,7 @@
 
 
 stru149 stru_8019C8;
-std::array<stru148, 2000 + 18000> array_77EC08;
+std::array<struct Polygon, 2000 + 18000> array_77EC08;
 Surf stru_80C980;
 Edge defaultEdge; // weak
 Edge stru_80C9A4;
@@ -106,7 +107,7 @@
   pIndoorCamera->pos.z = pParty->vPosition.z + pParty->sEyelevel;
   if (bRedraw || pRenderer->pRenderD3D)
   {
-    ResetStru148s();
+    ResetPolygons();
     pOutdoorCamera->RotationToInts();
     sub_481ED9_MessWithOutdoorCamera();
   }
@@ -125,43 +126,36 @@
   if ( pParty->uCurrentMinute != pOutdoor->uLastSunlightUpdateMinute )
     pOutdoor->UpdateSunlightVectors();
   pOutdoor->UpdateFog();
-  pGame->pIndoorCameraD3D->Reset_list_0037C();
-  if (!bRedraw)
-  {
-    if ( !pRenderer->pRenderD3D )
-    {
-      pRenderer->OnOutdoorRedrawSW();
-    }
-	else
-	{
-		pRenderer->DrawSkyD3D();
-		pRenderer->DrawBuildingsD3D();
-		pRenderer->RenderTerrainD3D();
-		//pRenderer->DrawBezierTerrain();// Ritor1: temporarily lag
-	}
-  }
-  else if (pRenderer->pRenderD3D)
+  //pGame->pIndoorCameraD3D->sr_Reset_list_0037C();
+
+  if (pRenderer->pRenderD3D) // d3d - redraw always
   {
     pRenderer->DrawSkyD3D();
     pRenderer->DrawBuildingsD3D();
     pRenderer->RenderTerrainD3D();
-    //pRenderer->DrawBezierTerrain();// Ritor1: temporarily lag
   }
   else
   {
-	pRenderer->DrawBuildingsSW();
-	pRenderer->RenderTerrainD3D();
-	//pRenderer->DrawBezierTerrain();// Ritor1: temporarily lag
-	sr_sub_486F92_MessWithEdgesAndSpans();
-	pOutdoorCamera->_487355();
+    __debugbreak(); // no SW Rendering
+    /*if (!bRedraw)
+      pRenderer->OnOutdoorRedrawSW();
+    else
+    {
+      pRenderer->DrawBuildingsSW();  
+      pRenderer->DrawBezierTerrain();
+      sr_sub_486F92_MessWithEdgesAndSpans();
+      pOutdoorCamera->_487355();
+    }*/
   }
+
+
   pMobileLightsStack->uNumLightsActive = 0;
   pStationaryLightsStack->uNumLightsActive = 0;
-  if ( !pRenderer->pRenderD3D )
+  /*if ( !pRenderer->pRenderD3D )
   {
     pRenderer->ExecOutdoorDrawSW();
-    pGame->pIndoorCameraD3D->_438240_draw_lits();
-  }
+    pGame->pIndoorCameraD3D->sr_438240_draw_lits();
+  }*/
   pGame->PushStationaryLights(-1);
   pGame->PrepareBloodsplats();
   if (bRedraw)
@@ -187,7 +181,7 @@
 
   pRenderer->DrawSpriteObjects_ODM();
   pRenderer->TransformBillboardsAndSetPalettesODM();
-  sub_485F53((Vec2_int_ *)unnamed_6BE060.data());
+  //sr_485F53((Vec2_int_ *)sr_6BE060.data());
 }
 
 
@@ -695,9 +689,9 @@
 }
 
 //----- (00482170) --------------------------------------------------------
-bool ODMFace::IsBackfaceCulled(ODMFace *a1, RenderVertexSoft *a2, stru148 *a3)
+bool ODMFace::IsBackfaceCulled(ODMFace *a1, RenderVertexSoft *a2, struct Polygon *a3)
 {
-  stru148 *v3; // edi@1
+  struct Polygon *v3; // edi@1
   RenderVertexSoft *v4; // esi@1
   unsigned int v5; // edx@1
   RenderVertexSoft *v6; // ecx@2