Changeset 9673 for ps

Timestamp:

06/26/11 23:47:07 (14 years ago)

Author:

philip

Message:

Initialise minimap and LOS textures properly

Location:

ps/trunk/source

Files:

• graphics/LOSTexture.cpp (modified) (1 diff)
• gui/MiniMap.cpp (modified) (1 diff)

ps/trunk/source/graphics/LOSTexture.cpp

@@ -117 +117 @@
     glGenTextures(1, &m_Texture);
     g_Renderer.BindTexture(unit, m_Texture);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA8, m_TextureSize, m_TextureSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
+
+    // Initialise texture with SoD colour, for the areas we don't
+    // overwrite with glTexSubImage2D later
+    u8* texData = new u8[m_TextureSize * m_TextureSize];
+    memset(texData, 0x00, m_TextureSize * m_TextureSize);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA8, m_TextureSize, m_TextureSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, texData);
+    delete[] texData;
+
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

ps/trunk/source/gui/MiniMap.cpp

@@ -460 +460 @@
     glGenTextures(1, &m_TerrainTexture);
     g_Renderer.BindTexture(0, m_TerrainTexture);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, m_TextureSize, m_TextureSize, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, 0);
+
+    // Initialise texture with solid black, for the areas we don't
+    // overwrite with glTexSubImage2D later
+    u32* texData = new u32[m_TextureSize * m_TextureSize];
+    for (ssize_t i = 0; i < m_TextureSize * m_TextureSize; ++i)
+        texData[i] = 0xFF000000;
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, m_TextureSize, m_TextureSize, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, texData);
+    delete[] texData;
+
     m_TerrainData = new u32[(m_MapSize - 1) * (m_MapSize - 1)];
     glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);