Auto stash before merge of "master" and "Gitea/master"

src/Engine/Graphics/RenderPass/BasePass.cpp

@@ -27,6 +27,7 @@ void Seele::addDebugVertices(Array<DebugVertex> verts) { gDebugVertices.addAll(v
 
 BasePass::BasePass(Gfx::PGraphics graphics, PScene scene) : RenderPass(graphics, scene) {
     //waterRenderer = new WaterRenderer(graphics, scene, viewParamsLayout);
+    terrainRenderer = new TerrainRenderer(graphics, scene, viewParamsLayout);
     basePassLayout = graphics->createPipelineLayout("BasePassLayout");
 
     basePassLayout->addDescriptorLayout(viewParamsLayout);
@@ -99,6 +100,7 @@ void BasePass::beginFrame(const Component::Camera& cam) {
     transparentCulling = lightCullingLayout->allocateDescriptorSet();
 
     //waterRenderer->beginFrame();
+    terrainRenderer->beginFrame();
 
     // Debug vertices
     {
@@ -247,7 +249,8 @@ void BasePass::render() {
         }
     }
     
-    //commands.add(waterRenderer->render(viewParamsSet));
+    // commands.add(waterRenderer->render(viewParamsSet));
+    commands.add(terrainRenderer->render(viewParamsSet));
     
     // Skybox
     {
@@ -471,6 +474,7 @@ void BasePass::createRenderPass() {
     tLightGrid = resources->requestTexture("LIGHTCULLING_TLIGHTGRID");
 
     //waterRenderer->setViewport(viewport, renderPass);
+    terrainRenderer->setViewport(viewport, renderPass);
 
     // Debug rendering
     {