Changeset 309 for ps

Timestamp:

05/29/04 23:04:18 (21 years ago)

Author:

notpete

Message:

Added singleton creation/destruction for a bunch of graphics related classes; a half dozen minor changes related to model submission, command lines.

File:

• ps/trunk/source/main.cpp (modified) (9 diffs)

ps/trunk/source/main.cpp

@@ -18 +18 @@
 #include "sysdep/ia32.h"
 #endif
-#include "ps/Config.h"
+#include "Config.h"
 #include "MapReader.h"
 #include "Terrain.h"
+#include "TextureManager.h"
+#include "ObjectManager.h"
+#include "SkeletonAnimManager.h"
 #include "Renderer.h"
 #include "Model.h"
@@ -48 +51 @@
 // using VBOs on laptop Radeon cards
 static bool g_NoGLVBO=false;
-
+// flag to switch on shadows
+static bool g_Shadows=false;
+// flag to switch off pbuffers
+static bool g_NoPBuffer=false;
 static bool g_VSync = false;
 
@@ -223 +229 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
+// SubmitModelRecursive: recurse down given model, submitting it and all it's descendents to the 
+// renderer
+void SubmitModelRecursive(CModel* model)
+{
+    g_Renderer.Submit(model);
+
+    const std::vector<CModel::Prop>& props=model->GetProps();
+    for (uint i=0;i<props.size();i++) {
+        SubmitModelRecursive(props[i].m_Model);
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
 // RenderModels: iterate through model list and submit all models in viewing frustum to the 
 // Renderer
@@ -230 +249 @@
 
     const std::vector<CUnit*>& units=g_UnitMan.GetUnits();
-    uint i;
-    for (i=0;i<units.size();++i) {
-        if (frustum.IsBoxVisible(CVector3D(0,0,0),units[i]->m_Model->GetBounds())) {
-            g_Renderer.Submit(units[i]->m_Model);
+    for (uint i=0;i<units.size();++i) {
+        if (frustum.IsBoxVisible(CVector3D(0,0,0),units[i]->GetModel()->GetBounds())) {
+            SubmitModelRecursive(units[i]->GetModel());
         }
     }
@@ -249 +267 @@
     const std::vector<CUnit*>& units=g_UnitMan.GetUnits();
     for (i=0;i<units.size();++i) {
-        g_Renderer.Submit(units[i]->m_Model);
+        SubmitModelRecursive(units[i]->GetModel());
     }
     
@@ -354 +372 @@
     const std::vector<CUnit*>& units=g_UnitMan.GetUnits();
     for (uint i=0;i<units.size();++i) {
-        units[i]->m_Model->Update(time);
+        units[i]->GetModel()->Update(time);
     }
 
@@ -388 +406 @@
                         g_NoGLVBO=true;
                     }
+                    else if (strncmp(argv[i]+1,"nopbuffer",9)==0) {
+                        g_NoPBuffer=true;
+                    }
+                    break;
+
+                case 's':
+                    if (strncmp(argv[i]+1,"shadows",7)==0) {
+                        g_Shadows=true;
+                    }
                     break;
             }
@@ -505 +532 @@
     font = font_load("fonts/verdana.fnt");
 
+    // create renderer
+    new CRenderer;
+
     // set renderer options from command line options - NOVBO must be set before opening the renderer
-    g_Renderer.SetOption(CRenderer::OPT_NOVBO,g_NoGLVBO);
+    g_Renderer.SetOptionBool(CRenderer::OPT_NOVBO,g_NoGLVBO);
+    g_Renderer.SetOptionBool(CRenderer::OPT_SHADOWS,g_Shadows);
+    g_Renderer.SetOptionBool(CRenderer::OPT_NOPBUFFER,g_NoPBuffer);
+
+    // create terrain related stuff
+    new CTextureManager;
+
+    // create actor related stuff
+    new CSkeletonAnimManager;
+    new CObjectManager;
+    new CUnitManager;
 
     // terr_init actually opens the renderer and loads a bunch of resources as well as setting up
@@ -620 +660 @@
     delete &g_EntityTemplateCollection;
 
+    // destroy actor related stuff
+    delete CUnitManager::GetSingletonPtr();
+    delete CObjectManager::GetSingletonPtr();
+    delete CSkeletonAnimManager::GetSingletonPtr();
+
+    // destroy terrain related stuff
+    delete CTextureManager::GetSingletonPtr();
+
+    // destroy renderer
+    delete CRenderer::GetSingletonPtr();
+
     return 0;
 }