Removing terrain for now
This commit is contained in:
@@ -27,7 +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);
|
||||
//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
|
||||
{
|
||||
|
||||
@@ -50,8 +50,8 @@ class BasePass : public RenderPass {
|
||||
|
||||
Gfx::PShaderBuffer cullingBuffer;
|
||||
|
||||
OWaterRenderer waterRenderer;
|
||||
OTerrainRenderer terrainRenderer;
|
||||
//OWaterRenderer waterRenderer;
|
||||
//OTerrainRenderer terrainRenderer;
|
||||
|
||||
// Debug rendering
|
||||
Gfx::OVertexInput debugVertexInput;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<std::function<void()>> functions);
|
||||
void runAsync(std::function<void()> func);
|
||||
|
||||
Reference in New Issue
Block a user