cleanup

Author: codenamecpp

gamedata/entities/weapons.json

@@ -19,9 +19,9 @@
         "projectile_hit_object_sfx": 43, // sound index
         "projectile_offset":
         [
-            { "anim": "shoot_pistol_while_standing", "px": [8, -1] },
-            { "anim": "shoot_pistol_while_walking", "px": [11, -2] },
-            { "anim": "shoot_pistol_while_running", "px": [11, 2] }
+            { "anim": "shoot_pistol_while_standing", "px": [8, 2] },
+            { "anim": "shoot_pistol_while_walking", "px": [11, 0] },
+            { "anim": "shoot_pistol_while_running", "px": [11, 5] }
         ],
         // base params
         "base_hit_range": 4.5,
@@ -44,9 +44,9 @@
         "projectile_hit_object_sfx": 43, // sound index
         "projectile_offset":
         [
-            { "anim": "shoot_machinegun_while_standing", "px": [6, 0] },
-            { "anim": "shoot_machinegun_while_walking", "px": [8, 0] },
-            { "anim": "shoot_machinegun_while_running", "px": [12, 4] }
+            { "anim": "shoot_machinegun_while_standing", "px": [6, 3] },
+            { "anim": "shoot_machinegun_while_walking", "px": [10, 3] },
+            { "anim": "shoot_machinegun_while_running", "px": [11, 7] }
         ],
         // base params
         "base_hit_range": 4.5,
@@ -68,9 +68,9 @@
         "projectile_object": 75,
         "projectile_offset":
         [
-            { "anim": "shoot_flamethrower_while_standing", "px": [18, 2] },
-            { "anim": "shoot_flamethrower_while_walking", "px": [18, 2] },
-            { "anim": "shoot_flamethrower_while_running", "px": [20, 5] }
+            { "anim": "shoot_flamethrower_while_standing", "px": [16, 3] },
+            { "anim": "shoot_flamethrower_while_walking", "px": [16, 3] },
+            { "anim": "shoot_flamethrower_while_running", "px": [18, 6] }
         ],
         // base params
         "base_hit_range": 1.1,

src/DamageInfo.cpp

@@ -81,10 +81,8 @@ void DamageInfo::SetDamageFromCollision(const MapCollision& collisionInfo)
     mHitPoints = 0; // not used
     mContactImpulse = collisionInfo.GetContactImpulse();
     if (!collisionInfo.HasContactPoints())
-    {
-        debug_assert(false);
         return;
-    }
+
     mContactPoint = collisionInfo.mContactPoints[0];
 }
 

src/Decoration.cpp

@@ -20,7 +20,7 @@ void Decoration::UpdateFrame()
     float deltaTime = gTimeManager.mGameFrameDelta;
     if (mAnimationState.UpdateFrame(deltaTime))
     {
-        SetupSpriteFrame();
+        SetSprite(mAnimationState.GetSpriteIndex(), 0);
     }
 
     glm::vec3 newPosition = mTransform.mPosition + (mMoveVelocity * deltaTime);
@@ -41,10 +41,12 @@ void Decoration::DebugDraw(DebugRenderer& debugRender)
 
 void Decoration::HandleSpawn()
 {
+    mRemapClut = 0;
+
     mAnimationState.ClearState();
     mAnimationState.PlayAnimation(eSpriteAnimLoop_FromStart);
 
-    SetupSpriteFrame();
+    SetSprite(mAnimationState.GetSpriteIndex(), 0);
 }
 
 void Decoration::SetLifeDuration(int numCycles)
@@ -68,9 +70,3 @@ void Decoration::SetMoveVelocity(const glm::vec3& moveVelocity)
 {
     mMoveVelocity = moveVelocity;
 }
-
-void Decoration::SetupSpriteFrame()
-{
-    gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetSpriteIndex(), 0, mDrawSprite);
-    RefreshDrawSprite();
-}

src/Decoration.h

@@ -25,9 +25,6 @@ class Decoration final: public GameObject
     // Change current draw order for decoration object
     void SetDrawOrder(eSpriteDrawOrder drawOrder);
 
-private:
-    void SetupSpriteFrame();
-
 private:
     SpriteAnimation mAnimationState;
     glm::vec3 mMoveVelocity;

src/Explosion.cpp

@@ -61,6 +61,7 @@ void Explosion::DebugDraw(DebugRenderer& debugRender)
 
 void Explosion::HandleSpawn()
 {
+    mRemapClut = 0;
     mUpdatesCounter = 0;
 
     mDrawSprite.mDrawOrder = eSpriteDrawOrder_Explosion;

src/GameDefs.h

@@ -126,6 +126,13 @@ enum eSpriteOriginMode: unsigned char
     eSpriteOrigin_Center,
 };
 
+enum eSpriteOrientation: unsigned char
+{
+    eSpriteOrientation_N, // +90 degrees
+    eSpriteOrientation_E, // 0 degrees, default
+    eSpriteOrientation_S // -90 degrees
+};
+
 // Object sprites draw prioriry
 enum eSpriteDrawOrder: unsigned char
 {

src/GameObject.cpp

@@ -5,6 +5,7 @@
 #include "AudioManager.h"
 #include "PhysicsManager.h"
 #include "GameMapManager.h"
+#include "SpriteManager.h"
 
 GameObject::GameObject(eGameObjectClass objectTypeID, GameObjectID uniqueID)
     : mObjectID(uniqueID)
@@ -40,6 +41,19 @@ void GameObject::FreeSounds()
     }
 }
 
+void GameObject::SetSprite(int spriteIndex, SpriteDeltaBits deltaBits)
+{
+    if (deltaBits > 0)
+    {
+        gSpriteManager.GetSpriteTexture(mObjectID, spriteIndex, mRemapClut, deltaBits, mDrawSprite);
+    }
+    else
+    {
+        gSpriteManager.GetSpriteTexture(mObjectID, spriteIndex, mRemapClut, mDrawSprite);
+    }
+    RefreshDrawSprite();
+}
+
 void GameObject::SetPhysics(PhysicsBody* physicsBody)
 {
     if (mPhysicsBody)
@@ -120,7 +134,17 @@ bool GameObject::ReceiveDamage(const DamageInfo& damageInfo)
 
 void GameObject::RefreshDrawSprite()
 {
-    mDrawSprite.mRotateAngle = mTransformSmooth.mOrientation - cxx::angle_t::from_degrees(SPRITE_ZERO_ANGLE);
+    cxx::angle_t angleOffset;
+    if (mDrawSpriteOrientation == eSpriteOrientation_N)
+    {
+        angleOffset = cxx::angle_t::from_degrees(SPRITE_ZERO_ANGLE);
+    }
+    if (mDrawSpriteOrientation == eSpriteOrientation_S)
+    {
+        angleOffset = -cxx::angle_t::from_degrees(SPRITE_ZERO_ANGLE);
+    }
+
+    mDrawSprite.mRotateAngle = mTransformSmooth.mOrientation + angleOffset;
 
     mDrawSprite.mPosition.x = mTransformSmooth.mPosition.x;
     mDrawSprite.mPosition.y = mTransformSmooth.mPosition.z;

src/GameObject.h

@@ -122,6 +122,7 @@ class GameObject: public cxx::handled_object
     void InitSounds();
     void FreeSounds();
 
+    void SetSprite(int spriteIndex, SpriteDeltaBits deltaBits = 0);
     void SetPhysics(PhysicsBody* physicsBody);
     void SetParentObject(GameObject* gameObject);
     void RefreshDrawSprite();
@@ -145,6 +146,8 @@ class GameObject: public cxx::handled_object
 
     // drawing spricific data
     Sprite2D mDrawSprite;
+    eSpriteOrientation mDrawSpriteOrientation = eSpriteOrientation_S;
+    int mRemapClut = 0;
     cxx::aabbox2d_t mDrawBounds; // sprite bounds cache
 
 private:

src/Obstacle.cpp

@@ -19,7 +19,7 @@ void Obstacle::UpdateFrame()
     float deltaTime = gTimeManager.mGameFrameDelta;
     if (mAnimationState.UpdateFrame(deltaTime))
     {
-        SetupSpriteFrame();
+        SetSprite(mAnimationState.GetSpriteIndex(), 0);
     }
 }
 
@@ -31,16 +31,12 @@ void Obstacle::HandleSpawn()
 {
     debug_assert(mGameObjectDesc);
 
+    mRemapClut = 0;
+
     mAnimationState.Clear();
     mAnimationState.mAnimDesc = mGameObjectDesc->mAnimationData;
 
     //mAnimationState.PlayAnimation(eSpriteAnimLoop_FromStart);
 
-    SetupSpriteFrame();
-}
-
-void Obstacle::SetupSpriteFrame()
-{
-    gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetSpriteIndex(), 0, mDrawSprite);
-    RefreshDrawSprite();
+    SetSprite(mAnimationState.GetSpriteIndex(), 0);
 }

src/Obstacle.h

@@ -14,9 +14,6 @@ class Obstacle final: public GameObject
     void DebugDraw(DebugRenderer& debugRender) override;
     void HandleSpawn() override;
 
-private:
-    void SetupSpriteFrame();
-
 private:
     SpriteAnimation mAnimationState;
     GameObjectInfo* mGameObjectDesc = nullptr;