Merge branch 'main' into dev

jmorton06 · May 21, 2024 · c79b917 · c79b917
2 parents 484186b + 4afcd4a
commit c79b917
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/Editor/Source/Editor.cpp b/Editor/Source/Editor.cpp
@@ -1993,7 +1993,9 @@ namespace Lumos
                     glm::mix(
                         cameraCurrentPosition,
                         m_CameraDestination,
-                        glm::clamp(m_CameraTransitionSpeed * kSpeedBaseFactor * static_cast<float>(ts.GetSeconds()), 0.0f, 1.0f)));
+                        glm::clamp(m_CameraTransitionSpeed * kSpeedBaseFactor * static_cast<float>(ts.GetSeconds()), 0.0f, 1.0f)
+                    )
+                );
 
                 auto distanceToDestination = glm::distance(cameraCurrentPosition, m_CameraDestination);
 
@@ -2165,8 +2167,8 @@ namespace Lumos
         {
             m_TransitioningCamera = true;
 
-            m_CameraDestination     = point + m_EditorCameraTransform.GetForwardDirection() * distance;
-            m_CameraTransitionSpeed = speed;
+            m_CameraDestination         = point + m_EditorCameraTransform.GetForwardDirection() * distance;
+            m_CameraTransitionSpeed     = speed;
         }
     }
 

diff --git a/Editor/Source/Editor.h b/Editor/Source/Editor.h
@@ -294,11 +294,13 @@ namespace Lumos
         uint32_t m_ImGuizmoOperation = 14463;
         std::vector<entt::entity> m_SelectedEntities;
         std::vector<entt::entity> m_CopiedEntities;
+
         Entity m_HoveredEntity;
-        bool m_CutCopyEntity            = false;
-        float m_CurrentSceneAspectRatio = 0.0f;
-        float m_CameraTransitionSpeed   = 0.0f;
-        bool m_TransitioningCamera      = false;
+        bool m_CutCopyEntity              = false;
+        float m_CurrentSceneAspectRatio   = 0.0f;
+        float m_CameraTransitionSpeed     = 0.0f;
+        bool m_TransitioningCamera        = false;
+
         glm::vec3 m_CameraDestination;
         bool m_SceneViewActive     = false;
         bool m_NewProjectPopupOpen = false;

diff --git a/README.md b/README.md
@@ -54,21 +54,21 @@ msbuild /p:Platform=x64 /p:Configuration=Release Lumos.sln
 ```
 cd Lumos
 Tools/premake5 xcode4
-xcodebuild -project Runtime.xcodeproj
+xcodebuild -project Runtime/Runtime.xcodeproj
 ```
 
 M1/M2/M3 Macs may need :
 ```
 cd Lumos
 Tools/premake5 xcode4 --arch=arm64 --os=macosx
-xcodebuild -project Runtime.xcodeproj
+xcodebuild -project Runtime/Runtime.xcodeproj
 ```
 
 #### iOS
 ```
 cd Lumos
 Tools/premake5 xcode4 --os=ios
-xcodebuild -project Runtime.xcodeproj CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+xcodebuild -project Runtime/Runtime.xcodeproj CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
 ```
 
 To run on apple devices with Vulkan ( MoltenVK ), disable Metal API Validation here : Product > Scheme > Edit Scheme… > Run > Options > Metal API Validation