diff Indoor.cpp @ 1638:ccde94f02b75

class IndoorCamera split into BLVRenderParams and ODMRenderParams
author Nomad
date Tue, 17 Sep 2013 15:40:09 +0200
parents 75fafd8ced59
children afc1c3514dd5
line wrap: on
line diff
--- a/Indoor.cpp	Tue Sep 17 14:10:41 2013 +0200
+++ b/Indoor.cpp	Tue Sep 17 15:40:09 2013 +0200
@@ -29,7 +29,6 @@
 #include "TurnEngine.h"
 #include "PaletteManager.h"
 #include "MapInfo.h"
-#include "IndoorCamera.h"
 #include "Lights.h"
 
 #include "mm7_data.h"
@@ -333,7 +332,7 @@
     IndoorLocation::ExecDraw(pRenderer->pRenderD3D != 0);
   pRenderer->DrawBillboardList_BLV();
 
-  if ( !pRenderer->pRenderD3D )
+/*  if ( !pRenderer->pRenderD3D )
   {
     if (pBLVRenderParams->uFlags & INDOOR_CAMERA_DRAW_D3D_OUTLINES)
       pBspRenderer->DrawFaceOutlines();
@@ -363,7 +362,7 @@
 		  }
 	  }
     }
-  }
+  }*/
 }
 
 
@@ -380,13 +379,12 @@
 
   _this.uFlags = 0;
   if (viewparams->draw_sw_outlines)
-    _this.uFlags |= INDOOR_CAMERA_DRAW_SW_OUTLINES;
+    _this.uFlags |= BLV_RENDER_DRAW_SW_OUTLINES;
   if (viewparams->draw_d3d_outlines)
-    _this.uFlags |= INDOOR_CAMERA_DRAW_D3D_OUTLINES;
-
-  _this.uFlags |= INDOOR_CAMERA_DRAW_D3D_OUTLINES;
-  _this.uFlags |= INDOOR_CAMERA_DRAW_SW_OUTLINES;
-  //INDOOR_CAMERA_DRAW_TERRAIN_OUTLINES
+    _this.uFlags |= BLV_RENDER_DRAW_D3D_OUTLINES;
+  
+  _this.uFlags |= BLV_RENDER_DRAW_SW_OUTLINES;
+  _this.uFlags |= BLV_RENDER_DRAW_D3D_OUTLINES;
 
   _this.field_0_timer = pEventTimer->uTotalGameTimeElapsed;
   _this.field_1C_mb_fov = 65;
@@ -803,7 +801,7 @@
       nodes[num_nodes].viewing_portal_id = uFaceID;
       AddBspNodeToRenderList(++num_nodes - 1);
     }
-    if (pBLVRenderParams->uFlags & INDOOR_CAMERA_DRAW_SW_OUTLINES)
+    if (pBLVRenderParams->uFlags & BLV_RENDER_DRAW_SW_OUTLINES)
       pGame->pIndoorCameraD3D->PrepareAndDrawDebugOutline(pFace, 0x1E1EFF);
     //pGame->pIndoorCameraD3D->DebugDrawPortal(pFace);
   }