add clouds shader

src/graphics/render/CloudsRenderer.cpp

@@ -12,6 +12,7 @@
 #include "maths/FastNoiseLite.h"
 #include "util/timeutil.hpp"
 #include "window/Camera.hpp"
+#include "world/Weather.hpp"
 
 #include <glm/ext.hpp>
 #include <glm/gtc/matrix_transform.hpp>
@@ -163,7 +164,7 @@ static inline constexpr int WIDTH = 256;
 static inline constexpr int DEPTH = 256;
 
 
-CloudsRenderer::CloudsRenderer(const Assets& assets) : assets(assets) {
+CloudsRenderer::CloudsRenderer() {
     VolumeRenderer volumeRenderer(1024 * 1024);
 
     for (int layer = 0; layer < 2; layer++) {
@@ -216,7 +217,6 @@ CloudsRenderer::CloudsRenderer(const Assets& assets) : assets(assets) {
         
         CloudsMap map({w, h, d}, voxels);
 
-        timeutil::ScopeLogTimer log2(222);
         volumeRenderer.build(map);
         testMeshes[layer] = std::make_unique<Mesh<ChunkVertex>>(volumeRenderer.createMesh());
     }
@@ -224,9 +224,20 @@ CloudsRenderer::CloudsRenderer(const Assets& assets) : assets(assets) {
 
 CloudsRenderer::~CloudsRenderer() = default;
 
-void CloudsRenderer::draw(float timer, float fogFactor, const Camera& camera) {
-    auto& shader = assets.require<Shader>("main");
-    assets.require<Texture>("misc/blank").bind();
+void CloudsRenderer::draw(
+    Shader& shader,
+    const Weather& weather,
+    float timer,
+    float fogFactor,
+    const Camera& camera
+) {
+    float clouds = weather.clouds();
+    shader.uniform4f(
+        "u_tint",
+        glm::vec4(
+            1.0f - clouds * 0.5, 1.0f - clouds * 0.45, 1.0f - clouds * 0.4, 1.0f
+        )
+    );
 
     float scale = 8;
     float totalWidth = WIDTH * scale;
@@ -235,7 +246,7 @@ void CloudsRenderer::draw(float timer, float fogFactor, const Camera& camera) {
     int cellX = glm::floor(camera.position.x / totalWidth + 0.5f);
     int cellZ = glm::floor(camera.position.z / totalDepth + 0.5f);
 
-    float speed = 10.0f;
+    float speed = 4.0f;
     for (int i = 0; i < 2; i++) {
         float speedX = glm::sin(i * 0.3f + 0.4f) * speed / (i + 1);
         float speedZ = -glm::cos(i * 0.3f + 0.4f) * speed / (i + 1);

src/graphics/render/CloudsRenderer.hpp

@@ -4,16 +4,22 @@
 
 #include <memory>
 
-class Assets;
 class Camera;
+class Shader;
+struct Weather;
 
 class CloudsRenderer final {
 public:
-    CloudsRenderer(const Assets& assets);
+    CloudsRenderer();
     ~CloudsRenderer();
 
-    void draw(float timer, float fogFactor, const Camera& camera);
+    void draw(
+        Shader& shader,
+        const Weather& weather,
+        float timer,
+        float fogFactor,
+        const Camera& camera
+    );
 private:
-    const Assets& assets;
     std::array<std::unique_ptr<Mesh<ChunkVertex>>, 2> testMeshes;
 };

src/graphics/render/WorldRenderer.cpp

@@ -117,7 +117,7 @@ WorldRenderer::WorldRenderer(
     );
     shadowMapping = std::make_unique<Shadows>(level);
     debugLines = std::make_unique<DebugLinesRenderer>(level);
-    cloudsRenderer = std::make_unique<CloudsRenderer>(assets);
+    cloudsRenderer = std::make_unique<CloudsRenderer>();
 }
 
 WorldRenderer::~WorldRenderer() = default;
@@ -207,14 +207,17 @@ void WorldRenderer::renderOpaque(
     particles->render(camera);
 
     auto& shader = assets.require<Shader>("main");
+    auto& cloudsShader = assets.require<Shader>("clouds");
     auto& linesShader = assets.require<Shader>("lines");
 
     setupWorldShader(shader, camera, settings, fogFactor);
 
     chunksRenderer->drawChunks(camera, shader);
-    cloudsRenderer->draw(timer, fogFactor, camera);
     blockWraps->draw(ctx, player);
 
+    setupWorldShader(cloudsShader, camera, settings, fogFactor);
+    cloudsRenderer->draw(cloudsShader, weather, timer, fogFactor, camera);
+
     if (hudVisible) {
         renderLines(camera, linesShader, ctx);
     }
@@ -317,13 +320,19 @@ void WorldRenderer::renderFrame(
 
     auto& mainShader = assets.require<Shader>("main");
     auto& entityShader = assets.require<Shader>("entity");
+    auto& cloudsShader = assets.require<Shader>("clouds");
     auto& translucentShader = assets.require<Shader>("translucent");
     auto& deferredShader = assets.require<PostEffect>("deferred_lighting").getShader();
 
     const auto& settings = engine.getSettings();
 
     Shader* affectedShaders[] {
-        &mainShader, &entityShader, &translucentShader, &deferredShader, nullptr
+        &mainShader,
+        &entityShader,
+        &cloudsShader,
+        &translucentShader,
+        &deferredShader,
+        nullptr
     };
 
     refreshSettings(affectedShaders);