Merge pull request #87 from kevinsadi/cross-platform

Cross platform
kevinsadi · Jan 3, 2024 · d74aa0d · d74aa0d
2 parents 50748e5 + a909bb0
commit d74aa0d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/engine/core/AppSettings.hpp b/src/engine/core/AppSettings.hpp
@@ -2,14 +2,14 @@
 
 #include <string>
 #include <vector>
+#include <cstdint>
 
 namespace lei3d
 {
 
 	class AppSettings
 	{
 	public:
-
 		static AppSettings& GetInstance();
 		~AppSettings() = default;
 

diff --git a/src/engine/rendering/gui/screens/PauseMenuScreen.cpp b/src/engine/rendering/gui/screens/PauseMenuScreen.cpp
@@ -3,14 +3,13 @@
 #include "SplashScreen.hpp"
 #include "core/Application.hpp"
 #include "rendering/gui/components/GuiTextBox.hpp"
-#include "Logging/Log.hpp"
+#include "logging/Log.hpp"
 #include "rendering/gui/GuiManager.hpp"
 
 namespace lei3d
 {
 	PauseMenuScreen::PauseMenuScreen()
 	{
-
 	}
 
 	PauseMenuScreen::~PauseMenuScreen()
@@ -22,11 +21,10 @@ namespace lei3d
 		GuiScreen::Init();
 
 		AddComponent(new GuiRect(
-			GuiComponent::Anchor::TOP_LEFT, 
-			{ GuiComponent::Space::NORMALIZED, { 0, 0 } }, 
-			{ GuiComponent::Space::NORMALIZED, { 1, 1 } }, 
-			{ 0, 0, 0, 0.5 }
-		));
+			GuiComponent::Anchor::TOP_LEFT,
+			{ GuiComponent::Space::NORMALIZED, { 0, 0 } },
+			{ GuiComponent::Space::NORMALIZED, { 1, 1 } },
+			{ 0, 0, 0, 0.5 }));
 
 		GuiTextBox* resumeButton = new GuiTextBox(
 			"Resume",
@@ -91,6 +89,6 @@ namespace lei3d
 
 		AddComponent(resumeButton);
 		AddComponent(restartButton);
-		AddComponent(exitButton);	
+		AddComponent(exitButton);
 	}
-} 
+} // namespace lei3d
diff --git a/src/engine/scenes/SceneIntro.cpp b/src/engine/scenes/SceneIntro.cpp
@@ -69,7 +69,7 @@ namespace lei3d
 		const std::string signPath = "data/models/leveldesignobj/sign/sign.gltf";
 		m_EnviromentModels.insert(std::make_pair("sign", std::make_unique<Model>(signPath)));
 
-		const std::string fishPath = "data/models/leveldesignobj/fish2/fish.obj";
+		const std::string fishPath = "data/models/leveldesignobj/fish2/Fish.obj";
 		m_EnviromentModels.insert(std::make_pair("fish", std::make_unique<Model>(fishPath)));
 
 		const std::string treePath = "data/models/environment/palm_tree.gltf";

diff --git a/src/engine/scenes/SceneTitle.cpp b/src/engine/scenes/SceneTitle.cpp
@@ -61,7 +61,7 @@ namespace lei3d
 		const std::string signPath = "data/models/leveldesignobj/sign/sign.gltf";
 		m_EnviromentModels.insert(std::make_pair("sign", std::make_unique<Model>(signPath)));
 
-		const std::string fishPath = "data/models/leveldesignobj/fish2/fish.obj";
+		const std::string fishPath = "data/models/leveldesignobj/fish2/Fish.obj";
 		m_EnviromentModels["fish"] = (std::make_unique<Model>(fishPath));
 		m_EnviromentModels.insert(std::make_pair("fish", std::make_unique<Model>(fishPath)));
 

diff --git a/src/engine/scenes/TestSceneKevin.cpp b/src/engine/scenes/TestSceneKevin.cpp
@@ -51,6 +51,8 @@ namespace lei3d
 		backpackModel = std::make_unique<Model>(backpackPath);
 
 		const std::string physicsPlaygroundPath = "data/models/environment/level_disassociate_2.gltf";
+		// const std::string physicsPlaygroundPath = "data/models/environment/level_7_colors.gltf";
+
 		if (playgroundModel)
 		{
 			playgroundModel.reset();
@@ -66,7 +68,7 @@ namespace lei3d
 		const std::string housePath = "data/models/leveldesignobj/house/house_texture.obj";
 		m_EnviromentModels.insert(std::make_pair("house", std::make_unique<Model>(housePath)));
 
-		const std::string fishPath = "data/models/leveldesignobj/fish2/fish.obj";
+		const std::string fishPath = "data/models/leveldesignobj/fish2/Fish.obj";
 		m_EnviromentModels.insert(std::make_pair("fish", std::make_unique<Model>(fishPath)));
 
 		const std::string treePath = "data/models/environment/palm_tree.gltf";
@@ -434,7 +436,7 @@ namespace lei3d
 		ModelInstance* flowerRender2 = flowerObj2.AddComponent<ModelInstance>();
 		flowerRender2->Init(m_EnviromentModels["flower"].get());
 		flowerObj2.SetScale(glm::vec3(2.4f, 2.4f, 2.4f));
-		flowerObj2.SetPosition(glm::vec3(0.0f, 0.0f, 0.0f));
+		flowerObj2.SetPosition(glm::vec3(-91.5f, -233.6f, -467.0f));
 		ColorSource* startSrc2 = flowerObj2.AddComponent<ColorSource>();
 		startSrc2->Init(5, 10, true);
 		StaticCollider* flowerCollider2 = flowerObj2.AddComponent<StaticCollider>();