Skip to content

Commit

Permalink
+ serialization of creatureId corrected
Browse files Browse the repository at this point in the history
+ layout of matrix edit labels improved
  • Loading branch information
chrxh committed Jul 4, 2023
1 parent 7d5907b commit 11cfc6a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion source/Base/Resources.h
Original file line number Diff line number Diff line change
Expand Up @@ -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/";

Expand Down
2 changes: 1 addition & 1 deletion source/EngineInterface/Serializer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions source/Gui/AlienImGui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -1363,14 +1363,14 @@ void AlienImGui::BasicInputColorMatrix(BasicInputColorMatrixParameters<T> 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);
Expand Down
3 changes: 3 additions & 0 deletions source/Gui/GettingStartedWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 11cfc6a

Please sign in to comment.