Changeset 25241

Timestamp:

Apr 12, 2021, 2:39:07 PM (3 years ago)

Author:

Vladislav Belov

Message:

Crops minimap view bounds to map size.

Differential Revision: ​https://code.wildfiregames.com/D3837

Location:

ps/trunk

Files:

• binaries/data/mods/public/gui/session/minimap/MiniMap.xml (modified) (2 diffs)
• source/gui/ObjectTypes/CMiniMap.cpp (modified) (6 diffs)
• source/gui/ObjectTypes/CMiniMap.h (modified) (1 diff)

ps/trunk/binaries/data/mods/public/gui/session/minimap/MiniMap.xml

@@ -5 +5 @@
     type="image"
 >
-    <!-- MiniMap -->
-    <object name="minimap" size="8 8 100%-8 100%-8" type="minimap" mask="true"/>
 
     <!-- Background image -->
@@ -34 +32 @@
         hotkey="session.diplomacycolors"
     />
+
+
+
 </object>

ps/trunk/source/gui/ObjectTypes/CMiniMap.cpp

@@ -51 +51 @@
 #include "simulation2/system/ParamNode.h"
 
+
 #include <cmath>
+
 
 extern bool g_GameRestarted;
+
+
+
 
 // Set max drawn entities to UINT16_MAX for now, which is more than enough
@@ -59 +64 @@
 const u16 MAX_ENTITIES_DRAWN = 65535;
 
-static unsigned int ScaleColor(unsigned int color, float x)
+unsigned int ScaleColor(unsigned int color, float x)
 {
     unsigned int r = unsigned(float(color & 0xff) * x);
@@ -66 +71 @@
     return (0xff000000 | b | g<<8 | r<<16);
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 const CStr CMiniMap::EventNameWorldClick = "WorldClick";
@@ -260 +299 @@
 // This sets up and draws the rectangle on the minimap
 //  which represents the view of the camera in the world.
-void CMiniMap::DrawViewRect(CMatrix3D transform) const
+void CMiniMap::DrawViewRect( transform) const
 {
     // Compute the camera frustum intersected with a fixed-height plane.
@@ -269 +308 @@
     const float invTileMapSize = 1.0f / float(TERRAIN_TILE_SIZE * m_MapSize);
 
-    CVector3D hitPt[4];
-    hitPt[0] = m_Camera->GetWorldCoordinates(0, g_Renderer.GetHeight(), h);
-    hitPt[1] = m_Camera->GetWorldCoordinates(g_Renderer.GetWidth(), g_Renderer.GetHeight(), h);
-    hitPt[2] = m_Camera->GetWorldCoordinates(g_Renderer.GetWidth(), 0, h);
-    hitPt[3] = m_Camera->GetWorldCoordinates(0, 0, h);
-
-    float ViewRect[4][2];
-    for (int i = 0; i < 4; ++i)
-    {
-        // convert to minimap space
-        ViewRect[i][0] = (width * hitPt[i].X * invTileMapSize);
-        ViewRect[i][1] = (height * hitPt[i].Z * invTileMapSize);
-    }
-
-    float viewVerts[] = {
-        ViewRect[0][0], -ViewRect[0][1],
-        ViewRect[1][0], -ViewRect[1][1],
-        ViewRect[2][0], -ViewRect[2][1],
-        ViewRect[3][0], -ViewRect[3][1]
+    const std::array<CVector3D, 4> hitPoints = {
+        m_Camera->GetWorldCoordinates(0, g_Renderer.GetHeight(), h),
+        m_Camera->GetWorldCoordinates(g_Renderer.GetWidth(), g_Renderer.GetHeight(), h),
+        m_Camera->GetWorldCoordinates(g_Renderer.GetWidth(), 0, h),
+        m_Camera->GetWorldCoordinates(0, 0, h)
     };
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     // Enable Scissoring to restrict the rectangle to only the minimap.
@@ -307 +348 @@
     shader->Uniform(str_color, 1.0f, 0.3f, 0.3f, 1.0f);
 
-    shader->VertexPointer(2, GL_FLOAT, 0, viewVerts);
+    shader->VertexPointer(2, GL_FLOAT, 0, v);
     shader->AssertPointersBound();
 
     if (!g_Renderer.m_SkipSubmit)
-        glDrawArrays(GL_LINE_LOOP, 0, 4);
+        glDrawArrays(GL_LINE);
 
     tech->EndPass();

ps/trunk/source/gui/ObjectTypes/CMiniMap.h

@@ -105 +105 @@
     void DrawTexture(CShaderProgramPtr shader, float coordMax, float angle, float x, float y, float x2, float y2, float z) const;
 
-    void DrawViewRect(CMatrix3D transform) const;
+    void DrawViewRect( transform) const;
 
     void GetMouseWorldCoordinates(float& x, float& z) const;