-

Author: codenamecpp

src/Carnage3D.vcxproj

@@ -157,6 +157,7 @@
     <ClInclude Include="Box2D_Helpers.h" />
     <ClInclude Include="common_utils.h" />
     <ClInclude Include="Convert.h" />
+    <ClInclude Include="Decoration.h" />
     <ClInclude Include="GameObjectDefs.h" />
     <ClInclude Include="game_version.h" />
     <ClInclude Include="GtaFontData.h" />
@@ -249,6 +250,7 @@
   <ItemGroup>
     <ClCompile Include="AiCharacterController.cpp" />
     <ClCompile Include="CommonTypes.cpp" />
+    <ClCompile Include="Decoration.cpp" />
     <ClCompile Include="enums_impl.cpp" />
     <ClCompile Include="GtaFontData.cpp" />
     <ClCompile Include="GameObject.cpp" />

src/Carnage3D.vcxproj.filters

@@ -341,6 +341,9 @@
     <ClInclude Include="GameObjectDefs.h">
       <Filter>Game\GameObjects</Filter>
     </ClInclude>
+    <ClInclude Include="Decoration.h">
+      <Filter>Game\GameObjects</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -531,6 +534,9 @@
     <ClCompile Include="Projectile.cpp">
       <Filter>Game\GameObjects</Filter>
     </ClCompile>
+    <ClCompile Include="Decoration.cpp">
+      <Filter>Game\GameObjects</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">

src/Decoration.cpp

@@ -0,0 +1,23 @@
+#include "stdafx.h"
+#include "Decoration.h"
+
+Decoration::Decoration(GameObjectID id) 
+    : GameObject(eGameObjectClass_Decoration, id)
+{
+}
+
+Decoration::~Decoration()
+{
+}
+
+void Decoration::DrawFrame(SpriteBatch& spriteBatch)
+{
+}
+
+void Decoration::UpdateFrame()
+{
+}
+
+void Decoration::DrawDebug(DebugRenderer& debugRender)
+{
+}

src/Decoration.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "GameObject.h"
+
+class Decoration final: public GameObject
+{
+    friend class GameObjectsManager;
+
+    decl_rtti(Decoration, GameObject)
+
+public:
+    Decoration(GameObjectID id);
+    ~Decoration();
+
+    // override GameObject
+    void DrawFrame(SpriteBatch& spriteBatch);
+    void UpdateFrame();
+    void DrawDebug(DebugRenderer& debugRender);
+
+private:
+    SpriteAnimation mAnimationState;
+    Sprite2D mSprite;
+};

src/GameDefs.h

@@ -60,12 +60,6 @@
 
 #define CAR_DELTA_ANIMS_SPEED 10.0f
 
-// forwards
-
-class Pedestrian;
-class Vehicle;
-class Projectile;
-
 // define generic gameobject information
 struct GameObjectStyle
 {

src/GameObject.cpp

@@ -5,8 +5,6 @@
 GameObject::GameObject(eGameObjectClass objectTypeID, GameObjectID uniqueID)
     : mObjectID(uniqueID)
     , mObjectTypeID(objectTypeID)
-    , mObjectsNode(this)
-    , mDeleteObjectsNode(this)
 {
     if (uniqueID == GAMEOBJECT_ID_NULL || 
         objectTypeID == eGameObjectClass_Projectile)
@@ -23,3 +21,8 @@ void GameObject::MarkForDeletion()
 {
     gGameObjectsManager.MarkForDeletion(this);
 }
+
+bool GameObject::IsMarkedForDeletion() const
+{
+    return mMarkedForDeletion;
+}

src/GameObject.h

@@ -2,14 +2,15 @@
 
 #include "GameDefs.h"
 
-class SpriteBatch;
 class DebugRenderer;
 
 // defines base class of game entity
 class GameObject: public cxx::noncopyable
 {
     friend class GameObjectsManager;
 
+    decl_rtti_base(GameObject)
+
 public:
     const GameObjectID mObjectID; // its unique for all game objects except projectiles or effects, see GAMEOBJECT_ID_NULL
     const eGameObjectClass mObjectTypeID;
@@ -30,9 +31,11 @@ class GameObject: public cxx::noncopyable
     {
     }
 
-    // schedule object to despawn
+    // schedule object to delete from game
     void MarkForDeletion();
 
+    bool IsMarkedForDeletion() const;
+
     // shortcuts
     inline bool IsPedestrianObject() const { return mObjectTypeID == eGameObjectClass_Pedestrian; }
     inline bool IsProjectileObject() const { return mObjectTypeID == eGameObjectClass_Projectile; }
@@ -43,8 +46,8 @@ class GameObject: public cxx::noncopyable
 
 protected:
     GameObject(eGameObjectClass objectTypeID, GameObjectID uniqueID);
-    
+
 private:
-    cxx::intrusive_node<GameObject> mObjectsNode; // updatable and drawable entities
-    cxx::intrusive_node<GameObject> mDeleteObjectsNode; // to remove queue
+    // marked object will be destroyed next game frame
+    bool mMarkedForDeletion = false;
 };

src/GameObjectDefs.h

@@ -1,5 +1,13 @@
 #pragma once
 
+// forwards
+
+class GameObject;
+class Pedestrian;
+class Vehicle;
+class Projectile;
+class Decoration;
+
 // some game objects has null identifier, they are dacals, projectiles and short-lived effects
 #define GAMEOBJECT_ID_NULL 0
 
@@ -8,8 +16,8 @@ using GameObjectID = unsigned int; // unique id of gameobject instance in world
 // gameobject class identifiers
 enum eGameObjectClass
 {
-    eGameObjectClass_Pedestrian,
     eGameObjectClass_Car,
+    eGameObjectClass_Pedestrian,
     eGameObjectClass_Projectile,
     eGameObjectClass_Powerup,
     eGameObjectClass_Decoration,
@@ -27,11 +35,11 @@ enum eGameObjectFlags: unsigned int
 
 decl_enum_as_flags(eGameObjectFlags);
 
-// game object indices
+// game object type indices
 enum
 {
     //GameObjectIndex_
 
 
-    GameObjectIndex_MAX = 102
+    GameObjectType_MAX = 102
 };