switch mouse cursor in/out SceneView

Engine/Source/Editor/Camera/EditorCameraController.h → Engine/Source/Editor/Camera/ViewportCameraController.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Camera/ICameraController.h"
 #include "ECWorld/TransformComponent.h"
 #include "Math/Box.hpp"
 #include "Math/Transform.hpp"
@@ -10,20 +11,48 @@ namespace engine
 class CameraComponent;
 class SceneWorld;
 
-class EditorCameraController final
+class ViewportCameraController : public ICameraController
 {
 public:
-	EditorCameraController() = delete;
-	explicit EditorCameraController(const SceneWorld* pSceneWorld, float sensitivity, float movement_speed);
-	explicit EditorCameraController(const SceneWorld* pSceneWorld, float horizontal_sensitivity, float vertical_sensitivity, float movement_speed);
-	~EditorCameraController() = default;
+	ViewportCameraController() = delete;
+	explicit ViewportCameraController(const SceneWorld* pSceneWorld, float sensitivity, float movement_speed);
+	explicit ViewportCameraController(const SceneWorld* pSceneWorld, float horizontal_sensitivity, float vertical_sensitivity, float movement_speed);
+	~ViewportCameraController() = default;
+
+	ViewportCameraController(const ViewportCameraController&) = delete;
+	ViewportCameraController(ViewportCameraController&&) = delete;
+	ViewportCameraController& operator=(const ViewportCameraController&) = delete;
+	ViewportCameraController& operator=(ViewportCameraController&&) = delete;
+
+	// Operations
+	virtual bool IsInAnimation() const override;
+	virtual bool IsZooming() const override;
+	virtual bool IsPanning() const override;
+	virtual bool IsTurning() const override;
+	virtual bool IsTracking() const override;
+	virtual bool IsInWalkMode() const override;
+
+	// Event Handlers
+	virtual void OnMouseDown() override;
+	virtual void OnMouseUp() override;
+	virtual void OnMouseMove(float x, float y) override;
+	virtual void OnMouseWheel(float y) override;
+
+	// TODO : EventDriven, not update.
+	void Update(float deltaTime);
 
-	EditorCameraController(const EditorCameraController&) = delete;
-	EditorCameraController(EditorCameraController&&) = delete;
-	EditorCameraController& operator=(const EditorCameraController&) = delete;
-	EditorCameraController& operator=(EditorCameraController&&) = delete;
+	// Synchronizes the controller to the transform of camera current state
+	void CameraToController();
 
-	void Update(float deltaTime);
+	// Synchronizes the transform of camera to the controller's current state
+	void ControllerToCamera();
+
+	// Implement the effect of a translation animation.
+	void CameraFocus();
+	void Focusing();
+
+	//
+	void Zoom(float delta);
 
 	// Configs
 	void SetMovementSpeed(float speed);
@@ -53,16 +82,7 @@ class EditorCameraController final
 	void AzimuthChanging(float amount);
 	void ElevationChanging(float amount);
 
-	// Double Click entity,camera will focus
-	void CameraFocus();
-	// Implement the effect of a translation animation.
-	void Moving();
-
-	// Synchronizes the controller to the transform of camera current state
-	void CameraToController();
 
-	// Synchronizes the transform of camera to the controller's current state
-	void ControllerToCamera();
 
 	// Synchronize view when begin using mayastyle camera or fpscamera
 	void SynchronizeTrackingCamera();
@@ -97,8 +117,8 @@ class EditorCameraController final
 	cd::Vec3f m_lookAtDestination;
 
 	bool m_isTracking = false;
-	bool m_isMoving = false;
-	bool m_isMouseMovedInView = false;
+	bool m_isFocusing = false;
+	bool m_isInWalkMode = false;
 };
 
 }

Engine/Source/Editor/EditorApp.cpp

@@ -1,7 +1,7 @@
 #include "EditorApp.h"
 
 #include "Application/Engine.h"
-#include "Camera/EditorCameraController.h"
+#include "Camera/ViewportCameraController.h"
 #include "ECWorld/SceneWorld.h"
 #include "ImGui/ImGuiContextInstance.h"
 #include "ImGui/ImGuiContextManager.h"
@@ -58,6 +58,23 @@
 //#include <format>
 #include <thread>
 
+namespace
+{
+
+void OnEnterSceneView()
+{
+	auto* pWindowManager = static_cast<engine::WindowManager*>(ImGui::GetIO().BackendPlatformUserData);
+	pWindowManager->SetCursor(engine::MouseCursorType::Crosshair);
+}
+
+void OnLeaveSceneView()
+{
+	auto* pWindowManager = static_cast<engine::WindowManager*>(ImGui::GetIO().BackendPlatformUserData);
+	pWindowManager->SetCursor(engine::MouseCursorType::Arrow);
+}
+
+}
+
 namespace editor
 {
 
@@ -164,7 +181,7 @@ void EditorApp::InitEditorImGuiContext(engine::Language language)
 	assert(GetMainWindow() && "Init window before imgui context");
 
 	m_pEditorImGuiContext = m_pImGuiContextManager->AddImGuiContext(engine::StringCrc("Editor"));
-	m_pEditorImGuiContext->InitBackendUserData(GetMainWindow(), m_pRenderContext.get());
+	m_pEditorImGuiContext->InitBackendUserData(m_pWindowManager.get(), m_pRenderContext.get());
 	m_pEditorImGuiContext->SetDisplaySize(GetMainWindow()->GetWidth(), GetMainWindow()->GetHeight());
 	m_pEditorImGuiContext->LoadFontFiles({ "FanWunMing-SB.ttf" }, language);
 	m_pEditorImGuiContext->SetImGuiThemeColor(engine::ThemeColor::Dark);
@@ -174,7 +191,7 @@ void EditorApp::InitEditorImGuiContext(engine::Language language)
 	// Init viewport settings.
 	if (m_pEditorImGuiContext->IsViewportEnable())
 	{
-		m_pEditorImGuiContext->InitViewport(m_pWindowManager.get(), m_pRenderContext.get());
+		m_pEditorImGuiContext->InitViewport();
 		ImGuiViewport* pMainViewport = ImGui::GetMainViewport();
 		assert(pMainViewport);
 		pMainViewport->PlatformHandle = GetMainWindow();
@@ -228,12 +245,15 @@ void EditorApp::InitEngineImGuiContext(engine::Language language)
 	engine::RenderTarget* pSceneRenderTarget = m_pRenderContext->GetRenderTarget(sceneRenderTarget);
 
 	m_pEngineImGuiContext = m_pImGuiContextManager->AddImGuiContext(engine::StringCrc("Engine"));
-	m_pEngineImGuiContext->InitBackendUserData(GetMainWindow(), m_pRenderContext.get());
+	m_pEngineImGuiContext->InitBackendUserData(m_pWindowManager.get(), m_pRenderContext.get());
 	m_pEngineImGuiContext->SetDisplaySize(pSceneRenderTarget->GetWidth(), pSceneRenderTarget->GetHeight());
 	m_pEngineImGuiContext->LoadFontFiles({ "FanWunMing-SB.ttf" }, language);
 	m_pEngineImGuiContext->SetImGuiThemeColor(engine::ThemeColor::Light);
 
 	pSceneRenderTarget->OnResize.Bind<engine::ImGuiContextInstance, &engine::ImGuiContextInstance::OnResize>(m_pEngineImGuiContext);
+
+	m_pEngineImGuiContext->OnMouseEnterDisplayRect.Bind<OnEnterSceneView>();
+	m_pEngineImGuiContext->OnMouseLeaveDisplayRect.Bind<OnLeaveSceneView>();
 }
 
 void EditorApp::InitEngineUILayers()
@@ -545,7 +565,7 @@ void EditorApp::InitShaderPrograms(bool compileAllShaders) const
 void EditorApp::InitEditorController()
 {
 	// Controller for Input events.
-	m_pViewportCameraController = std::make_unique<engine::EditorCameraController>(
+	m_pViewportCameraController = std::make_unique<engine::ViewportCameraController>(
 		m_pSceneWorld.get(),
 		12.0f /* horizontal sensitivity */,
 		12.0f /* vertical sensitivity */);
@@ -623,7 +643,7 @@ bool EditorApp::Update(float deltaTime)
 		}
 	}
 
-	auto [sceneRectX, sceneRectY] = m_pSceneView->GetRectPosition();
+	auto [sceneRectX, sceneRectY] = m_pSceneView->GetWorkRectPosition();
 	m_pEditorImGuiContext->EndFrame();
 
 	if (m_pEngineImGuiContext)
@@ -685,33 +705,6 @@ bool EditorApp::Update(float deltaTime)
 void EditorApp::InitWindowManager()
 {
 	m_pWindowManager = std::make_unique<engine::WindowManager>();
-	m_pWindowManager->OnMouseMove.Bind<EditorApp, &EditorApp::HandleMouseMotionEvent>(this);
-}
-
-void EditorApp::HandleMouseMotionEvent(uint32_t windowID, int x, int y)
-{
-	engine::Input::Get().SetMousePositionX(x);
-	engine::Input::Get().SetMousePositionY(y);
-
-	//auto [screenX, screenY] = engine::Input::GetGloalMousePosition();
-	////auto* pWindow = m_pWindowManager->GetWindow(windowID);	
-	//for (auto& [_, pImGuiContext] : m_pImGuiContextManager->GetAllImGuiContexts())
-	//{
-	//	if (pImGuiContext->IsViewportEnable())
-	//	{
-	//		// In multiple viewport mode, it always use global screen space coordinates.
-	//		engine::Input::Get().SetMousePositionX(screenX);
-	//		engine::Input::Get().SetMousePositionY(screenY);
-	//	}
-	//	else
-	//	{
-	//		if (pImGuiContext->IsInsideDisplayRect())
-	//		{
-	//			engine::Input::Get().SetMousePositionX(x);
-	//			engine::Input::Get().SetMousePositionY(y);
-	//		}
-	//	}
-	//}
 }
 
 }

Engine/Source/Editor/EditorApp.h

@@ -10,7 +10,7 @@ namespace engine
 {
 
 class AABBRenderer;
-class EditorCameraController;
+class ViewportCameraController;
 class FlybyCamera;
 class ImGuiBaseLayer;
 class ImGuiContextInstance;
@@ -51,7 +51,6 @@ class EditorApp final : public engine::IApplication
 	void InitWindowManager();
 	engine::Window* GetMainWindow() const { return m_pMainWindow; }
 	engine::WindowManager* GetWindowManager() const { return m_pWindowManager.get(); }
-	void HandleMouseMotionEvent(uint32_t windowID, int x, int y);
 
 	// Rendering Management
 	void InitRenderContext(engine::GraphicsBackend backend, void* hwnd = nullptr);
@@ -119,7 +118,7 @@ class EditorApp final : public engine::IApplication
 	engine::Renderer* m_pAABBRenderer = nullptr;
 
 	// Controllers for processing input events.
-	std::unique_ptr<engine::EditorCameraController> m_pViewportCameraController;
+	std::unique_ptr<engine::ViewportCameraController> m_pViewportCameraController;
 
 	std::unique_ptr<FileWatcher> m_pFileWatcher;
 };

Engine/Source/Editor/UILayers/EntityList.cpp

@@ -1,6 +1,6 @@
 #include "EntityList.h"
 
-#include "Camera/EditorCameraController.h"
+#include "Camera/ViewportCameraController.h"
 #include "ECWorld/SceneWorld.h"
 #include "ECWorld/World.h"
 #include "ImGui/IconFont/IconsMaterialDesignIcons.h"

Engine/Source/Editor/UILayers/EntityList.h

@@ -10,7 +10,7 @@
 namespace engine
 {
 
-class EditorCameraController;
+class ViewportCameraController;
 class SceneWorld;
 
 }
@@ -30,11 +30,11 @@ class EntityList : public engine::ImGuiBaseLayer
 	void AddEntity(engine::SceneWorld* pSceneWorld);
 	void DrawEntity(engine::SceneWorld* pSceneWorld, engine::Entity entity);
 
-	void SetCameraController(engine::EditorCameraController* pCameraController) { m_pCameraController = pCameraController; }
+	void SetCameraController(engine::ViewportCameraController* pCameraController) { m_pCameraController = pCameraController; }
 
 private:
 	ImGuiTextFilter m_entityFilter;
-	engine::EditorCameraController* m_pCameraController = nullptr;
+	engine::ViewportCameraController* m_pCameraController = nullptr;
 };
 
 }

Engine/Source/Editor/UILayers/Inspector.cpp

@@ -360,7 +360,6 @@ void UpdateComponentWidget<engine::CameraComponent>(engine::SceneWorld* pSceneWo
 			ImGuiUtils::ImGuiFloatProperty("NearPlane", pCameraComponent->GetNearPlane()) ||
 			ImGuiUtils::ImGuiFloatProperty("FarPlane", pCameraComponent->GetFarPlane()))
 		{
-			pCameraComponent->Dirty();
 			pCameraComponent->BuildProjectMatrix();
 		}
 

Engine/Source/Editor/UILayers/MainMenu.cpp

@@ -1,6 +1,6 @@
 #include "MainMenu.h"
 
-#include "Camera/EditorCameraController.h"
+#include "Camera/ViewportCameraController.h"
 #include "ECWorld/SceneWorld.h"
 #include "EditorApp.h"
 #include "ImGui/ImGuiContextInstance.h"
@@ -53,13 +53,13 @@ void MainMenu::FileMenu()
 
 		ImGui::Separator();
 
-		if (ImGui::MenuItem("Quit", "Ctrl Q"))
-		{
-			if (auto* pMainWindow = reinterpret_cast<engine::Window*>(ImGui::GetIO().BackendPlatformUserData))
-			{
-				pMainWindow->Close();
-			}
-		}
+		//if (ImGui::MenuItem("Quit", "Ctrl Q"))
+		//{
+		//	if (auto* pMainWindow = reinterpret_cast<engine::Window*>(ImGui::GetIO().BackendPlatformUserData))
+		//	{
+		//		pMainWindow->Close();
+		//	}
+		//}
 
 		ImGui::EndMenu();
 	}
@@ -117,7 +117,7 @@ void MainMenu::EditMenu()
 
 void MainMenu::ViewMenu()
 {
-	auto FrameEntities = [](engine::SceneWorld* pSceneWorld, const std::vector<engine::Entity>& entities, engine::EditorCameraController* pCameraController)
+	auto FrameEntities = [](engine::SceneWorld* pSceneWorld, const std::vector<engine::Entity>& entities, engine::ViewportCameraController* pCameraController)
 	{
 		if (entities.empty())
 		{
@@ -164,7 +164,6 @@ void MainMenu::ViewMenu()
 
 			pTransformComponent->Dirty();
 			pTransformComponent->Build();
-			pCameraComponent->ViewDirty();
 			pCameraComponent->BuildViewMatrix(pTransformComponent->GetTransform());
 
 			// TODO : add event queue to get mouse down and up events.
@@ -263,14 +262,14 @@ void MainMenu::Update()
 
 	m_pCreateProjectDialog->Display();
 
-	if ((ImGui::IsKeyPressed(ImGuiKey_LeftCtrl) || ImGui::IsKeyPressed(ImGuiKey_RightCtrl))
-		&& ImGui::IsKeyPressed(ImGuiKey_Q))
-	{
-		if (auto* pMainWindow = reinterpret_cast<engine::Window*>(ImGui::GetIO().BackendPlatformUserData))
-		{
-			pMainWindow->Close();
-		}
-	}
+	//if ((ImGui::IsKeyPressed(ImGuiKey_LeftCtrl) || ImGui::IsKeyPressed(ImGuiKey_RightCtrl))
+	//	&& ImGui::IsKeyPressed(ImGuiKey_Q))
+	//{
+	//	if (auto* pMainWindow = reinterpret_cast<engine::Window*>(ImGui::GetIO().BackendPlatformUserData))
+	//	{
+	//		pMainWindow->Close();
+	//	}
+	//}
 }
 
 }

Engine/Source/Editor/UILayers/MainMenu.h

@@ -14,7 +14,7 @@ class FileBrowser;
 namespace engine
 {
 
-class EditorCameraController;
+class ViewportCameraController;
 
 }
 
@@ -37,11 +37,11 @@ class MainMenu : public engine::ImGuiBaseLayer
 	void BuildMenu();
 	void AboutMenu();
 
-	void SetCameraController(engine::EditorCameraController* pCameraController) { m_pCameraController = pCameraController; }
+	void SetCameraController(engine::ViewportCameraController* pCameraController) { m_pCameraController = pCameraController; }
 
 private:
 	std::unique_ptr<ImGui::FileBrowser> m_pCreateProjectDialog;
-	engine::EditorCameraController* m_pCameraController = nullptr;
+	engine::ViewportCameraController* m_pCameraController = nullptr;
 };
 
 }