-

Author: codenamecpp

src/Decoration.cpp

@@ -1,9 +1,14 @@
 #include "stdafx.h"
 #include "Decoration.h"
+#include "TimeManager.h"
+#include "SpriteManager.h"
+#include "GameCheatsWindow.h"
 
-Decoration::Decoration(GameObjectID id) 
+Decoration::Decoration(GameObjectID id, GameObjectStyle* desc) 
     : GameObject(eGameObjectClass_Decoration, id)
+    , mGameObjectDesc(desc)
 {
+    debug_assert(mGameObjectDesc);
 }
 
 Decoration::~Decoration()
@@ -12,12 +17,34 @@ Decoration::~Decoration()
 
 void Decoration::DrawFrame(SpriteBatch& spriteBatch)
 {
+    if (!gGameCheatsWindow.mEnableDrawDecorations)
+        return;
+
+    gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetCurrentFrame(), 0, mDrawSprite);
+    mDrawSprite.SetOriginToCenter();
+    spriteBatch.DrawSprite(mDrawSprite);
 }
 
 void Decoration::UpdateFrame()
 {
+    float deltaTime = gTimeManager.mGameFrameDelta;
+    mAnimationState.AdvanceAnimation(deltaTime);
 }
 
 void Decoration::DrawDebug(DebugRenderer& debugRender)
 {
-}
+}
+
+void Decoration::Spawn(const glm::vec3& startPosition, cxx::angle_t startRotation)
+{
+    debug_assert(mGameObjectDesc);
+
+    mDrawSprite.mPosition.x = startPosition.x;
+    mDrawSprite.mPosition.y = startPosition.z;
+    mDrawSprite.mHeight = startPosition.y + 0.1f;
+    mDrawSprite.mRotateAngle = startRotation;
+
+    mAnimationState.SetNull();
+    mAnimationState.mAnimDesc = mGameObjectDesc->mAnimationData;
+    mAnimationState.PlayAnimation(eSpriteAnimLoop_FromStart);
+}

src/Decoration.h

@@ -9,15 +9,19 @@ class Decoration final: public GameObject
     decl_rtti(Decoration, GameObject)
 
 public:
-    Decoration(GameObjectID id);
+    Decoration(GameObjectID id, GameObjectStyle* desc);
     ~Decoration();
 
     // override GameObject
-    void DrawFrame(SpriteBatch& spriteBatch);
-    void UpdateFrame();
-    void DrawDebug(DebugRenderer& debugRender);
+    void DrawFrame(SpriteBatch& spriteBatch) override;
+    void UpdateFrame() override;
+    void DrawDebug(DebugRenderer& debugRender) override;
+
+    // Setup initial state when spawned or respawned on level
+    void Spawn(const glm::vec3& startPosition, cxx::angle_t startRotation);
 
 private:
     SpriteAnimation mAnimationState;
-    Sprite2D mSprite;
+    Sprite2D mDrawSprite;
+    GameObjectStyle* mGameObjectDesc = nullptr;
 };

src/GameCheatsWindow.cpp

@@ -153,6 +153,11 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
     {
         ImGui::Checkbox("Enable blocks animation", &mEnableBlocksAnimation);
         ImGui::Checkbox("Enable debug draw", &mEnableDebugDraw);
+
+        ImGui::Checkbox("Draw decorations", &mEnableDrawDecorations);
+        ImGui::Checkbox("Draw pedestrians", &mEnableDrawPedestrians);
+        ImGui::Checkbox("Draw vehicles", &mEnableDrawVehicles);
+        ImGui::Checkbox("Draw city mesh", &mEnableDrawCityMesh);
     }
 
     if (ImGui::CollapsingHeader("Ped"))

src/GameCheatsWindow.h

@@ -9,6 +9,10 @@ class GameCheatsWindow: public DebugWindow
     bool mEnableGravity;
     bool mEnableBlocksAnimation;
     bool mEnableDebugDraw;
+    bool mEnableDrawDecorations = true;
+    bool mEnableDrawPedestrians = true;
+    bool mEnableDrawVehicles = true;
+    bool mEnableDrawCityMesh = true;
 
 public:
     GameCheatsWindow();

src/GameDefs.h

@@ -22,7 +22,7 @@
 #define METERS_PER_MAP_UNIT (4.0f)
 
 #define SPRITE_ZERO_ANGLE 90.0f // all sprites in game are rotated at 90 degrees
-#define SPRITE_SCALE (METERS_PER_MAP_UNIT / PIXELS_PER_MAP_UNIT)
+#define MAP_SPRITE_SCALE (METERS_PER_MAP_UNIT / PIXELS_PER_MAP_UNIT)
 #define PED_SPRITE_DRAW_BOX_SIZE_PX 24 // with, height
 #define CAR_WHEEL_SIZE_W_PX         6
 #define CAR_WHEEL_SIZE_H_PX         12

src/GameObjectsManager.cpp

@@ -129,6 +129,26 @@ Projectile* GameObjectsManager::CreateProjectile(const glm::vec3& position, cxx:
     return instance;
 }
 
+Decoration* GameObjectsManager::CreateDecoration(const glm::vec3& position, cxx::angle_t heading, GameObjectStyle* desc)
+{
+    Decoration* instance = nullptr;
+    debug_assert(gGameMap.mStyleData.IsLoaded());
+    debug_assert(desc);
+    debug_assert(desc->mClassID == eGameObjectClass_Decoration);
+    if (desc->mClassID == eGameObjectClass_Decoration)
+    {
+        GameObjectID objectID = GenerateUniqueID();
+
+        instance = mDecorationsPool.create(objectID, desc);
+        debug_assert(instance);
+
+        mAllObjectsList.push_back(instance);
+        // init
+        instance->Spawn(position, heading);
+    }
+    return instance;
+}
+
 Vehicle* GameObjectsManager::GetVehicleByID(GameObjectID objectID) const
 {
     for (GameObject* currentObject: mAllObjectsList)
@@ -231,8 +251,15 @@ void GameObjectsManager::DestroyGameObject(GameObject* object)
             mProjectilesPool.destroy(projectile);
         }
         break;
-        case eGameObjectClass_Powerup:
+
         case eGameObjectClass_Decoration:
+        {
+            Decoration* decoration = static_cast<Decoration*>(object);
+            mDecorationsPool.destroy(decoration);
+        }
+        break;
+
+        case eGameObjectClass_Powerup:
         case eGameObjectClass_Obstacle:
         default:
         {
@@ -276,14 +303,14 @@ bool GameObjectsManager::CreateStartupObjects()
     {
         int mapLevel = (int) Convert::PixelsToMapUnits(currObject.mZ);
         mapLevel = INVERT_MAP_LAYER(mapLevel);
-        glm::vec3 carPosition 
+        glm::vec3 start_position 
         { 
             Convert::PixelsToMeters(currObject.mX),
             Convert::MapUnitsToMeters(mapLevel * 1.0f),
             Convert::PixelsToMeters(currObject.mY) 
         };
 
-        cxx::angle_t rotationDegrees = Convert::Fix16ToAngle(currObject.mRotation);
+        cxx::angle_t start_rotation = Convert::Fix16ToAngle(currObject.mRotation);
 
         // create startup cars
         if (currObject.IsCarObject())
@@ -294,7 +321,7 @@ bool GameObjectsManager::CreateStartupObjects()
                 debug_assert(false);
                 continue;
             }
-            Vehicle* startupCar = CreateCar(carPosition, rotationDegrees, carModel);
+            Vehicle* startupCar = CreateCar(start_position, start_rotation, carModel);
             debug_assert(startupCar);
             continue;
         }
@@ -306,9 +333,14 @@ bool GameObjectsManager::CreateStartupObjects()
         GameObjectStyle& objectType = styleData.mGameObjects[objectTypeIndex];
         switch (objectType.mClassID)
         {
+            case eGameObjectClass_Decoration: 
+            {
+                Decoration* startupDecoration = CreateDecoration(start_position, start_rotation, &objectType);
+                debug_assert(startupDecoration);
+            }
+            break;
             case eGameObjectClass_Projectile: break;
             case eGameObjectClass_Powerup: break;
-            case eGameObjectClass_Decoration: break;
             case eGameObjectClass_Obstacle: break;
             default:
                 debug_assert(false);

src/GameObjectsManager.h

@@ -35,10 +35,13 @@ class GameObjectsManager final: public cxx::noncopyable
     Vehicle* CreateCar(const glm::vec3& position, cxx::angle_t heading, CarStyle* desc);
     Vehicle* CreateCar(const glm::vec3& position, cxx::angle_t heading, eCarModel carModel);
 
-    // New projectile instance to map at specific location
+    // Add new projectile instance to map at specific location
     Projectile* CreateProjectile(const glm::vec3& position, cxx::angle_t heading, eProjectileType typeID);
     Projectile* CreateProjectile(const glm::vec3& position, cxx::angle_t heading, ProjectileStyle* desc);
 
+    // Add new decoration instance to map at specific location
+    Decoration* CreateDecoration(const glm::vec3& position, cxx::angle_t heading, GameObjectStyle* desc);
+
     // find gameobject by its unique identifier
     // @param objectID: Unique identifier
     Vehicle* GetVehicleByID(GameObjectID objectID) const;

src/MapRenderer.cpp

@@ -78,7 +78,10 @@ void MapRenderer::RenderFrame(RenderView* renderview)
     gGraphicsDevice.BindTexture(eTextureUnit_3, gSpriteManager.mPalettesTable);
     gGraphicsDevice.BindTexture(eTextureUnit_2, gSpriteManager.mPaletteIndicesTable);
 
-    DrawCityMesh(renderview);
+    if (gGameCheatsWindow.mEnableDrawCityMesh)
+    {
+        DrawCityMesh(renderview);
+    }
 
     mSpriteBatch.BeginBatch(SpriteBatch::DepthAxis_Y);
 

src/Pedestrian.cpp

@@ -8,6 +8,7 @@
 #include "PedestrianStates.h"
 #include "Vehicle.h"
 #include "TimeManager.h"
+#include "GameCheatsWindow.h"
 
 Pedestrian::Pedestrian(GameObjectID id) : GameObject(eGameObjectClass_Pedestrian, id)
     , mPhysicsBody()
@@ -90,6 +91,9 @@ void Pedestrian::DrawFrame(SpriteBatch& spriteBatch)
     glm::vec3 position = mPhysicsBody->mSmoothPosition;
     ComputeDrawHeight(position);
 
+    if (!gGameCheatsWindow.mEnableDrawPedestrians)
+        return;
+
     ePedestrianState currState = GetCurrentStateID();
     if (currState == ePedestrianState_DrivingCar)
     {
@@ -106,7 +110,6 @@ void Pedestrian::DrawFrame(SpriteBatch& spriteBatch)
     gSpriteManager.GetSpriteTexture(mObjectID, spriteIndex, remapClut, mDrawSprite);
 
     mDrawSprite.mPosition = glm::vec2(position.x, position.z);
-    mDrawSprite.mScale = SPRITE_SCALE;
     mDrawSprite.mRotateAngle = rotationAngle;
     mDrawSprite.mHeight = mDrawHeight;
     mDrawSprite.SetOriginToCenter();

src/Projectile.cpp

@@ -11,7 +11,6 @@ Projectile::Projectile(ProjectileStyle* style)
     , mProjectileStyle(style)
     , mDrawHeight()
     , mStartPosition()
-    , mDead()
 {
     debug_assert(style);
 }
@@ -51,7 +50,6 @@ void Projectile::Spawn(const glm::vec3& startPosition, cxx::angle_t startRotatio
     // setup sprite rotation and scale
     cxx::angle_t rotationAngle = startRotation + cxx::angle_t::from_degrees(SPRITE_ZERO_ANGLE);
     mDrawSprite.mRotateAngle = rotationAngle;
-    mDrawSprite.mScale = SPRITE_SCALE;
 }
 
 void Projectile::UpdateFrame()