-

Author: codenamecpp

src/GameCamera.cpp

@@ -140,6 +140,21 @@ bool GameCamera::CastRayFromScreenPoint(const glm::ivec2& screenCoordinate, cxx:
     return true;
 }
 
+bool GameCamera::ProjectPointToScreen(const glm::vec3& point, glm::vec2& resultScreenPoint)
+{
+    const glm::ivec4 viewport { 
+        mViewportRect.x, 
+        mViewportRect.y, 
+        mViewportRect.w, 
+        mViewportRect.h };
+    glm::vec3 screenCoordinate = glm::project(point, mViewMatrix, mProjectionMatrix, viewport);
+    
+    resultScreenPoint.x = (screenCoordinate.x);
+    resultScreenPoint.y = (mViewportRect.h - 1.0f - screenCoordinate.y);
+
+    return true;
+}
+
 void GameCamera::SetTopDownOrientation()
 {
     mFrontDirection = -SceneAxisY;

src/GameCamera.h

@@ -89,6 +89,9 @@ class GameCamera final
     // @param resultRay: Output ray info
     bool CastRayFromScreenPoint(const glm::ivec2& screenCoordinate, cxx::ray3d_t& resultRay);
 
+    // Transform world space point to screen space point, make sure to ComputeMatricesAndFrustum
+    bool ProjectPointToScreen(const glm::vec3& point, glm::vec2& resultScreenPoint);
+
     // Will swap Z and Y direction vectors
     void SetTopDownOrientation();
 

src/GameDefs.h

@@ -139,6 +139,7 @@ enum eSpriteDrawOrder: unsigned char
     eSpriteDrawOrder_CarPassenger,
     eSpriteDrawOrder_Car,
     eSpriteDrawOrder_ConvetibleCarPassenger,
+    eSpriteDrawOrder_CarRoof,
     eSpriteDrawOrder_JumpingPedestrian,
     eSpriteDrawOrder_Trees,
     eSpriteDrawOrder_Projectiles,
@@ -157,6 +158,7 @@ decl_enum_strings(eSpriteDrawOrder);
 enum
 {
     // hud
+    eSpriteID_Arrow_Pointer = 24,
     eSpriteID_Arrow_AreaDisplayLeft = 25,
     eSpriteID_Arrow_AreaDisplayRight = 26,
     eSpriteID_Arrow_VehicleDisplay = 27,

src/HUD.cpp

@@ -523,6 +523,11 @@ void HUD::DrawFrame(GuiContext& guiContext)
             currentPanel->DrawFrame(guiContext);
         }
     }
+
+    if (CheckCharacterObscure())
+    {
+        DrawArrowAboveCharacter(guiContext);
+    }
 }
 
 void HUD::PushPagerMessage()
@@ -734,4 +739,45 @@ void HUD::TickAutoHidePanels()
 
         ++panels_iterator;
     }
-}
+}
+
+bool HUD::CheckCharacterObscure() const
+{
+    Pedestrian* pedestrian = mHumanPlayer->mCharacter;
+    debug_assert(pedestrian);
+
+    const glm::vec3& worldPosition = pedestrian->mTransformSmooth.mPosition;
+    // convert to map position
+    glm::ivec3 mapPosition = Convert::MetersToMapUnits(worldPosition);
+    for (int currentBlockLayer = mapPosition.y + 1; currentBlockLayer < MAP_LAYERS_COUNT; ++currentBlockLayer)
+    {
+        const MapBlockInfo* currBlock = gGameMap.GetBlockInfo(mapPosition.x, mapPosition.z, currentBlockLayer);
+        if (currBlock->mFaces[eBlockFace_Lid] > 0)
+        {
+            int bp = 0;
+            return true;
+        }
+    }
+    return false;
+}
+
+void HUD::DrawArrowAboveCharacter(GuiContext& guiContext)
+{
+    Pedestrian* pedestrian = mHumanPlayer->mCharacter;
+    debug_assert(pedestrian);
+
+    // setup arrow sprite
+    Sprite2D arrowSprite;
+    gSpriteManager.GetSpriteTexture(GAMEOBJECT_ID_NULL, eSpriteID_Arrow_Pointer, 0, arrowSprite);
+
+    arrowSprite.mScale = HUD_SPRITE_SCALE;
+    arrowSprite.mDrawOrder = eSpriteDrawOrder_HUD_Arrow;
+    // set rotation
+    arrowSprite.mRotateAngle = pedestrian->mTransformSmooth.mOrientation + cxx::angle_t::from_degrees(SPRITE_ZERO_ANGLE);
+
+    // convert character position to screen position
+    GameCamera& gameCamera = mHumanPlayer->mPlayerView.mCamera;
+    gameCamera.ProjectPointToScreen(pedestrian->mTransformSmooth.mPosition, arrowSprite.mPosition);
+
+    guiContext.mSpriteBatch.DrawSprite(arrowSprite);
+}

src/HUD.h

@@ -205,10 +205,15 @@ class HUD final: public cxx::noncopyable
     void ArrangePanelsHorz(const Rect& bounds, eHUDPanelAlign panelsAlign, int spacing, const std::initializer_list<HUDPanel*>& panels);
     void ArrangePanelsVert(const Rect& bounds, eHUDPanelAlign panelsAlign, int spacing, const std::initializer_list<HUDPanel*>& panels);
 
+    void DrawArrowAboveCharacter(GuiContext& guiContext);
+
     // Manager auto-hide panels
     void ShowAutoHidePanel(HUDPanel* panel, float showDuration);
     void TickAutoHidePanels();
 
+    // Test whether character is hidden by solid geometry
+    bool CheckCharacterObscure() const;
+
 private:
     HumanPlayer* mHumanPlayer = nullptr;
 

src/Vehicle.cpp

@@ -799,13 +799,12 @@ void Vehicle::SetBurnEffectActive(bool activate)
     {
         debug_assert(mFireEffect == nullptr);
         GameObjectInfo& objectInfo = gGameMap.mStyleData.mObjects[GameObjectType_Fire1];
-        mFireEffect = gGameObjectsManager.CreateDecoration(
-            mPhysicsBody->GetPosition(), 
-            mPhysicsBody->GetOrientation(), &objectInfo);
+        mFireEffect = gGameObjectsManager.CreateDecoration(mTransform.mPosition, mTransform.mOrientation, &objectInfo);
         debug_assert(mFireEffect);
         if (mFireEffect)
         {
             mFireEffect->SetLifeDuration(0);
+            mFireEffect->SetDrawOrder(eSpriteDrawOrder_CarRoof);
             AttachObject(mFireEffect);
         }
         mBurnStartTime = gTimeManager.mGameTime;
@@ -969,22 +968,12 @@ float Vehicle::GetCurrentSpeed() const
     return 0.0f;
 }
 
-void Vehicle::SetDrawOrder(eSpriteDrawOrder drawOrder)
-{
-    if (mFireEffect)
-    {
-        mFireEffect->SetDrawOrder(drawOrder);
-    }
-
-    mDrawSprite.mDrawOrder = drawOrder;
-}
 
 void Vehicle::SetupCarSprite()
 {
     int remapClut = mRemapIndex == NO_REMAP ? 0 : (mCarInfo->mRemapsBaseIndex + mRemapIndex);
     gSpriteManager.GetSpriteTexture(mObjectID, mSpriteIndex, remapClut, GetSpriteDeltas(), mDrawSprite);
-
-    SetDrawOrder(eSpriteDrawOrder_Car);
+    mDrawSprite.mDrawOrder = eSpriteDrawOrder_Car;
     RefreshDrawSprite();
 }
 

src/Vehicle.h

@@ -128,7 +128,6 @@ class Vehicle final: public GameObject, public SpriteAnimListener
     void UpdateDamageFromRailways();
 
     void SetupCarSprite();
-    void SetDrawOrder(eSpriteDrawOrder drawOrder);
 
     SpriteDeltaBits GetSpriteDeltas() const;
 

src/enums_impl.cpp

@@ -609,6 +609,7 @@ impl_enum_strings(eSpriteDrawOrder)
     {eSpriteDrawOrder_CarPassenger, "carPassenger"},
     {eSpriteDrawOrder_Car, "car"},
     {eSpriteDrawOrder_ConvetibleCarPassenger, "convertibleCarPassenger"},
+    {eSpriteDrawOrder_CarRoof, "carRoof"},
     {eSpriteDrawOrder_JumpingPedestrian, "jumpingPedestrian"},
     {eSpriteDrawOrder_Trees, "trees"},
     {eSpriteDrawOrder_Projectiles, "projectiles"},