Enhanced Radar

Author: atupone

data/playing.vert

@@ -21,11 +21,16 @@ uniform bool  localViewer;
 uniform int   texGen;
 uniform float zTank;
 uniform float repeat;
+uniform int   csProc;
 
 const int texGenNone      = 0;
 const int texGenSphereMap = 1;
 const int texGenLinear    = 2;
 
+const int csNone  = 0;
+const int csColor = 1;
+const int csColTr = 2;
+
 vec3 ecPosition3;
 vec3 normal;
 vec3 eye;
@@ -94,6 +99,40 @@ void Light(in gl_LightProducts lightProduct,
     specular += lightProduct.specular * pf * attenuation;
 }
 
+float colorScale(float z, float h)
+{
+    float atten = zTank - (z + h);
+    if (atten < 0.0)
+        atten = z - zTank;
+    if (atten < 0.0)
+        atten = 0.0;
+
+    const float colorFactor = 40.0;
+    atten /= colorFactor;
+
+    float scale = max(1.0 - atten, 0.35);
+
+    return scale;
+}
+
+float transScale(const float z, const float h)
+{
+    float atten = zTank - (z + h);
+
+    if (atten <= 0.0)
+        atten = z - zTank;
+
+    if (atten <= 0.0)
+        atten = 0.0;
+
+    const float colorFactor = 40.0;
+    atten /= colorFactor;
+
+    float scale = max(1.0 - atten, 0.5);
+
+    return scale;
+}
+
 void setOutput(in vec4 ecPosition, in vec4 texCoord, in vec4 color)
 {
     // Transform vertex to clip space
@@ -105,7 +144,23 @@ void setOutput(in vec4 ecPosition, in vec4 texCoord, in vec4 color)
 
     gl_ClipVertex  = ecPosition;
     gl_TexCoord[0] = texCoord;
-    gl_FrontColor          = color;
+    if (csProc == csNone)
+    {
+        gl_FrontColor = color;
+    }
+    else
+    {
+        float z     = ecPosition.z;
+        float bh    = color.a;
+        float scale = colorScale(z, bh);
+        if (csProc == csColTr)
+        {
+            float trans = transScale(z, bh);
+            gl_FrontColor = vec4(scale * color.rgb, trans);
+        }
+        else if (csProc == csColor)
+            gl_FrontColor = vec4(scale * color.rgb, 1.0);
+    }
     gl_FrontSecondaryColor = vec4(0.0, 0.0, 0.0, 1.0);
     gl_BackSecondaryColor  = gl_FrontSecondaryColor;
     gl_BackColor           = gl_FrontColor;

include/Makefile.am

@@ -126,6 +126,7 @@ noinst_HEADERS =			\
 	TimeKeeper.h			\
 	TriWallSceneNode.h		\
 	Vertex_Chunk.h			\
+	Vertex_Chunkes.h		\
 	ViewFrustum.h			\
 	VotingBooth.h			\
 	VBO_Geometry.h			\

include/PlayingShader.h

@@ -40,11 +40,16 @@ class PlayingShader: public Singleton<PlayingShader>, public Shader
     int  setTexGen(int texGenMode);
     void setZTank(float zTank);
     void setRepeat(float repeat);
+    void setColorProcessing(int csProc);
 
     const int texGenNone      = 0;
     const int texGenSphereMap = 1;
     const int texGenLinear    = 2;
 
+    const int csNone  = 0;
+    const int csColor = 1;
+    const int csColTr = 2;
+
 protected:
     friend class Singleton<PlayingShader>;
 
@@ -65,6 +70,7 @@ class PlayingShader: public Singleton<PlayingShader>, public Shader
     GLint texGenUniform;
     GLint zTankUniform;
     GLint repeatUniform;
+    GLint csProcUniform;
 
     GLint   lightEnabled[128];
     GLint   maxLights;

include/Vertex_Chunkes.h

@@ -0,0 +1,43 @@
+/* bzflag
+ * Copyright (c) 2019-2019 Tim Riker
+ *
+ * This package is free software;  you can redistribute it and/or
+ * modify it under the terms of the license found in the file
+ * named COPYING that should have accompanied this file.
+ *
+ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#pragma once
+
+// 1st
+#include "common.h"
+
+// Common headers
+#include "Vertex_Chunk.h"
+
+class Vertex_Chunkes
+{
+public:
+    Vertex_Chunkes();
+    ~Vertex_Chunkes();
+
+    void setChunkes(std::vector<Vertex_Chunk> &chunkes);
+
+    void draw(GLenum mode);
+private:
+    GLint      *first;
+    GLsizei    *count;
+    int         drawCount;
+    VBO_Vertex *myVBO;
+};
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 4 ***
+// c-basic-offset: 4 ***
+// indent-tabs-mode: nil ***
+// End: ***
+// ex: shiftwidth=4 tabstop=4

src/bzflag/GuidedMissleStrategy.cxx

@@ -24,6 +24,7 @@
 #include "Intersect.h"
 #include "OpenGLAPI.h"
 #include "VBO_Drawing.h"
+#include "PlayingShader.h"
 
 /* local implementation headers */
 #include "LocalPlayer.h"
@@ -479,13 +480,13 @@ void GuidedMissileStrategy::radarRender()
 
     float shotTailLength = BZDB.eval(StateDatabase::BZDB_SHOTTAILLENGTH);
     glPushMatrix();
-    glTranslatef(orig[0], orig[1], 0.0f);
+    glTranslate(orig);
     // Display leading lines
     if (length > 0)
     {
         const auto vel = getPath().getVelocity();
         const auto dir = glm::normalize(vel) * shotTailLength * float(length);
-        glScalef(dir[0], dir[1], 0.0f);
+        glScalef(dir[0], dir[1], 1.0f);
         if (BZDBCache::leadingShotLine == 1)   //leading
             DRAWER.leadingLine();
         else if (BZDBCache::leadingShotLine == 0)     //lagging
@@ -496,10 +497,12 @@ void GuidedMissileStrategy::radarRender()
         // draw a "bright reddish" missle tip
         if (size > 0)
         {
+            SHADER.setColorProcessing(SHADER.csNone);
             glColor4f(1.0f, 0.75f, 0.75f, 1.0f);
             glPointSize((float)size);
             DRAWER.point();
             glPointSize(1.0f);
+            SHADER.setColorProcessing(SHADER.csColor);
         }
     }
     else