nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement terrain generation status text (#1521)

Browse Source
This commit is contained in:
Stanislav Denisov
2026-01-26 13:53:27 +01:00
committed by GitHub
parent 218563f50e
commit 77ea441087
4 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Editor.cpp
+33
View File
@@ -547,6 +547,15 @@ void EditorComponent::Load()
loadmodel_font.params.v_align = wi::font::WIFALIGN_TOP;
AddFont(&loadmodel_font);
terrain_generation_font.SetText("Generating terrain...");
terrain_generation_font.anim.typewriter.time = 2;
terrain_generation_font.anim.typewriter.looped = true;
terrain_generation_font.anim.typewriter.character_start = 19;
terrain_generation_font.params.size = 22;
terrain_generation_font.params.h_align = wi::font::WIFALIGN_LEFT;
terrain_generation_font.params.v_align = wi::font::WIFALIGN_TOP;
AddFont(&terrain_generation_font);
topmenuWnd.Create("", wi::gui::Window::WindowControls::NONE);
topmenuWnd.SetShadowRadius(2);
GetGUI().AddWidget(&topmenuWnd);
@@ -1619,6 +1628,25 @@ void EditorComponent::Update(float dt)
loadmodel_font.SetHidden(!wi::jobsystem::IsBusy(loadmodel_workload));
bool terrain_generating = false;
for (size_t i = 0; i < GetCurrentScene().terrains.GetCount(); ++i)
{
if (GetCurrentScene().terrains[i].IsGenerationBusy())
{
terrain_generating = true;
break;
}
}
if (terrain_generating)
{
terrain_generation_font_timeout = 0.5f;
}
else
{
terrain_generation_font_timeout -= dt;
}
terrain_generation_font.SetHidden(terrain_generation_font_timeout <= 0);
Scene& scene = GetCurrentScene();
EditorScene& editorscene = GetCurrentEditorScene();
CameraComponent& camera = editorscene.camera;
@@ -4887,10 +4915,15 @@ void EditorComponent::ResizeViewport3D()
main->infoDisplay.rect.from_viewport(viewport3D);
main->infoDisplay.rect.left = LogicalToPhysical(generalButton.translation_local.x + generalButton.scale_local.x + 10);
}
loadmodel_font.params.posX = PhysicalToLogical(uint32_t(viewport3D.top_left_x + viewport3D.width * 0.5f));
loadmodel_font.params.posX -= wi::font::TextWidth(loadmodel_font.GetText(), loadmodel_font.params) * 0.5f;
loadmodel_font.params.posY = PhysicalToLogical(uint32_t(viewport3D.top_left_y)) + 15;
terrain_generation_font.params.posX = PhysicalToLogical(uint32_t(viewport3D.top_left_x + viewport3D.width * 0.5f));
terrain_generation_font.params.posX -= wi::font::TextWidth(terrain_generation_font.GetText(), terrain_generation_font.params) * 0.5f;
terrain_generation_font.params.posY = PhysicalToLogical(uint32_t(viewport3D.top_left_y)) + 45;
viewport3D_hitbox = Hitbox2D(
XMFLOAT2(PhysicalToLogical(uint32_t(viewport3D.top_left_x)), PhysicalToLogical(uint32_t(viewport3D.top_left_y))),
XMFLOAT2(PhysicalToLogical(uint32_t(viewport3D.width)), PhysicalToLogical(uint32_t(viewport3D.height)))
Editor/Editor.h
+2
View File
@@ -269,6 +269,8 @@ public:
wi::jobsystem::context loadmodel_workload;
wi::SpriteFont loadmodel_font;
wi::SpriteFont terrain_generation_font;
float terrain_generation_font_timeout = 0;
wi::TrailRenderer spline_renderer;
};
WickedEngine/wiTerrain.cpp
+7
View File
@@ -1464,6 +1464,13 @@ namespace wi::terrain
generator->cancelled.store(false); // the next generation can run
}
bool Terrain::IsGenerationBusy() const
{
if (generator == nullptr)
return false;
return wi::jobsystem::IsBusy(generator->workload);
}
void Terrain::CreateChunkRegionTexture(ChunkData& chunk_data)
{
GraphicsDevice* device = GetDevice();
WickedEngine/wiTerrain.h
+2
View File
@@ -353,6 +353,8 @@ namespace wi::terrain
void Generation_Update(const wi::scene::CameraComponent& camera);
// Tells the generation thread that it should be cancelled and blocks until that is confirmed
void Generation_Cancel();
// Check if the terrain generation is currently busy (running in background)
bool IsGenerationBusy() const;
// Creates the textures for a chunk data
void CreateChunkRegionTexture(ChunkData& chunk_data);