Finish sky drawing

renderer.h

@@ -307,7 +307,7 @@ uint8_t _LCR_rendererCheckMapTriangleCover(const S3L_Index *t1,
   that by this become unused). This makes the map model smaller, faster and
   prevents bleeding through due to z-bugger imprecisions.
 */
-void _LCR_rendererPruneHiddenMapTriangles(void)
+void _LCR_rendererCullHiddenMapTriangles(void)
 {
   int n = 0; // number of removed elements
   int i = 0;
@@ -437,7 +437,7 @@ uint8_t _LCR_rendererBuildMapModel(void)
     }
   }
 
-  _LCR_rendererPruneHiddenMapTriangles();
+  _LCR_rendererCullHiddenMapTriangles();
 
   return 1;
 }
@@ -497,10 +497,12 @@ void LCR_rendererDrawSky(int sky, S3L_Unit offsetH, S3L_Unit offsetV)
   unsigned long pixelIndex;
   unsigned int topColor, bottomColor;
 
-  LCR_loadImage(8);
+  sky = 8 + 4 * sky;
+
+  LCR_loadImage(sky);
   topColor = LCR_sampleImage(0,0);
 
-  LCR_loadImage(8 + 3);
+  LCR_loadImage(sky + 3);
   bottomColor = LCR_sampleImage(LCR_IMAGE_SIZE - 1,LCR_IMAGE_SIZE - 1);
 
   anchorPoint[0] = ((LCR_EFFECTIVE_RESOLUTION_X * offsetH)
@@ -511,7 +513,7 @@ void LCR_rendererDrawSky(int sky, S3L_Unit offsetH, S3L_Unit offsetV)
     anchorPoint[0] += 2 * LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE;
 
   anchorPoint[1] = 
-    (LCR_EFFECTIVE_RESOLUTION_Y) / 2 -
+    (LCR_EFFECTIVE_RESOLUTION_Y) / 3 - // 3: we place the center a bit more up
     (LCR_EFFECTIVE_RESOLUTION_Y * offsetV) / S3L_FRACTIONS_PER_UNIT
     - LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE;
   
@@ -538,7 +540,7 @@ void LCR_rendererDrawSky(int sky, S3L_Unit offsetH, S3L_Unit offsetV)
   {
     if (!linesLeft)
     {
-      LCR_loadImage(8 + skyPart);
+      LCR_loadImage(sky + skyPart);
       linesLeft = LCR_IMAGE_SIZE / 2;
       skyPart++;
     }
@@ -549,27 +551,53 @@ void LCR_rendererDrawSky(int sky, S3L_Unit offsetH, S3L_Unit offsetV)
         ix += LCR_SETTING_SKY_SIZE)
       {
         unsigned int color = LCR_getNextImagePixel();
+        unsigned long startIndex = pixelIndex;
 
-        int x = anchorPoint[0] + ix;
-
-        if (x >= 2 * LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE)
-          x -= 2 * LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE;
-
-        while (x < LCR_EFFECTIVE_RESOLUTION_X)
+        for (int k = 0; k < LCR_SETTING_SKY_SIZE; ++k)
         {
-          LCR_drawPixel(pixelIndex + x,color);
-          x += 2 * LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE;
+          if (y + k >= LCR_EFFECTIVE_RESOLUTION_Y)
+            break;
+
+          for (int j = 0; j < LCR_SETTING_SKY_SIZE; ++j)
+          {
+            int x = anchorPoint[0] + ix + j;
+
+            if (x >= 2 * LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE)
+              x -= 2 * LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE;
+
+            while (x < LCR_EFFECTIVE_RESOLUTION_X)
+            {
+              LCR_drawPixel(startIndex + x,color);
+              x += 2 * LCR_IMAGE_SIZE * LCR_SETTING_SKY_SIZE;
+            }
+          }
+
+          startIndex += LCR_EFFECTIVE_RESOLUTION_X;
         }
       }
     
       pixelIndex += LCR_EFFECTIVE_RESOLUTION_X * LCR_SETTING_SKY_SIZE;
+      y += LCR_SETTING_SKY_SIZE;
     }
     else
+    {
       for (int ix = 0; ix < 2 * LCR_IMAGE_SIZE; ++ix)
         LCR_getNextImagePixel();
    
+      for (int i = 0; i < LCR_SETTING_SKY_SIZE; ++i)
+      {
+        if (y >= 0)
+          for (int x = 0; x < LCR_EFFECTIVE_RESOLUTION_X; ++x)
+          {
+            LCR_drawPixel(pixelIndex,topColor);
+            pixelIndex++;
+          }
+
+        y++;
+      }
+    }
+
     linesLeft--;
-    y += LCR_SETTING_SKY_SIZE;
   }
 
   while (y < 0) // can still be the case
@@ -592,12 +620,8 @@ void LCR_rendererDraw(void)
   LCR_renderer.previousTriangleID = -1;
   S3L_newFrame();
 
-// REMOVE LATER
-for (int i = 0; i < LCR_EFFECTIVE_RESOLUTION_X * LCR_EFFECTIVE_RESOLUTION_Y; ++i)
-LCR_drawPixel(i,0xffff);
-
-  LCR_rendererDrawSky(0,
-    LCR_renderer.scene3D.camera.transform.rotation.y / 8,
+  LCR_rendererDrawSky(2,
+    LCR_renderer.scene3D.camera.transform.rotation.y,
     -4 * LCR_renderer.scene3D.camera.transform.rotation.x);
 
   S3L_drawScene(LCR_renderer.scene3D);

settings.h

@@ -48,7 +48,7 @@
 
 #ifndef LCR_SETTING_SKY_SIZE
   /** Size of sky texture pixel, 0 turns off sky rendering. */
-  #define LCR_SETTING_SKY_SIZE 2
+  #define LCR_SETTING_SKY_SIZE 4
 #endif
 
 #ifndef LCR_SETTING_MAP_MAX_SIZE