Ticket #2024: branch.patch

source/graphics/LOSTexture.cpp

@@ -309 +309 @@
     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_MapSize + g_BlurSize - 1, m_MapSize + g_BlurSize - 1, GL_ALPHA, GL_UNSIGNED_BYTE, &losData[0]);
 }
 
-size_t CLOSTexture::GetBitmapSize(size_t w, size_t h)
+size_t CLOSTexture::GetBitmapSize(const size_t w, const size_t h) const
 {
     return (w + g_BlurSize - 1) * (h + g_BlurSize - 1);
 }
 
-void CLOSTexture::GenerateBitmap(ICmpRangeManager::CLosQuerier los, u8* losData, size_t w, size_t h)
+
+void CLOSTexture::GenerateBitmap(ICmpRangeManager::CLosQuerier los, u8* const losData, const size_t w, const size_t h)
 {
     const size_t rowSize = w + g_BlurSize-1; // size of losData rows
-
+    const size_t halfBlurSize = g_BlurSize / 2;
     u8 *dataPtr = losData;
+        
+    memset(dataPtr, 0, rowSize*h);
 
     // Initialise the top padding
-    for (size_t j = 0; j < g_BlurSize/2; ++j)
-        for (size_t i = 0; i < rowSize; ++i)
-            *dataPtr++ = 0;
-
-    for (size_t j = 0; j < h; ++j)
+    dataPtr += rowSize*halfBlurSize;
+    for (size_t j = 0; j < h; j++)
     {
-        // Initialise the left padding
-        for (size_t i = 0; i < g_BlurSize/2; ++i)
-            *dataPtr++ = 0;
+        // Initialise the left padding  
+        dataPtr += halfBlurSize;            
 
         // Fill in the visibility data
-        for (size_t i = 0; i < w; ++i)
+        for (size_t i = 0; i < w; i++)
         {
             if (los.IsVisible_UncheckedRange(i, j))
-                *dataPtr++ = 255;
+                *dataPtr = 255;
             else if (los.IsExplored_UncheckedRange(i, j))
-                *dataPtr++ = 127;
-            else
-                *dataPtr++ = 0;
+                *dataPtr = 127;
+            dataPtr++;
         }
 
-        // Initialise the right padding
-        for (size_t i = 0; i < g_BlurSize/2; ++i)
-            *dataPtr++ = 0;
+        // move after the right padding
+        dataPtr += halfBlurSize;    
     }
-
-    // Initialise the bottom padding
-    for (size_t j = 0; j < g_BlurSize/2; ++j)
-        for (size_t i = 0; i < rowSize; ++i)
-            *dataPtr++ = 0;
-
+    
     // Horizontal blur:
-
-    for (size_t j = g_BlurSize/2; j < h + g_BlurSize/2; ++j)
+    for (size_t j = halfBlurSize; j < h + halfBlurSize; j++)
     {
-        for (size_t i = 0; i < w; ++i)
+        const size_t jrowSize = j*rowSize;
+        for (size_t i = 0; i < w; i++)
         {
-            u8* d = &losData[i+j*rowSize];
+            u8* const d = &losData[i+jrowSize];
             *d = (
                 1*d[0] +
                 6*d[1] +
@@ -375 +367 @@
 
     for (size_t j = 0; j < h; ++j)
     {
+        const size_t jrowSize =j*rowSize;
         for (size_t i = 0; i < w; ++i)
         {
-            u8* d = &losData[i+j*rowSize];
+            u8* const d = &losData[i+jrowSize];
             *d = (
                 1*d[0*rowSize] +
                 6*d[1*rowSize] +

source/graphics/LOSTexture.h

@@ -81 +81 @@
     void ConstructTexture(int unit);
     void RecomputeTexture(int unit);
 
-    size_t GetBitmapSize(size_t w, size_t h);
-    void GenerateBitmap(ICmpRangeManager::CLosQuerier los, u8* losData, size_t w, size_t h);
+    size_t GetBitmapSize(const size_t w, const size_t h) const ;
+    void GenerateBitmap(ICmpRangeManager::CLosQuerier los, u8* const losData, const size_t w, const size_t h);
 
     CSimulation2& m_Simulation;