From 11cfc6afe8fe4c2e88fc0e00c3f15142f90eccbf Mon Sep 17 00:00:00 2001 From: Christian Heinemann Date: Tue, 4 Jul 2023 22:17:30 +0200 Subject: [PATCH] + serialization of creatureId corrected + layout of matrix edit labels improved --- source/Base/Resources.h | 2 +- source/EngineInterface/Serializer.cpp | 2 +- source/Gui/AlienImGui.cpp | 10 +++++----- source/Gui/GettingStartedWindow.cpp | 3 +++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source/Base/Resources.h b/source/Base/Resources.h index a56ed1635..28d8ab7ec 100644 --- a/source/Base/Resources.h +++ b/source/Base/Resources.h @@ -2,7 +2,7 @@ namespace Const { - std::string const ProgramVersion = "4.0.0.beta.18"; + std::string const ProgramVersion = "4.0.0.beta.19"; std::string const BasePath = "resources/"; diff --git a/source/EngineInterface/Serializer.cpp b/source/EngineInterface/Serializer.cpp index 05167e4d8..fd0f80468 100644 --- a/source/EngineInterface/Serializer.cpp +++ b/source/EngineInterface/Serializer.cpp @@ -48,7 +48,7 @@ namespace auto constexpr Id_Cell_Barrier = 3; auto constexpr Id_Cell_Age = 4; auto constexpr Id_Cell_LivingState = 5; - auto constexpr Id_Cell_CreatureId = 10; + auto constexpr Id_Cell_CreatureId = 11; auto constexpr Id_Cell_InputExecutionOrderNumber = 9; auto constexpr Id_Cell_OutputBlocked = 7; auto constexpr Id_Cell_ActivationTime = 8; diff --git a/source/Gui/AlienImGui.cpp b/source/Gui/AlienImGui.cpp index 63a102a5b..1b27c51ed 100644 --- a/source/Gui/AlienImGui.cpp +++ b/source/Gui/AlienImGui.cpp @@ -495,7 +495,7 @@ bool AlienImGui::Checkbox(CheckboxParameters const& parameters, bool& value) auto result = ImGui::Checkbox(("##" + parameters._name).c_str(), &value); ImGui::SameLine(); if (parameters._textWidth != 0) { - ImGui::Dummy(ImVec2(ImGui::GetContentRegionAvail().x - parameters._textWidth, 0.0f)); + ImGui::Dummy(ImVec2(ImGui::GetContentRegionAvail().x - scale(parameters._textWidth), 0.0f)); } ImGui::SameLine(); @@ -1363,14 +1363,14 @@ void AlienImGui::BasicInputColorMatrix(BasicInputColorMatrixParameters const& if (isExpanded) { ImGui::BeginGroup(); - ImGui::SetCursorPosX(ImGui::GetCursorPosX() + scale(140.0f)); - ImGui::Text("[target cell]"); + ImGui::SetCursorPosX(ImGui::GetCursorPosX() + scale(130.0f)); + ImGui::Text("[target color]"); auto startPos = ImGui::GetCursorPos(); - ImGui::SetCursorPos({startPos.x - scale(48), startPos.y + scale(108)}); + ImGui::SetCursorPos({startPos.x - scale(48), startPos.y + scale(105)}); RotateStart(); - ImGui::Text("[host cell]"); + ImGui::Text("[host color]"); RotateEnd(90.0f); ImGui::SetCursorPos(startPos); diff --git a/source/Gui/GettingStartedWindow.cpp b/source/Gui/GettingStartedWindow.cpp index 3008033b2..67bac4cb1 100644 --- a/source/Gui/GettingStartedWindow.cpp +++ b/source/Gui/GettingStartedWindow.cpp @@ -177,6 +177,9 @@ void _GettingStartedWindow::processIntern() drawItemText("Fluids/Pump with Soft-Bodies"); drawItemText("Demos/Stormy Night"); ImGui::Text("They are suitable for testing the influence of simulation parameters such as 'Smoothing length', 'Pressure', 'Viscosity', etc."); + AlienImGui::BoldText("Evolution of self-replicators"); + AlienImGui::BoldText("Plant-herbivore ecosystems"); + AlienImGui::BoldText("Swarming"); ImGui::Spacing(); ImGui::Spacing(); ImGui::Spacing();