kbz_8/42_vox
1
0
Fork 0
mirror of https://github.com/Kbz-8/42_vox.git synced 2026-01-11 14:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing crash issue

Browse Source
This commit is contained in:
kbz_8
2025-05-22 15:18:18 +02:00
parent 01f2aaacde
commit 92967aac1f
8 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Application/World.cpp
View File

@@ -52,6 +52,16 @@ World::World(Scop::Scene& scene) : m_scene(scene), m_previous_chunk_position(-10
m_scene.CreateNarrator().AttachScript(std::make_shared<Scop::NativeNarratorScript>(std::function<void()>{}, narrator_update, std::function<void()>{}));
}
void World::Quit() noexcept
{
m_generation_status = GenerationState::Quitting;
while(m_generation_status != GenerationState::Finished)
{
using namespace std::chrono_literals;
std::this_thread::sleep_for(16ms);
}
}
[[nodiscard]] Scop::NonOwningPtr<Chunk> World::GetChunk(Scop::Vec2i position)
{
auto it = m_chunks.find(position);
@@ -78,12 +88,15 @@ void World::UnloadChunks()
}
}
#define QUIT_CHECK() if(m_generation_status == GenerationState::Quitting) goto quit
void World::GenerateWorld()
{
for(;;)
{
QUIT_CHECK();
if(m_generation_status != GenerationState::Working)
{
QUIT_CHECK();
using namespace std::chrono_literals;
std::this_thread::sleep_for(16ms);
continue;
@@ -94,6 +107,7 @@ void World::GenerateWorld()
{
for(std::int32_t z = m_current_chunk_position.y - RENDER_DISTANCE; z <= m_current_chunk_position.y + RENDER_DISTANCE; z++)
{
QUIT_CHECK();
auto res = m_chunks.try_emplace(Scop::Vec2i{ x, z }, *this, Scop::Vec2i{ x, z });
if(res.second)
{
@@ -107,6 +121,7 @@ void World::GenerateWorld()
}
while(!mesh_generation_queue.empty())
{
QUIT_CHECK();
auto chunk = mesh_generation_queue.front();
mesh_generation_queue.pop();
chunk.get().GenerateMesh();
@@ -114,6 +129,9 @@ void World::GenerateWorld()
}
m_generation_status = GenerationState::Finished;
}
quit:
m_generation_status = GenerationState::Finished;
}
void World::Upload()