-

Author: codenamecpp

gamedata/entities/gta_objects.json

@@ -72,7 +72,8 @@
     {
         "name": "train_doors",
         "class": "decoration",
-        "frameCount": 8
+        "frameCount": 8,
+        "flags": ["carobject"]
     },
     {
         "name": "blood",
@@ -109,7 +110,8 @@
     {
         "name": "skid_dirt1",
         "class": "decoration",
-        "frameCount": 3
+        "frameCount": 3,
+        "flags": ["carobject"]
     },
     {
         "name": "skid_dirt2",
@@ -169,12 +171,14 @@
     {
         "name": "tank_gun",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "tank_gun_barrel",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "coffin",
@@ -194,12 +198,14 @@
     {
         "name": "tank_gun_wrecked",
         "class": "obstacle",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "tank_gun_barrel_wrecked",
         "class": "obstacle",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "phone",
@@ -244,17 +250,20 @@
     {
         "name": "water_jet",
         "class": "decoration",
-        "frameCount": 8
+        "frameCount": 8,
+        "flags": ["carobject"]
     },
     {
         "name": "water_jet_end",
         "class": "decoration",
-        "frameCount": 8
+        "frameCount": 8,
+        "flags": ["carobject"]
     },
     {
         "name": "firehose",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "big_smoke",
@@ -264,12 +273,14 @@
     {
         "name": "unknown52",
         "class": "obstacle",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "exhaust",
         "class": "decoration",
-        "frameCount": 11
+        "frameCount": 11,
+        "flags": ["carobject"]
     },
     {
         "name": "splash",
@@ -279,27 +290,32 @@
     {
         "name": "fire_truck_arm1",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "fire_truck_arm2",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "fire_truck_arm3",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "fire_truck_arm4",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "swat_gun",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "check_flag",
@@ -354,7 +370,8 @@
     {
         "name": "tv_camera",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "unknown71",
@@ -454,12 +471,14 @@
     {
         "name": "unknown90",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "unknown91",
         "class": "decoration",
-        "frameCount": 1
+        "frameCount": 1,
+        "flags": ["carobject"]
     },
     {
         "name": "helicopter_blade",

src/Carnage3D.vcxproj

@@ -176,6 +176,7 @@
     <ClInclude Include="GameObjectsManager.h" />
     <ClInclude Include="GpuBufferTexture.h" />
     <ClInclude Include="CharacterController.h" />
+    <ClInclude Include="Obstacle.h" />
     <ClInclude Include="PedestrianStates.h" />
     <ClInclude Include="PhysicsDefs.h" />
     <ClInclude Include="PhysicsManager.h" />
@@ -261,6 +262,7 @@
     <ClCompile Include="CharacterController.cpp" />
     <ClCompile Include="MemoryManager.cpp" />
     <ClCompile Include="mem_allocators.cpp" />
+    <ClCompile Include="Obstacle.cpp" />
     <ClCompile Include="path_utils.cpp" />
     <ClCompile Include="PedestrianStates.cpp" />
     <ClCompile Include="PhysicsManager.cpp" />

src/Carnage3D.vcxproj.filters

@@ -344,6 +344,9 @@
     <ClInclude Include="Decoration.h">
       <Filter>Game\GameObjects</Filter>
     </ClInclude>
+    <ClInclude Include="Obstacle.h">
+      <Filter>Game\GameObjects</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -537,6 +540,9 @@
     <ClCompile Include="Decoration.cpp">
       <Filter>Game\GameObjects</Filter>
     </ClCompile>
+    <ClCompile Include="Obstacle.cpp">
+      <Filter>Game\GameObjects</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">

src/Decoration.cpp

@@ -41,7 +41,7 @@ void Decoration::Spawn(const glm::vec3& startPosition, cxx::angle_t startRotatio
 
     mDrawSprite.mPosition.x = startPosition.x;
     mDrawSprite.mPosition.y = startPosition.z;
-    mDrawSprite.mHeight = startPosition.y + 0.1f;
+    mDrawSprite.mHeight = startPosition.y;
     mDrawSprite.mRotateAngle = startRotation;
 
     mAnimationState.SetNull();

src/Decoration.h

@@ -6,6 +6,7 @@ class Decoration final: public GameObject
 {
     friend class GameObjectsManager;
 
+    // add runtime information support for gameobject
     decl_rtti(Decoration, GameObject)
 
 public:

src/GameCheatsWindow.cpp

@@ -155,6 +155,7 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
         ImGui::Checkbox("Enable debug draw", &mEnableDebugDraw);
 
         ImGui::Checkbox("Draw decorations", &mEnableDrawDecorations);
+        ImGui::Checkbox("Draw obstacles", &mEnableDrawObstacles);
         ImGui::Checkbox("Draw pedestrians", &mEnableDrawPedestrians);
         ImGui::Checkbox("Draw vehicles", &mEnableDrawVehicles);
         ImGui::Checkbox("Draw city mesh", &mEnableDrawCityMesh);

src/GameCheatsWindow.h

@@ -10,6 +10,7 @@ class GameCheatsWindow: public DebugWindow
     bool mEnableBlocksAnimation;
     bool mEnableDebugDraw;
     bool mEnableDrawDecorations = true;
+    bool mEnableDrawObstacles = true;
     bool mEnableDrawPedestrians = true;
     bool mEnableDrawVehicles = true;
     bool mEnableDrawCityMesh = true;

src/GameObject.cpp

@@ -15,6 +15,7 @@ GameObject::GameObject(eGameObjectClass objectTypeID, GameObjectID uniqueID)
 
 GameObject::~GameObject()
 {
+    SetDetached();
 }
 
 void GameObject::MarkForDeletion()
@@ -26,3 +27,63 @@ bool GameObject::IsMarkedForDeletion() const
 {
     return mMarkedForDeletion;
 }
+
+void GameObject::SetAttachedToObject(GameObject* parentObject)
+{
+    if (parentObject == nullptr || parentObject == this)
+    {
+        debug_assert(false);
+        return;
+    }
+
+    if (mParentObject == parentObject)
+        return;
+
+    if (mParentObject)
+    {
+        SetDetached();
+    }
+
+    mParentObject = parentObject;
+    mParentObject->mAttachedObjects.push_back(this);
+}
+
+void GameObject::SetDetached()
+{
+    if (mParentObject == nullptr)
+        return;
+
+    cxx::erase_elements(mParentObject->mAttachedObjects, this);
+    mParentObject = nullptr;
+}
+
+bool GameObject::IsAttachedToObject() const
+{
+    return mParentObject != nullptr;
+}
+
+bool GameObject::IsAttachedToObject(GameObject* parentObject) const
+{
+    return mParentObject && (mParentObject == parentObject);
+}
+
+bool GameObject::HasAttachedObjects()
+{
+    return !mAttachedObjects.empty();
+}
+
+GameObject* GameObject::GetParentObject() const
+{
+    return mParentObject;
+}
+
+GameObject* GameObject::GetAttachedObject(int index) const
+{
+    GameObject* gameobject = nullptr;
+    debug_assert(index >= 0);
+    if (index < (int) mAttachedObjects.size())
+    {
+        gameobject = mAttachedObjects[index];
+    }
+    return gameobject;
+}

src/GameObject.h

@@ -9,12 +9,16 @@ class GameObject: public cxx::noncopyable
 {
     friend class GameObjectsManager;
 
+    // add runtime information support for gameobject
     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;
 
+    // readonly
+    eGameObjectFlags mFlags = eGameObjectFlags_None;
+
 public:
     virtual ~GameObject();
 
@@ -36,17 +40,40 @@ class GameObject: public cxx::noncopyable
 
     bool IsMarkedForDeletion() const;
 
-    // shortcuts
-    inline bool IsPedestrianObject() const { return mObjectTypeID == eGameObjectClass_Pedestrian; }
-    inline bool IsProjectileObject() const { return mObjectTypeID == eGameObjectClass_Projectile; }
-    inline bool IsDecorationObject() const { return mObjectTypeID == eGameObjectClass_Decoration; }
-    inline bool IsCarObject() const { return mObjectTypeID == eGameObjectClass_Car; }
-    inline bool IsPowerupObject() const { return mObjectTypeID == eGameObjectClass_Powerup; }
-    inline bool IsObstacleObject() const { return mObjectTypeID == eGameObjectClass_Obstacle; }
+    // Attach or detach object to other object
+    void SetAttachedToObject(GameObject* parentObject);
+    void SetDetached();
+
+    // Inspect hierarchy
+    bool IsAttachedToObject() const;
+    bool IsAttachedToObject(GameObject* parentObject) const;
+    bool HasAttachedObjects();
+
+    // Inspect hierarchy
+    GameObject* GetParentObject() const;
+    GameObject* GetAttachedObject(int index) const;
+
+    // class shortcuts
+    inline bool IsPedestrianClass() const { return mObjectTypeID == eGameObjectClass_Pedestrian; }
+    inline bool IsProjectileClass() const { return mObjectTypeID == eGameObjectClass_Projectile; }
+    inline bool IsDecorationClass() const { return mObjectTypeID == eGameObjectClass_Decoration; }
+    inline bool IsVehicleClass() const { return mObjectTypeID == eGameObjectClass_Car; }
+    inline bool IsPowerupClass() const { return mObjectTypeID == eGameObjectClass_Powerup; }
+    inline bool IsObstacleClass() const { return mObjectTypeID == eGameObjectClass_Obstacle; }
+
+    // flag shortcuts
+    inline bool IsInvisibleFlag() const { return (mFlags & eGameObjectFlags_Invisible) != 0; }
+    inline bool IsCarObjectFlag() const { return (mFlags & eGameObjectFlags_CarObject) != 0; }
 
 protected:
     GameObject(eGameObjectClass objectTypeID, GameObjectID uniqueID);
 
+protected:
+    // todo: add attachment point and angle
+
+    GameObject* mParentObject = nullptr;
+    std::vector<GameObject*> mAttachedObjects;
+
 private:
     // marked object will be destroyed next game frame
     bool mMarkedForDeletion = false;

src/GameObjectDefs.h

@@ -7,6 +7,7 @@ class Pedestrian;
 class Vehicle;
 class Projectile;
 class Decoration;
+class Obstacle;
 
 // some game objects has null identifier, they are dacals, projectiles and short-lived effects
 #define GAMEOBJECT_ID_NULL 0
@@ -27,10 +28,11 @@ enum eGameObjectClass
 
 decl_enum_strings(eGameObjectClass);
 
-enum eGameObjectFlags: unsigned int
+enum eGameObjectFlags: unsigned short
 {
     eGameObjectFlags_None = 0,
     eGameObjectFlags_Invisible = BIT(0),
+    eGameObjectFlags_CarObject = BIT(1),
 };
 
 decl_enum_as_flags(eGameObjectFlags);