mirror of
https://github.com/Kbz-8/42_vox.git
synced 2026-01-11 06:33:36 +00:00
adding wireframe switcher
This commit is contained in:
@@ -17,7 +17,8 @@ World::World(Scop::Scene& scene) : m_scene(scene), m_previous_chunk_position(-10
|
|||||||
auto narrator_update = [this](Scop::NonOwningPtr<Scop::Scene> scene, Scop::Inputs& input, float delta)
|
auto narrator_update = [this](Scop::NonOwningPtr<Scop::Scene> scene, Scop::Inputs& input, float delta)
|
||||||
{
|
{
|
||||||
static bool generate = true;
|
static bool generate = true;
|
||||||
static bool debounce = false;
|
static bool generation_debounce = false;
|
||||||
|
static bool wireframe_debounce = false;
|
||||||
|
|
||||||
Scop::FirstPerson3D* camera = reinterpret_cast<Scop::FirstPerson3D*>(m_scene.GetCamera().get());
|
Scop::FirstPerson3D* camera = reinterpret_cast<Scop::FirstPerson3D*>(m_scene.GetCamera().get());
|
||||||
std::int32_t x_chunk = static_cast<std::int32_t>(camera->GetPosition().x) / static_cast<std::int32_t>(CHUNK_SIZE.x);
|
std::int32_t x_chunk = static_cast<std::int32_t>(camera->GetPosition().x) / static_cast<std::int32_t>(CHUNK_SIZE.x);
|
||||||
@@ -25,11 +26,11 @@ World::World(Scop::Scene& scene) : m_scene(scene), m_previous_chunk_position(-10
|
|||||||
m_current_chunk_position = Scop::Vec2i{ x_chunk, z_chunk };
|
m_current_chunk_position = Scop::Vec2i{ x_chunk, z_chunk };
|
||||||
|
|
||||||
if(input.IsKeyPressed(SDL_SCANCODE_G))
|
if(input.IsKeyPressed(SDL_SCANCODE_G))
|
||||||
debounce = true;
|
generation_debounce = true;
|
||||||
else if(debounce)
|
else if(generation_debounce)
|
||||||
{
|
{
|
||||||
generate = !generate;
|
generate = !generate;
|
||||||
debounce = false;
|
generation_debounce = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(generate)
|
if(generate)
|
||||||
@@ -47,6 +48,16 @@ World::World(Scop::Scene& scene) : m_scene(scene), m_previous_chunk_position(-10
|
|||||||
}
|
}
|
||||||
Upload();
|
Upload();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(input.IsKeyPressed(SDL_SCANCODE_F))
|
||||||
|
wireframe_debounce = true;
|
||||||
|
else if(wireframe_debounce)
|
||||||
|
{
|
||||||
|
m_scene.GetForwardData().wireframe = !m_scene.GetForwardData().wireframe;
|
||||||
|
Scop::RenderCore::Get().WaitDeviceIdle();
|
||||||
|
m_scene.GetPipeline().Destroy();
|
||||||
|
wireframe_debounce = false;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
m_scene.CreateNarrator().AttachScript(std::make_shared<Scop::NativeNarratorScript>(std::function<void()>{}, narrator_update, std::function<void()>{}));
|
m_scene.CreateNarrator().AttachScript(std::make_shared<Scop::NativeNarratorScript>(std::function<void()>{}, narrator_update, std::function<void()>{}));
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ $(SHADER_DIR):
|
|||||||
shaders: $(SHADER_DIR) $(SPVS)
|
shaders: $(SHADER_DIR) $(SPVS)
|
||||||
|
|
||||||
_printbuildinfos:
|
_printbuildinfos:
|
||||||
@printf "$(_PURPLE)$(_BOLD)Vox $(_RESET)Compiling in $(_BOLD)$(MODE)$(_RESET) mode on $(_BOLD)$(OS)$(_RESET) | Using $(_BOLD)$(CXX) ($(shell $(CXX) --version | head -n 1))$(_RESET), flags: $(_BOLD)$(_ENABLEDFLAGS)$(_RESET)\n"
|
@printf "$(_PURPLE)$(_BOLD)ScopEngine $(_RESET)Compiling in $(_BOLD)$(MODE)$(_RESET) mode on $(_BOLD)$(OS)$(_RESET) | Using $(_BOLD)$(CXX) ($(shell $(CXX) --version | head -n 1))$(_RESET), flags: $(_BOLD)$(_ENABLEDFLAGS)$(_RESET)\n"
|
||||||
|
|
||||||
debug:
|
debug:
|
||||||
@$(MAKE) all DEBUG=true -j$(shell nproc)
|
@$(MAKE) all DEBUG=true -j$(shell nproc)
|
||||||
|
|||||||
Reference in New Issue
Block a user