Changeset: 23 Fix camera view matrix, [WIP] guizmo

1 files changed, 5 insertions, 13 deletions

diff --git a/source/EditorCore.hpp b/source/EditorCore.hpp
index 8b70ee0..b73152a 100644
--- a/source/EditorCore.hpp
+++ b/source/EditorCore.hpp
@@ -56,24 +56,15 @@ public:
 	void Show(bool* open = nullptr);
 };
 
-class EditorTransformEdit {
-private:
-	ImGuizmo::OPERATION mCurrentGizmoOperation = ImGuizmo::TRANSLATE;
-	ImGuizmo::MODE mCurrentGizmoMode = ImGuizmo::LOCAL;
+struct GuizmoState {
+	ImGuizmo::OPERATION currOperation = ImGuizmo::TRANSLATE;
+	ImGuizmo::MODE currMode = ImGuizmo::LOCAL;
 	glm::mat4 cubeMatrix;
 	float snap[3] = { 1.f, 1.f, 1.f };
-	float bounds[6] = { -0.5f, -0.5f, -0.5f, 0.5f, 0.5f, 0.5f };
 	float boundsSnap[3] = { 0.1f, 0.1f, 0.1f };
-	float camDistance = 8.f;
 	bool useSnap = false;
 	bool boundSizing = false;
 	bool boundSizingSnap = false;
-	bool showGrid = false;
-
-public:
-	void ShowWorld(Camera* camera);
-	bool ShowObjectInspector(float* cameraView, float* cameraProjection, glm::vec3* pos, glm::quat* rotation, glm::vec3* scale);
-	bool ShowObject(float* cameraView, float* cameraProjection, glm::vec3* pos, glm::quat* rotation, glm::vec3* scale);
 };
 
 // TODO editor undo stack
@@ -87,7 +78,7 @@ private:
 	EditorCommandPalette mEdCommandPalette;
 	EditorInspector mEdInspector;
 	EditorContentBrowser mEdContentBrowser;
-	EditorTransformEdit mEdTransformEdit;
+	GuizmoState mGuizmo;
 	glm::vec3 mDragCam_CamInitial;
 	ImVec2 mDragCam_CursorInitial;
 	int mSpriteView_Frame;
@@ -99,6 +90,7 @@ private:
 	bool mWindowVisible_WorldStructure = true;
 	bool mWindowVisible_WorldProperties = true;
 	bool mDragCam_Happening = false;
+	bool mMoveCamKeyboard = false;
 
 public:
 	EditorInstance(App* app);