Merge remote-tracking branch 'origin/master'

Client/include/Client/LocalWorld.hpp

@@ -64,9 +64,9 @@ namespace CaveGame::Client
         /// Checks for missing, or out-of-date, cached sprites of chunks, and renders them.
         void CheckCachedChunkSprites();
 
-        Color4 GetSkyColorInterpolatedForTimeOfDay(float time);
+        static Color4 GetSkyColorInterpolatedForTimeOfDay(float time);
 
-        Color4 GetSkyColorBaseForTimeOfDay(float time);
+        static Color4 GetSkyColorBaseForTimeOfDay(float time);
 
         void DrawSky();
 

Client/src/Client/LocalWorld.cpp

@@ -108,6 +108,8 @@ namespace CaveGame::Client {
             return Colors::White;
         else if (time >= 15*60)
             return Colors::White;
+
+        return Colors::White;
     }
 
     void LocalWorld::DrawSky() {

Core/include/Core/Generator.hpp

@@ -30,8 +30,7 @@ namespace CaveGame::Core
         static constexpr float SurfaceCaveShrinkDepth = 100;
         static constexpr float SurfaceCaveShrinkFactor = 1.5f;
 
-        static constexpr float ClayVeinHiPassHScale = 200.f;
-        static constexpr float ClayVeinHiPassVScale = 205.f;
+        static constexpr Vector2 ClayVeinHiPassScale = {200.f, 205.f};
         static constexpr float ClayVeinHiPassOffset = 0.f;
         static constexpr float ClayVeinHiPassOutputScale = 2.2f;
 

Core/src/Core/Generator.cpp

@@ -184,7 +184,7 @@ namespace CaveGame::Core
                 return TileID::DIRT;
             }
 
-            // Chunks of clay
+
 
 
              // This is actually faster??? - maxine