slapin/ogre-prototype
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Taxi demo update with sedan

Browse Source
This commit is contained in:
Sergey Lapin
2026-09-17 02:55:53 +03:00
parent c748a7dd1e
commit 3c7f50a4ef
21 changed files with 2007 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gamedata/GUIModule.cpp
+5 -5
View File
@@ -288,7 +288,7 @@ struct GUIListener : public Ogre::RenderTargetListener {
ImGuiWindowFlags_NoInputs);
// if (ECS::get().get<GUI>().enabled)
// ECS::get().get<App>().app->setWindowGrab(true);
ImGui::PushFont(bigFont);
ImGui::PushFont(bigFont, 0.0f);
ImGui::TextWrapped(
"%s",
"This game does not autosave. Please use save function to keep your state");
@@ -307,7 +307,7 @@ struct GUIListener : public Ogre::RenderTargetListener {
ImGuiCond_Always);
ImGui::Begin("Narration...", NULL,
ImGuiWindowFlags_NoTitleBar);
ImGui::PushFont(midFont);
ImGui::PushFont(midFont, 0.0f);
ImVec2 p = ImGui::GetCursorScreenPos();
GUI::NarrationHandler *narration =
ECS::get<GUI>().narrationHandlers.front();
@@ -356,7 +356,7 @@ struct GUIListener : public Ogre::RenderTargetListener {
ImGuiCond_Always);
ImGui::Begin("Narration...", NULL,
ImGuiWindowFlags_NoTitleBar);
ImGui::PushFont(midFont);
ImGui::PushFont(midFont, 0.0f);
ImVec2 p = ImGui::GetCursorScreenPos();
ImGui::TextWrapped(
"%s",
@@ -454,8 +454,8 @@ struct GUIListener : public Ogre::RenderTargetListener {
ImVec2 size = ImGui::GetWindowSize();
float window_width = size.x;
float window_height = size.y;
ImGui::PushFont(bigFont);
ImGui::TextWrapped("%s", "Booo!!!!");
ImGui::PushFont(bigFont, 0.0f);
ImGui::TextWrapped("%s", "Booo!!!!");
float extra_pixels = 20.0f;
float button_width = 0.0f;
float buttons_height = 0.0f;
src/gamedata/items/items.cpp
+3 -2
View File
@@ -283,8 +283,9 @@ void drawRectPreview(nlohmann::json::json_pointer ptr,
// Outline if selected
if (rectName == name)
draw_list->AddRect(p_min, p_max,
IM_COL32(255, 255, 0, 255), 0.0f, 0,
2.0f);
IM_COL32(255, 255, 0, 255), 0.0f,
2.0f,
ImDrawFlags_None);
}
ImGui::Dummy(canvas_sz); // Advance cursor
}