Changeset 25224

Timestamp:

Apr 9, 2021, 5:45:31 PM (3 years ago)

Author:

wraitii

Message:

Allow empty actor files.

This allows empty actor files -> they map to a dummy object that renders nothing.
The use case is automatically hiding objects at lower quality levels & LOD settings.

Differential Revision: ​https://code.wildfiregames.com/D3819

Location:

ps/trunk/source

Files:

• graphics/ModelAbstract.h (modified) (3 diffs)
• graphics/ModelDummy.h (added)
• graphics/ObjectEntry.cpp (modified) (2 diffs)
• renderer/Scene.cpp (modified) (2 diffs)

ps/trunk/source/graphics/ModelAbstract.h

@@ -1 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -24 +24 @@
 #include "simulation2/helpers/Player.h"
 
+
 class CModel;
 class CModelDecal;
@@ -74 +75 @@
 
     /// Dynamic cast
-    virtual CModel* ToCModel() { return NULL; }
+    virtual CModel; }
 
     /// Dynamic cast
-    virtual CModelDecal* ToCModelDecal() { return NULL; }
+    virtual CModel; }
 
     /// Dynamic cast
-    virtual CModelParticleEmitter* ToCModelParticleEmitter() { return NULL; }
+    virtual CModelDecal* ToCModelDecal() { return nullptr; }
+
+    /// Dynamic cast
+    virtual CModelParticleEmitter* ToCModelParticleEmitter() { return nullptr; }
 
     // (This dynamic casting is a bit ugly, but we won't have many subclasses

ps/trunk/source/graphics/ObjectEntry.cpp

@@ -26 +26 @@
 #include "graphics/Model.h"
 #include "graphics/ModelDef.h"
+
 #include "graphics/ObjectBase.h"
 #include "graphics/ObjectManager.h"
@@ -76 +77 @@
         else
             m_Color = CColor(r/255.0f, g/255.0f, b/255.0f, 1.0f);
+
+
+
+
+
+
     }
 

ps/trunk/source/renderer/Scene.cpp

@@ -1 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 201 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -56 +56 @@
         Submit(model->ToCModelParticleEmitter()->m_Emitter.get());
     }
+
+
+
     else
         debug_warn(L"unknown model type");