From 5658fac2244bff5acb9e19433013d7fe76e7e205 Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Tue, 1 Oct 2024 22:52:51 +0200 Subject: [PATCH] Removing terrain for now --- src/Engine/Graphics/RenderPass/BasePass.cpp | 6 +++--- src/Engine/Graphics/RenderPass/BasePass.h | 4 ++-- src/Engine/Graphics/slang-compile.cpp | 4 ++-- src/Engine/ThreadPool.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Engine/Graphics/RenderPass/BasePass.cpp b/src/Engine/Graphics/RenderPass/BasePass.cpp index 5af5663..dc24ea0 100644 --- a/src/Engine/Graphics/RenderPass/BasePass.cpp +++ b/src/Engine/Graphics/RenderPass/BasePass.cpp @@ -27,7 +27,7 @@ void Seele::addDebugVertices(Array 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); + //terrainRenderer = new TerrainRenderer(graphics, scene, viewParamsLayout); basePassLayout = graphics->createPipelineLayout("BasePassLayout"); basePassLayout->addDescriptorLayout(viewParamsLayout); @@ -100,7 +100,7 @@ void BasePass::beginFrame(const Component::Camera& cam) { transparentCulling = lightCullingLayout->allocateDescriptorSet(); //waterRenderer->beginFrame(); - terrainRenderer->beginFrame(); + //terrainRenderer->beginFrame(); // Debug vertices { @@ -474,7 +474,7 @@ void BasePass::createRenderPass() { tLightGrid = resources->requestTexture("LIGHTCULLING_TLIGHTGRID"); //waterRenderer->setViewport(viewport, renderPass); - terrainRenderer->setViewport(viewport, renderPass); + //terrainRenderer->setViewport(viewport, renderPass); // Debug rendering { diff --git a/src/Engine/Graphics/RenderPass/BasePass.h b/src/Engine/Graphics/RenderPass/BasePass.h index 67c414f..fe60d17 100644 --- a/src/Engine/Graphics/RenderPass/BasePass.h +++ b/src/Engine/Graphics/RenderPass/BasePass.h @@ -50,8 +50,8 @@ class BasePass : public RenderPass { Gfx::PShaderBuffer cullingBuffer; - OWaterRenderer waterRenderer; - OTerrainRenderer terrainRenderer; + //OWaterRenderer waterRenderer; + //OTerrainRenderer terrainRenderer; // Debug rendering Gfx::OVertexInput debugVertexInput; diff --git a/src/Engine/Graphics/slang-compile.cpp b/src/Engine/Graphics/slang-compile.cpp index 3aef0ad..41f5934 100644 --- a/src/Engine/Graphics/slang-compile.cpp +++ b/src/Engine/Graphics/slang-compile.cpp @@ -113,11 +113,11 @@ void Seele::beginCompilation(const ShaderCompilationInfo& info, SlangCompileTarg slang::ProgramLayout* signature = specializedComponent->getLayout(0, diagnostics.writeRef()); CHECK_DIAGNOSTICS(); - std::cout << info.name << std::endl; + //std::cout << info.name << std::endl; for (size_t i = 0; i < signature->getParameterCount(); ++i) { auto param = signature->getParameterByIndex(i); layout->addMapping(param->getName(), param->getBindingIndex()); - std::cout << param->getName() << ": " << param->getBindingIndex() << std::endl; + //std::cout << param->getName() << ": " << param->getBindingIndex() << std::endl; } // workaround diff --git a/src/Engine/ThreadPool.h b/src/Engine/ThreadPool.h index d6f8bbf..62bfc2e 100644 --- a/src/Engine/ThreadPool.h +++ b/src/Engine/ThreadPool.h @@ -7,7 +7,7 @@ namespace Seele { class ThreadPool { public: - ThreadPool(uint32 numWorkers = 1); + ThreadPool(uint32 numWorkers = std::thread::hardware_concurrency() - 2); ~ThreadPool(); void runAndWait(List> functions); void runAsync(std::function func);