-

Author: codenamecpp

src/Carnage3D.vcxproj

@@ -158,6 +158,7 @@
     <ClInclude Include="common_utils.h" />
     <ClInclude Include="Convert.h" />
     <ClInclude Include="Decoration.h" />
+    <ClInclude Include="Explosion.h" />
     <ClInclude Include="GameObjectDefs.h" />
     <ClInclude Include="game_version.h" />
     <ClInclude Include="GtaFontData.h" />
@@ -253,6 +254,7 @@
     <ClCompile Include="CommonTypes.cpp" />
     <ClCompile Include="Decoration.cpp" />
     <ClCompile Include="enums_impl.cpp" />
+    <ClCompile Include="Explosion.cpp" />
     <ClCompile Include="GtaFontData.cpp" />
     <ClCompile Include="GameObject.cpp" />
     <ClCompile Include="GameObjectsManager.cpp" />

src/Carnage3D.vcxproj.filters

@@ -347,6 +347,9 @@
     <ClInclude Include="Obstacle.h">
       <Filter>Game\GameObjects</Filter>
     </ClInclude>
+    <ClInclude Include="Explosion.h">
+      <Filter>Game\GameObjects</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -543,6 +546,9 @@
     <ClCompile Include="Obstacle.cpp">
       <Filter>Game\GameObjects</Filter>
     </ClCompile>
+    <ClCompile Include="Explosion.cpp">
+      <Filter>Game\GameObjects</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">

src/CarnageGame.cpp

@@ -175,7 +175,7 @@ bool CarnageGame::SetInputActionsFromConfig()
     for (int ihuman = 0; ihuman < GAME_MAX_PLAYERS; ++ihuman)
     {
         HumanCharacterSlot& currentChar = mHumanSlot[ihuman];
-        currentChar.mCharController.mInputs.SetNull();
+        currentChar.mCharController.mInputs.Clear();
         if (ihuman == 0) 
         {
             currentChar.mCharController.mInputs.SetDefaults();

src/Decoration.cpp

@@ -41,7 +41,7 @@ void Decoration::Spawn(const glm::vec3& startPosition, cxx::angle_t startRotatio
     mDrawSprite.mHeight = startPosition.y;
     mDrawSprite.mRotateAngle = startRotation;
 
-    mAnimationState.SetNull();
+    mAnimationState.Clear();
     mAnimationState.mAnimDesc = mGameObjectDesc->mAnimationData;
     mAnimationState.PlayAnimation(eSpriteAnimLoop_FromStart);
 }

src/Explosion.cpp

@@ -0,0 +1,56 @@
+#include "stdafx.h"
+#include "Explosion.h"
+#include "TimeManager.h"
+#include "SpriteManager.h"
+
+Explosion::Explosion(GameObjectID id) 
+    : GameObject(eGameObjectClass_Explosion, id)
+{
+}
+
+Explosion::~Explosion()
+{
+}
+
+void Explosion::PreDrawFrame()
+{
+}
+
+void Explosion::UpdateFrame()
+{
+    float deltaTime = gTimeManager.mGameFrameDelta;
+    if (mAnimationState.AdvanceAnimation(deltaTime))
+    {
+        gSpriteManager.GetExplosionTexture(mAnimationState.GetCurrentFrame(), mDrawSprite);
+        mDrawSprite.SetOriginToCenter();
+    }
+
+    if (!mAnimationState.IsAnimationActive())
+    {
+        MarkForDeletion();
+    }
+}
+
+void Explosion::DrawDebug(DebugRenderer& debugRender)
+{
+}
+
+void Explosion::Spawn(const glm::vec3& startPosition)
+{
+    mDrawSprite.mPosition.x = startPosition.x;
+    mDrawSprite.mPosition.y = startPosition.z;
+    mDrawSprite.mHeight = startPosition.y;
+
+    mAnimationState.Clear();
+    // todo
+    int numFrames = gSpriteManager.GetExplosionFramesCount();
+    mAnimationState.mAnimDesc.Setup(0, numFrames);
+    mAnimationState.PlayAnimation(eSpriteAnimLoop_FromStart);
+    mAnimationState.SetMaxRepeatCycles(1);
+
+    if (!gSpriteManager.GetExplosionTexture(0, mDrawSprite))
+    {
+        debug_assert(false);
+    }
+    mDrawSprite.SetOriginToCenter();
+}

src/Explosion.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "GameObject.h"
+
+class Explosion final: public GameObject
+{
+    friend class GameObjectsManager;
+
+    // add runtime information support for gameobject
+    decl_rtti(Explosion, GameObject)
+
+public:
+    Explosion(GameObjectID id);
+    ~Explosion();
+
+    // override GameObject
+    void PreDrawFrame() override;
+    void UpdateFrame() override;
+    void DrawDebug(DebugRenderer& debugRender) override;
+
+    // Setup initial state when spawned or respawned on level
+    void Spawn(const glm::vec3& startPosition);
+
+private:
+    SpriteAnimation mAnimationState;
+};

src/GameDefs.h

@@ -274,16 +274,14 @@ struct SpriteVertex3D_Format: public VertexFormat
 struct MapMeshData
 {
 public:
-    using TVertexType = CityVertex3D;
     MapMeshData() = default;
-
-    inline void SetNull()
+    inline void Clear()
     {
         mBlocksVertices.clear();
         mBlocksIndices.clear();
     }
-
 public:
+    using TVertexType = CityVertex3D;
     std::vector<TVertexType> mBlocksVertices;
     std::vector<DrawIndex> mBlocksIndices;
 };
@@ -329,7 +327,7 @@ struct TextureRegion
         mV1 = 1.0f;
     }
     // clear texture region
-    inline void SetNull()
+    inline void Clear()
     {
         mRectangle.SetNull();
     }
@@ -346,7 +344,7 @@ class Spritesheet final
 public:
     Spritesheet() = default;
     // clear spritesheet
-    inline void SetNull()
+    inline void Clear()
     {
         mSpritesheetTexture = nullptr;
         mEntries.clear();

src/GameObject.h

@@ -61,6 +61,7 @@ class GameObject: public cxx::noncopyable
     inline bool IsVehicleClass() const { return mObjectTypeID == eGameObjectClass_Car; }
     inline bool IsPowerupClass() const { return mObjectTypeID == eGameObjectClass_Powerup; }
     inline bool IsObstacleClass() const { return mObjectTypeID == eGameObjectClass_Obstacle; }
+    inline bool IsExplosionClass() const { return mObjectTypeID == eGameObjectClass_Explosion; }
 
     // flag shortcuts
     inline bool IsInvisibleFlag() const { return (mFlags & eGameObjectFlags_Invisible) != 0; }
@@ -78,7 +79,6 @@ class GameObject: public cxx::noncopyable
     // drawing spricific data
     Sprite2D mDrawSprite;
 
-
 private:
     // marked object will be destroyed next game frame
     bool mMarkedForDeletion = false;

src/GameObjectDefs.h

@@ -8,6 +8,7 @@ class Vehicle;
 class Projectile;
 class Decoration;
 class Obstacle;
+class Explosion;
 
 // some game objects has null identifier, they are dacals, projectiles and short-lived effects
 #define GAMEOBJECT_ID_NULL 0
@@ -23,6 +24,7 @@ enum eGameObjectClass
     eGameObjectClass_Powerup,
     eGameObjectClass_Decoration,
     eGameObjectClass_Obstacle,
+    eGameObjectClass_Explosion,
     eGameObjectClass_COUNT,
 };
 

src/GameObjectsManager.cpp

@@ -16,6 +16,7 @@ GameObjectsManager::~GameObjectsManager()
     mProjectilesPool.cleanup();
     mDecorationsPool.cleanup();
     mObstaclesPool.cleanup();
+    mExplosionsPool.cleanup();
 }
 
 bool GameObjectsManager::InitGameObjects()
@@ -150,6 +151,19 @@ Obstacle* GameObjectsManager::CreateObstacle(const glm::vec3& position, cxx::ang
     return instance;
 }
 
+Explosion* GameObjectsManager::CreateExplosion(const glm::vec3& position)
+{
+    GameObjectID objectID = GenerateUniqueID();
+
+    Explosion* instance = mExplosionsPool.create(objectID);
+    debug_assert(instance);
+
+    mAllObjectsList.push_back(instance);
+    // init
+    instance->Spawn(position);
+    return instance;
+}
+
 Decoration* GameObjectsManager::CreateDecoration(const glm::vec3& position, cxx::angle_t heading, GameObjectStyle* desc)
 {
     Decoration* instance = nullptr;
@@ -302,6 +316,13 @@ void GameObjectsManager::DestroyGameObject(GameObject* object)
         }
         break;
 
+        case eGameObjectClass_Explosion:
+        {
+            Explosion* explosion = static_cast<Explosion*>(object);
+            mExplosionsPool.destroy(explosion);
+        }
+        break;
+
         case eGameObjectClass_Powerup:
         default:
         {
@@ -397,4 +418,4 @@ bool GameObjectsManager::CreateStartupObjects()
         }
     }
     return true;
-}
+}