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

fixing allocator

Browse Source
This commit is contained in:
kbz_8
2025-05-21 10:58:57 +02:00
parent c7dfc64f26
commit 42508722ca
8 changed files with 110 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Application/Chunk.cpp
View File

@@ -173,8 +173,8 @@ void Chunk::UploadMesh()
std::uint32_t Chunk::GetBlock(Scop::Vec3i position) const noexcept
{
//if(position.x < 0 || position.x >= m_data.size() || position.z < 0 || position.z >= m_data[position.x >= m_data.size() ? m_data.size() - 1 : position.x].size() || position.y < 0)
// return 1;
if(position.x < 0 || position.x >= m_data.size() || position.z < 0 || position.z >= m_data[position.x >= m_data.size() ? m_data.size() - 1 : position.x].size() || position.y < 0)
return 1;
if(position.x < m_data.size() && position.z < m_data[position.x].size() && position.y < m_data[position.x][position.z].size())
return m_data[position.x][position.z][position.y];
return 0;

12
Application/World.cpp
View File

@@ -88,6 +88,8 @@ void World::GenerateWorld()
std::this_thread::sleep_for(16ms);
continue;
}
std::queue<std::reference_wrapper<Chunk>> mesh_generation_queue;
for(std::int32_t x = m_current_chunk_position.x - RENDER_DISTANCE; x <= m_current_chunk_position.x + RENDER_DISTANCE; x++)
{
for(std::int32_t z = m_current_chunk_position.y - RENDER_DISTANCE; z <= m_current_chunk_position.y + RENDER_DISTANCE; z++)
@@ -98,12 +100,18 @@ void World::GenerateWorld()
if(!res.first->second.GetActor())
{
res.first->second.GenerateChunk();
res.first->second.GenerateMesh();
m_chunks_to_upload.Push(std::ref(res.first->second));
mesh_generation_queue.push(std::ref(res.first->second));
}
}
}
}
while(!mesh_generation_queue.empty())
{
auto chunk = mesh_generation_queue.front();
mesh_generation_queue.pop();
chunk.get().GenerateMesh();
m_chunks_to_upload.Push(chunk);
}
m_generation_status = GenerationState::Finished;
}
}