EnhancedHUDMarker setting of alpha channel is ignored

atupone · Dec 3, 2023 · f7fa1df · f7fa1df
1 parent 2ef92f2
commit f7fa1df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/bzflag/HUDRenderer.cxx b/src/bzflag/HUDRenderer.cxx
@@ -523,7 +523,7 @@ void            HUDRenderer::addMarker(float _heading, const float *_color )
 }
 
 
-void HUDRenderer::AddEnhancedNamedMarker(const fvec3& pos, const fvec4& color,
+void HUDRenderer::AddEnhancedNamedMarker(const fvec3& pos, const fvec3& color,
         std::string name, bool friendly,
         float zShift)
 {
@@ -536,7 +536,7 @@ void HUDRenderer::AddEnhancedNamedMarker(const fvec3& pos, const fvec4& color,
     enhancedMarkers.push_back(newMarker);
 }
 
-void HUDRenderer::AddEnhancedMarker(const fvec3& pos, const fvec4& color,
+void HUDRenderer::AddEnhancedMarker(const fvec3& pos, const fvec3& color,
                                     bool friendly, float zShift )
 {
     EnhancedHUDMarker newMarker(pos, color);
@@ -548,7 +548,7 @@ void HUDRenderer::AddEnhancedMarker(const fvec3& pos, const fvec4& color,
 void HUDRenderer::AddLockOnMarker(const fvec3& pos, std::string name,
                                   bool friendly, float zShift )
 {
-    const fvec4 color(0.75f, 0.125f, 0.125f, 1.0f);
+    const fvec3 color(0.75f, 0.125f, 0.125f);
     EnhancedHUDMarker newMarker(pos, color);
     newMarker.pos.z += zShift;
     newMarker.name = name;

diff --git a/src/bzflag/HUDRenderer.h b/src/bzflag/HUDRenderer.h
@@ -54,16 +54,16 @@ class EnhancedHUDMarker
 public:
     EnhancedHUDMarker()
         : pos(0.0f, 0.0f, 0.0f)
-        , color(0.0f, 0.0f, 0.0f, 1.0f)
+        , color(0.0f, 0.0f, 0.0f)
         , friendly(false)
     {}
-    EnhancedHUDMarker(const fvec3& p, const fvec4& c)
+    EnhancedHUDMarker(const fvec3& p, const fvec3& c)
         : pos(p)
         , color(c)
         , friendly(false)
     {}
     fvec3 pos;
-    fvec4 color;
+    fvec3 color;
     std::string name;
     bool friendly;
 };
@@ -106,9 +106,9 @@ class HUDRenderer
     void      setRestartKeyLabel(const std::string&);
     void      setTimeLeft(uint32_t timeLeftInSeconds);
 
-    void      AddEnhancedMarker(const fvec3& pos, const fvec4& color,
+    void      AddEnhancedMarker(const fvec3& pos, const fvec3& color,
                                 bool friendly = false, float zShift = 0.0f);
-    void      AddEnhancedNamedMarker(const fvec3& pos, const fvec4& color, std::string name,
+    void      AddEnhancedNamedMarker(const fvec3& pos, const fvec3& color, std::string name,
                                      bool friendly = false, float zShift = 0.0f);
     void      AddLockOnMarker(const fvec3& pos, std::string name,
                               bool friendly = false, float zShift = 0.0f);

diff --git a/src/bzflag/playing.cxx b/src/bzflag/playing.cxx
@@ -4345,7 +4345,7 @@ void setLookAtMarker(void)
         markercolor = RogueTeam;
 
     hud->AddEnhancedNamedMarker(Float3ToVec3(bestTarget->getPosition()),
-                                Float3ToVec4(Team::getTankColor(markercolor)),
+                                Float3ToVec3(Team::getTankColor(markercolor)),
                                 label, isFriendly(bestTarget), 2.0f);
 }
 
@@ -6820,7 +6820,7 @@ static void     prepareTheHUD()
                     const float* flagPos = flag.position;
                     float heading = atan2f(flagPos[1] - myPos[1],flagPos[0] - myPos[0]);
                     hud->addMarker(heading, myTeamColor);
-                    hud->AddEnhancedMarker(Float3ToVec3(flagPos), Float3ToVec4(myTeamColor),
+                    hud->AddEnhancedMarker(Float3ToVec3(flagPos), Float3ToVec3(myTeamColor),
                                            false, BZDBCache::flagPoleSize * 2.0f);
                 }
             }
@@ -6831,9 +6831,9 @@ static void     prepareTheHUD()
             const GLfloat* antidotePos = myTank->getAntidoteLocation();
             float heading = atan2f(antidotePos[1] - myPos[1],
                                    antidotePos[0] - myPos[0]);
-            const float antidoteColor[] = {1.0f, 1.0f, 0.0f,1.0f};
+            const float antidoteColor[] = {1.0f, 1.0f, 0.0f};
             hud->addMarker(heading, antidoteColor);
-            hud->AddEnhancedMarker(Float3ToVec3(antidotePos), Float4ToVec4(antidoteColor), false,
+            hud->AddEnhancedMarker(Float3ToVec3(antidotePos), Float3ToVec3(antidoteColor), false,
                                    BZDBCache::flagPoleSize * 2.0f);
         }
     }