Fixed water rendering somewhat

src/Editor/main.cpp

@@ -11,9 +11,9 @@
 #include "Graphics/Vulkan/Graphics.h"
 #endif
 #include "Graphics/StaticMeshVertexData.h"
+#include "Graphics/Vulkan/Buffer.h"
 #include "Graphics/Vulkan/Graphics.h"
 #include "Window/PlayView.h"
-#include "Graphics/Vulkan/Buffer.h"
 #include "Window/WindowManager.h"
 #include <fmt/core.h>
 #include <random>
@@ -64,14 +64,17 @@ int main() {
             .filePath = sourcePath / "import/textures/skyboxsun5deg_tn.jpg",
             .type = TextureImportType::TEXTURE_CUBEMAP,
         });
-        //ssetImporter::importMesh(MeshImportArgs{
-        //   .filePath = sourcePath / "import/models/after-the-rain-vr-sound/source/Whitechapel.glb",
-        //   .importPath = "Whitechapel",
-        //);
+        AssetImporter::importMesh(MeshImportArgs{
+            .filePath = sourcePath / "import/models/sheepsbody.fbx",
+        });
         // AssetImporter::importMesh(MeshImportArgs{
-        //     .filePath = sourcePath / "import/models/city-suburbs/source/city-suburbs.obj",
-        //     .importPath = "suburbs",
-        // });
+        //    .filePath = sourcePath / "import/models/after-the-rain-vr-sound/source/Whitechapel.glb",
+        //    .importPath = "Whitechapel",
+        //);
+        //  AssetImporter::importMesh(MeshImportArgs{
+        //      .filePath = sourcePath / "import/models/city-suburbs/source/city-suburbs.obj",
+        //      .importPath = "suburbs",
+        //  });
         vd->commitMeshes();
         WindowCreateInfo mainWindowInfo = {
             .width = 1920,

src/Engine/Graphics/RenderPass/BasePass.cpp

@@ -98,7 +98,7 @@ void BasePass::beginFrame(const Component::Camera& cam) {
     opaqueCulling = lightCullingLayout->allocateDescriptorSet();
     transparentCulling = lightCullingLayout->allocateDescriptorSet();
 
-    waterRenderer->beginFrame();
+    //waterRenderer->beginFrame();
 
     // Debug vertices
     {
@@ -248,7 +248,7 @@ void BasePass::render() {
         }
     }
     
-    commands.add(waterRenderer->render(viewParamsSet));
+    //commands.add(waterRenderer->render(viewParamsSet));
     
     // Skybox
     {

src/Engine/Graphics/RenderPass/WaterRenderer.cpp

@@ -344,23 +344,23 @@ WaterRenderer::WaterRenderer(Gfx::PGraphics graphics, PScene scene, Gfx::PDescri
 WaterRenderer::~WaterRenderer() {}
 
 void WaterRenderer::beginFrame() {
-    struct WaterPayload {
-        Vector2 offset;
+    struct WaterTile {
+        IVector2 offset;
         float extent;
         float height;
     };
-    Array<WaterPayload> payloads;
+    Array<WaterTile> payloads;
     scene->view<Component::WaterTile>([&](Component::WaterTile& tile) {
-        payloads.add(WaterPayload{
+        payloads.add(WaterTile{
             .offset = Vector2(tile.location),
-            .extent = 1,
+            .extent = Component::WaterTile::DIMENSIONS,
             .height = tile.height,
         });
     });
     waterTiles = graphics->createShaderBuffer(ShaderBufferCreateInfo{
         .sourceData =
             {
-                .size = payloads.size() * sizeof(WaterPayload),
+                .size = payloads.size() * sizeof(WaterTile),
                 .data = (uint8*)payloads.data(),
             },
         .numElements = payloads.size(),
@@ -413,8 +413,6 @@ void WaterRenderer::beginFrame() {
     assembleCommand->dispatch(threadGroupsX, threadGroupsY, 1);
     graphics->executeCommands(std::move(assembleCommand));
 
-    graphics->waitDeviceIdle();
-
     // transition for mipmap gen
     displacementTextures->changeLayout(
         Gfx::SE_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
@@ -464,6 +462,7 @@ void WaterRenderer::setViewport(Gfx::PViewport _viewport, Gfx::PRenderPass rende
             },
         .rasterizationState =
             {
+                .polygonMode = Gfx::SE_POLYGON_MODE_LINE,
                 .cullMode = Gfx::SE_CULL_MODE_BACK_BIT,
             },
         .colorBlend =