Merge pull request #48 from Broken-Gem-Studio/development

Fixed issues issues with Scene play/stop and camera FOV
Broken-Gem-Studio · Mar 10, 2020 · 4f9cb78 · 4f9cb78
2 parents f9fcd93 + 3109122
commit 4f9cb78
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/Broken Engine/Game/BrokenCore_DEBUG.dll b/Broken Engine/Game/BrokenCore_DEBUG.dll
diff --git a/Broken Engine/Game/Settings/EditorConfig.json b/Broken Engine/Game/Settings/EditorConfig.json
@@ -6,7 +6,7 @@
     "GUI": {
         "About": false,
         "Build": false,
-        "Console": false,
+        "Console": true,
         "Hierarchy": true,
         "Inspector": true,
         "Physics": true,

diff --git a/Broken Engine/Source/ComponentAnimation.cpp b/Broken Engine/Source/ComponentAnimation.cpp
@@ -473,6 +473,7 @@ void ComponentAnimation::BlendAnimations(float blend_time)
 		blending = false;
 		curr_blend_time = 0;
 		playing_animation = next_animation;
+		time = 0;
 	}
 
 }

diff --git a/Broken Engine/Source/ComponentCamera.cpp b/Broken Engine/Source/ComponentCamera.cpp
@@ -142,10 +142,10 @@ json ComponentCamera::Save() const {
 
 void ComponentCamera::Load(json& node)
 {
+	SetAspectRatio(node["ASPECTRATIO"].is_null() ? 1.0f : node["ASPECTRATIO"].get<float>());
 	SetFOV(node["FOV"].is_null() ? 60.0f : node["FOV"].get<float>());
 	SetNearPlane(node["NEARPLANE"].is_null() ? 0.1f : node["NEARPLANE"].get<float>());
 	SetFarPlane(node["FARPLANE"].is_null() ? 100.0f : node["FARPLANE"].get<float>());
-	SetAspectRatio(node["ASPECTRATIO"].is_null() ? 1.0f : node["ASPECTRATIO"].get<float>());
 }
 
 void ComponentCamera::CreateInspectorNode() {

diff --git a/Broken Engine/Source/ModuleTimeManager.cpp b/Broken Engine/Source/ModuleTimeManager.cpp
@@ -66,7 +66,7 @@ void ModuleTimeManager::PrepareUpdate() {
 
 		case AppState::TO_EDITOR:
 			App->physics->DeleteActors();
-			App->GetAppState() = AppState::EDITOR;
+
 			App->scene_manager->SetActiveScene(App->scene_manager->currentScene);
 
 			// --- Clear temporal scene, eliminate temporal files/directory ---
@@ -78,7 +78,6 @@ void ModuleTimeManager::PrepareUpdate() {
 
 			App->GetAppState() = AppState::EDITOR;
 
-
 			ENGINE_CONSOLE_LOG("APP STATE EDITOR");
 			break;
 

diff --git a/Broken Engine/Source/PanelResources.cpp b/Broken Engine/Source/PanelResources.cpp
@@ -75,6 +75,30 @@ bool PanelResources::Draw()
 
 			ImGui::Separator();
 		}
+		if (ImGui::CollapsingHeader("Animations"))
+		{
+			for (std::map<uint, Broken::ResourceAnimation*>::const_iterator it = EngineApp->resources->animations.begin(); it != EngineApp->resources->animations.end(); ++it)
+			{
+				if ((*it).second)
+				{
+					DrawResourceNode((*it).second, instances_color);
+				}
+			}
+
+			ImGui::Separator();
+		}
+		if (ImGui::CollapsingHeader("Bones"))
+		{
+			for (std::map<uint, Broken::ResourceBone*>::const_iterator it = EngineApp->resources->bones.begin(); it != EngineApp->resources->bones.end(); ++it)
+			{
+				if ((*it).second)
+				{
+					DrawResourceNode((*it).second, instances_color);
+				}
+			}
+
+			ImGui::Separator();
+		}
 		if (ImGui::CollapsingHeader("Shaders"))
 		{
 			for (std::map<uint, Broken::ResourceShader*>::const_iterator it = EngineApp->resources->shaders.begin(); it != EngineApp->resources->shaders.end(); ++it)