-

Author: codenamecpp

src/Decoration.cpp

@@ -2,7 +2,6 @@
 #include "Decoration.h"
 #include "TimeManager.h"
 #include "SpriteManager.h"
-#include "GameCheatsWindow.h"
 
 Decoration::Decoration(GameObjectID id, GameObjectStyle* desc) 
     : GameObject(eGameObjectClass_Decoration, id)
@@ -15,14 +14,10 @@ Decoration::~Decoration()
 {
 }
 
-void Decoration::DrawFrame(SpriteBatch& spriteBatch)
+void Decoration::PreDrawFrame()
 {
-    if (!gGameCheatsWindow.mEnableDrawDecorations)
-        return;
-
     gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetCurrentFrame(), 0, mDrawSprite);
     mDrawSprite.SetOriginToCenter();
-    spriteBatch.DrawSprite(mDrawSprite);
 }
 
 void Decoration::UpdateFrame()

src/Decoration.h

@@ -14,7 +14,7 @@ class Decoration final: public GameObject
     ~Decoration();
 
     // override GameObject
-    void DrawFrame(SpriteBatch& spriteBatch) override;
+    void PreDrawFrame() override;
     void UpdateFrame() override;
     void DrawDebug(DebugRenderer& debugRender) override;
 
@@ -23,6 +23,5 @@ class Decoration final: public GameObject
 
 private:
     SpriteAnimation mAnimationState;
-    Sprite2D mDrawSprite;
     GameObjectStyle* mGameObjectDesc = nullptr;
 };

src/GameObject.h

@@ -8,6 +8,7 @@ class DebugRenderer;
 class GameObject: public cxx::noncopyable
 {
     friend class GameObjectsManager;
+    friend class MapRenderer;
 
     // add runtime information support for gameobject
     decl_rtti_base(GameObject)
@@ -22,8 +23,8 @@ class GameObject: public cxx::noncopyable
 public:
     virtual ~GameObject();
 
-    // draw gameobject
-    virtual void DrawFrame(SpriteBatch& spriteBatch)
+    // update drawing sprite
+    virtual void PreDrawFrame()
     {
     }
     // process logic
@@ -74,6 +75,9 @@ class GameObject: public cxx::noncopyable
     GameObject* mParentObject = nullptr;
     std::vector<GameObject*> mAttachedObjects;
 
+    // drawing spricific data
+    Sprite2D mDrawSprite;
+
 private:
     // marked object will be destroyed next game frame
     bool mMarkedForDeletion = false;

src/MapRenderer.cpp

@@ -111,7 +111,17 @@ void MapRenderer::DrawGameObject(RenderView* renderview, GameObject* gameObject)
     if (gameObject->IsMarkedForDeletion() || gameObject->IsInvisibleFlag())
         return;
 
-    gameObject->DrawFrame(mSpriteBatch);
+    bool dbgSkipDraw = 
+        (!gGameCheatsWindow.mEnableDrawPedestrians && gameObject->IsPedestrianClass()) ||
+        (!gGameCheatsWindow.mEnableDrawVehicles && gameObject->IsVehicleClass()) ||
+        (!gGameCheatsWindow.mEnableDrawObstacles && gameObject->IsObstacleClass()) ||
+        (!gGameCheatsWindow.mEnableDrawDecorations && gameObject->IsDecorationClass());
+
+    if (!dbgSkipDraw)
+    {
+        gameObject->PreDrawFrame();
+        mSpriteBatch.DrawSprite(gameObject->mDrawSprite);
+    }
 
     if (!gameObject->HasAttachedObjects())
         return;

src/Obstacle.cpp

@@ -2,7 +2,6 @@
 #include "Obstacle.h"
 #include "TimeManager.h"
 #include "SpriteManager.h"
-#include "GameCheatsWindow.h"
 
 Obstacle::Obstacle(GameObjectID id, GameObjectStyle* desc) 
     : GameObject(eGameObjectClass_Obstacle, id)
@@ -15,14 +14,10 @@ Obstacle::~Obstacle()
 {
 }
 
-void Obstacle::DrawFrame(SpriteBatch& spriteBatch)
+void Obstacle::PreDrawFrame()
 {
-    if (!gGameCheatsWindow.mEnableDrawObstacles)
-        return;
-
     gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetCurrentFrame(), 0, mDrawSprite);
     mDrawSprite.SetOriginToCenter();
-    spriteBatch.DrawSprite(mDrawSprite);
 }
 
 void Obstacle::UpdateFrame()

src/Obstacle.h

@@ -14,7 +14,7 @@ class Obstacle final: public GameObject
     ~Obstacle();
 
     // override GameObject
-    void DrawFrame(SpriteBatch& spriteBatch) override;
+    void PreDrawFrame() override;
     void UpdateFrame() override;
     void DrawDebug(DebugRenderer& debugRender) override;
 
@@ -23,6 +23,5 @@ class Obstacle final: public GameObject
 
 private:
     SpriteAnimation mAnimationState;
-    Sprite2D mDrawSprite;
     GameObjectStyle* mGameObjectDesc = nullptr;
 };

src/Pedestrian.cpp

@@ -8,7 +8,6 @@
 #include "PedestrianStates.h"
 #include "Vehicle.h"
 #include "TimeManager.h"
-#include "GameCheatsWindow.h"
 
 Pedestrian::Pedestrian(GameObjectID id) : GameObject(eGameObjectClass_Pedestrian, id)
     , mPhysicsBody()
@@ -86,22 +85,11 @@ void Pedestrian::UpdateFrame()
     mStatesManager.ProcessFrame();
 }
 
-void Pedestrian::DrawFrame(SpriteBatch& spriteBatch)
+void Pedestrian::PreDrawFrame()
 {
     glm::vec3 position = mPhysicsBody->mSmoothPosition;
     ComputeDrawHeight(position);
 
-    if (!gGameCheatsWindow.mEnableDrawPedestrians)
-        return;
-
-    ePedestrianState currState = GetCurrentStateID();
-    if (currState == ePedestrianState_DrivingCar)
-    {
-        // dont draw pedestrian if it in car with hard top
-        if (mDrawHeight < mCurrentCar->mDrawHeight) // todo: check car props
-            return;
-    }
-
     cxx::angle_t rotationAngle = mPhysicsBody->GetRotationAngle() - cxx::angle_t::from_degrees(SPRITE_ZERO_ANGLE);
 
     int spriteIndex = mCurrentAnimState.GetCurrentFrame();
@@ -113,7 +101,6 @@ void Pedestrian::DrawFrame(SpriteBatch& spriteBatch)
     mDrawSprite.mRotateAngle = rotationAngle;
     mDrawSprite.mHeight = mDrawHeight;
     mDrawSprite.SetOriginToCenter();
-    spriteBatch.DrawSprite(mDrawSprite);
 }
 
 void Pedestrian::DrawDebug(DebugRenderer& debugRender)
@@ -136,10 +123,8 @@ void Pedestrian::ComputeDrawHeight(const glm::vec3& position)
 {
     if (mCurrentCar)
     {
-        bool isBike = (mCurrentCar->mCarStyle->mVType == eCarVType_Motorcycle);
         // dont draw pedestrian if it in car with hard top
-        if ((mCurrentCar->mCarStyle->mConvertible == eCarConvertible_HardTop ||
-            mCurrentCar->mCarStyle->mConvertible == eCarConvertible_HardTopAnimated) && !isBike)
+        if (mCurrentCar->HasHardTop())
         {
             mDrawHeight = mCurrentCar->mDrawHeight - 0.01f; // todo: magic numbers
         }

src/Pedestrian.h

@@ -47,7 +47,7 @@ class Pedestrian final: public GameObject
 
     // override GameObject
     void UpdateFrame() override;
-    void DrawFrame(SpriteBatch& spriteBatch) override;
+    void PreDrawFrame() override;
     void DrawDebug(DebugRenderer& debugRender) override;
 
     // setup initial state when spawned or respawned on level
@@ -104,8 +104,6 @@ class Pedestrian final: public GameObject
     ePedestrianAnimID mCurrentAnimID;
     SpriteAnimation mCurrentAnimState;
     PedestrianStatesManager mStatesManager;
-
-    Sprite2D mDrawSprite;
 };
 
 const int Sizeof_Pedestrian = sizeof(Pedestrian);

src/PedestrianStates.cpp

@@ -91,7 +91,7 @@ void PedestrianStatesManager::InitFuncsTable()
         &PedestrianStatesManager::StateDummy_ProcessEvent};
 
     mFuncsTable[ePedestrianState_DrivingCar] = {&PedestrianStatesManager::StateDriveCar_ProcessEnter, 
-        &PedestrianStatesManager::StateDummy_ProcessExit, 
+        &PedestrianStatesManager::StateDriveCar_ProcessExit, 
         &PedestrianStatesManager::StateDummy_ProcessFrame, 
         &PedestrianStatesManager::StateDriveCar_ProcessEvent};
 
@@ -347,11 +347,27 @@ void PedestrianStatesManager::StateDead_ProcessEnter(const PedestrianStateEvent&
 
 //////////////////////////////////////////////////////////////////////////
 
-
 void PedestrianStatesManager::StateDriveCar_ProcessEnter(const PedestrianStateEvent& stateEvent)
 {
     bool isBike = (mPedestrian->mCurrentCar->mCarStyle->mVType == eCarVType_Motorcycle);
     mPedestrian->SetAnimation(isBike ? ePedestrianAnim_SittingOnBike : ePedestrianAnim_SittingInCar, eSpriteAnimLoop_None);
+
+    // dont draw pedestrian if it in car with hard top
+    if (mPedestrian->mCurrentCar->HasHardTop())
+    {
+        eGameObjectFlags flags = mPedestrian->mFlags | eGameObjectFlags_Invisible;
+        mPedestrian->mFlags = flags;
+    }
+}
+
+void PedestrianStatesManager::StateDriveCar_ProcessExit()
+{
+    // show ped
+    if (mPedestrian->mCurrentCar->HasHardTop())
+    {
+        eGameObjectFlags flags = mPedestrian->mFlags ^ eGameObjectFlags_Invisible;
+        mPedestrian->mFlags = flags;
+    }
 }
 
 bool PedestrianStatesManager::StateDriveCar_ProcessEvent(const PedestrianStateEvent& stateEvent)

src/PedestrianStates.h

@@ -88,6 +88,7 @@ class PedestrianStatesManager: public cxx::noncopyable
 
     // state driving car
     void StateDriveCar_ProcessEnter(const PedestrianStateEvent& stateEvent);
+    void StateDriveCar_ProcessExit();
     bool StateDriveCar_ProcessEvent(const PedestrianStateEvent& stateEvent);
 
     // state exit car