Skip to content

Commit bb12433

Browse files
committed
Fixed Load And Save buttons UI
1 parent 40dbc06 commit bb12433

File tree

2 files changed

+23
-16
lines changed

2 files changed

+23
-16
lines changed

Engine/Application.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ void Application::FinishUpdate()
275275
{
276276
actual_scene = json_seria->SaveScene();
277277
}
278-
else if (want_to_save_binary)
278+
if (want_to_save_binary)
279279
{
280280
actual_scene = json_seria->SaveSceneBinary();
281281
}

Engine/ModuleGUI.cpp

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -154,24 +154,28 @@ update_status ModuleGUI::Update(float dt)
154154
if (App->engine_state == EngineState::STOP)
155155
{
156156
App->WantToSave();
157+
App->WantToSave(true);
157158
}
158159
else
159160
{
160161
LOG("YOU CAN'T SAVE IN PLAY MODE! [red]");
161162
}
162163
}
163-
if (ImGui::MenuItem("Save Scene Binary", NULL, false))
164+
if (develop_mode)
164165
{
165-
if (App->engine_state == EngineState::STOP)
166-
{
167-
App->WantToSave(true);
168-
}
169-
else
166+
if (ImGui::MenuItem("Save Scene Binary", NULL, false))
170167
{
171-
LOG("YOU CAN'T SAVE IN PLAY MODE! [red]");
168+
if (App->engine_state == EngineState::STOP)
169+
{
170+
App->WantToSave(true);
171+
}
172+
else
173+
{
174+
LOG("YOU CAN'T SAVE IN PLAY MODE! [red]");
175+
}
172176
}
173177
}
174-
if (ImGui::MenuItem("Load Scene Binary", NULL, false))
178+
if (ImGui::MenuItem("Load Scene", NULL, false))
175179
{
176180
//App->json_seria->LoadSceneBinary("JoanTest");
177181
if (App->engine_state == EngineState::STOP)
@@ -188,15 +192,18 @@ update_status ModuleGUI::Update(float dt)
188192
{
189193

190194
}
191-
if (ImGui::MenuItem("Load Scene"))
195+
if (develop_mode)
192196
{
193-
if (App->engine_state == EngineState::STOP)
194-
{
195-
App->WantToLoad(false, false, true);
196-
}
197-
else
197+
if (ImGui::MenuItem("Load Scene JSON"))
198198
{
199-
LOG("YOU CAN'T LOAD IN PLAY MODE! [red]");
199+
if (App->engine_state == EngineState::STOP)
200+
{
201+
App->WantToLoad(false, false, true);
202+
}
203+
else
204+
{
205+
LOG("YOU CAN'T LOAD IN PLAY MODE! [red]");
206+
}
200207
}
201208
}
202209
ImGui::Separator();

0 commit comments

Comments
 (0)