#66

Author: codenamecpp

src/Convert.h

@@ -40,7 +40,7 @@ class Convert
     {  
         return {
             MetersToMapUnits(units.x),
-            MetersToMapUnits(units.y),
+            MetersToMapUnits(units.y + 0.5f), // extra offset for height to get things work
             MetersToMapUnits(units.z)
         };
     }

src/Decoration.cpp

@@ -20,8 +20,7 @@ void Decoration::UpdateFrame()
     float deltaTime = gTimeManager.mGameFrameDelta;
     if (mAnimationState.UpdateFrame(deltaTime))
     {
-        gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetSpriteIndex(), 0, mDrawSprite);
-        RefreshDrawSprite();
+        SetupSpriteFrame();
     }
 
     glm::vec3 newPosition = mTransform.mPosition + (mMoveVelocity * deltaTime);
@@ -44,8 +43,8 @@ void Decoration::HandleSpawn()
 {
     mAnimationState.ClearState();
     mAnimationState.PlayAnimation(eSpriteAnimLoop_FromStart);
-    gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetSpriteIndex(), 0, mDrawSprite);
-    RefreshDrawSprite();
+
+    SetupSpriteFrame();
 }
 
 void Decoration::SetLifeDuration(int numCycles)
@@ -68,4 +67,10 @@ void Decoration::SetScale(float scale)
 void Decoration::SetMoveVelocity(const glm::vec3& moveVelocity)
 {
     mMoveVelocity = moveVelocity;
-}
+}
+
+void Decoration::SetupSpriteFrame()
+{
+    gSpriteManager.GetSpriteTexture(mObjectID, mAnimationState.GetSpriteIndex(), 0, mDrawSprite);
+    RefreshDrawSprite();
+}

src/Decoration.h

@@ -25,6 +25,9 @@ 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

@@ -72,10 +72,7 @@ void Explosion::HandleSpawn()
     mAnimationState.PlayAnimation(eSpriteAnimLoop_FromStart);
     mAnimationState.SetMaxRepeatCycles(1);
 
-    if (!gSpriteManager.GetExplosionTexture(0, mDrawSprite))
-    {
-        debug_assert(false);
-    }
+    gSpriteManager.GetExplosionTexture(0, mDrawSprite);
     RefreshDrawSprite();
     // broadcast event
     glm::vec2 position2 (mTransform.mPosition.x, mTransform.mPosition.z);

src/GameMapManager.cpp

@@ -304,11 +304,8 @@ const DistrictInfo* GameMapManager::GetDistrictByIndex(int districtIndex) const
 float GameMapManager::GetHeightAtPosition(const glm::vec3& position, bool excludeWater) const
 {
     // get map block position in which we are located
-    glm::ivec3 mapBlock {
-        Convert::MetersToMapUnits(position.x),
-        Convert::MetersToMapUnits(position.y) + 0.5f,
-        Convert::MetersToMapUnits(position.z)
-    };
+    glm::ivec3 mapBlock = Convert::MetersToMapUnits(position);
+
     float currentHeight = (float) mapBlock.y; // set current height to ground, map units
     for (; currentHeight > 0.0f;)
     {

src/HUD.cpp

@@ -746,17 +746,20 @@ bool HUD::CheckCharacterObscure() const
     Pedestrian* pedestrian = mHumanPlayer->mCharacter;
     debug_assert(pedestrian);
 
-    const glm::vec3& worldPosition = pedestrian->mTransformSmooth.mPosition;
+    const glm::vec3& worldPosition = pedestrian->mTransform.mPosition;
     // convert to map position
     glm::ivec3 mapPosition = Convert::MetersToMapUnits(worldPosition);
-    for (int currentBlockLayer = mapPosition.y + 1; currentBlockLayer < MAP_LAYERS_COUNT; ++currentBlockLayer)
+    for (int currentBlockLayer = mapPosition.y; currentBlockLayer < MAP_LAYERS_COUNT; ++currentBlockLayer)
     {
         const MapBlockInfo* currBlock = gGameMap.GetBlockInfo(mapPosition.x, mapPosition.z, currentBlockLayer);
-        if (currBlock->mFaces[eBlockFace_Lid] > 0)
+        if (currentBlockLayer == mapPosition.y)
         {
-            int bp = 0;
-            return true;
+            if (currBlock->mSlopeType)
+                continue;
         }
+
+        if (currBlock->mFaces[eBlockFace_Lid] && !currBlock->mIsFlat)
+            return true;
     }
     return false;
 }

src/Obstacle.cpp

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

src/Obstacle.h

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

src/PhysicsManager.cpp

@@ -12,6 +12,7 @@
 #include "PhysicsBody.h"
 #include "Collision.h"
 #include "GameObjectHelpers.h"
+#include "AudioManager.h"
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -644,14 +645,15 @@ void PhysicsManager::HandleCollision_CarVsMap(Vehicle* car, b2Contact* contact,
 {
     debug_assert(car);
 
+    int pointCount = contact->GetManifold()->pointCount;
+    float impact = 0.0f;
+    for (int i = 0; i < pointCount; ++i) 
+    {
+        impact = b2Max(impact, impulse->normalImpulses[i]);
+    }
+
     if (gParticleManager.IsCarSparksEffectEnabled())
     {
-        int pointCount = contact->GetManifold()->pointCount;
-        float impact = 0.0f;
-        for (int i = 0; i < pointCount; ++i) 
-        {
-            impact = b2Max(impact, impulse->normalImpulses[i]);
-        }
         b2WorldManifold wmanifold;
         contact->GetWorldManifold(&wmanifold);
 
@@ -663,6 +665,16 @@ void PhysicsManager::HandleCollision_CarVsMap(Vehicle* car, b2Contact* contact,
             gParticleManager.StartCarSparks(contactPoint, velocity, 3);
         }
     }
+
+
+    // sound
+    if (impact > 700.0f)
+    {
+        //gAudioManager.StartSound(eSfxSampleType_Level, SfxLevel_CarCrash4, SfxFlags_RandomPitch, car->mTransform.mPosition);
+    }
+
+    // bounce
+   
 }
 
 void PhysicsManager::ProcessInterpolation()

src/SpriteBatch.cpp

@@ -30,6 +30,11 @@ void SpriteBatch::Clear()
 
 void SpriteBatch::DrawSprite(const Sprite2D& sourceSprite)
 {
+    if (sourceSprite.mTexture == nullptr)
+    {
+        debug_assert(false);
+        return;
+    }
     mSpritesList.push_back(sourceSprite);
 }