Refactor tools to allow for the terrain editor to be a proper tool.

Duttenheim · Duttenheim · commit 8eb8a332e5a9 · 2025-11-23T21:41:51.000+01:00
diff --git a/toolkit/editor/editor/tools/rotatetool.cc b/toolkit/editor/editor/tools/rotatetool.cc
@@ -34,7 +34,7 @@ namespace Tools
 /**
 */
 void
-RotateTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+RotateTool::Update(Presentation::Modules::Viewport* viewport)
 {
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
     Ptr<Input::Keyboard> keyboard = Input::InputServer::Instance()->GetDefaultKeyboard();
@@ -47,15 +47,15 @@ RotateTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPor
 
     if (mouse->ButtonUp(Input::MouseButton::Code::LeftButton))
     {
-        Tools::SelectionContext::PerformPicking(viewPortPosition, viewPortSize, camera);
+        Tools::SelectionContext::PerformPicking(viewport->lastViewportImagePosition, viewport->lastViewportImageSize, &viewport->camera);
     }
 }
 
 //------------------------------------------------------------------------------
 /**
 */
 void
-RotateTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+RotateTool::Render(Presentation::Modules::Viewport* viewport)
 {
     SelectionContext::ValidateSelection();
 
@@ -66,7 +66,7 @@ RotateTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPor
 
     Game::World* defaultWorld = Game::GetWorld(WORLD_DEFAULT);
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
-    Im3d::Im3dContext::SetViewportRect(viewPortPosition, viewPortSize);
+    Im3d::Im3dContext::SetViewportRect(viewport->lastViewportImagePosition, viewport->lastViewportImageSize);
 
     if (!this->translation.isDirty)
     {
diff --git a/toolkit/editor/editor/tools/rotatetool.h b/toolkit/editor/editor/tools/rotatetool.h
@@ -27,9 +27,9 @@ class RotateTool : public ToolInterface
 {
 public:
     /// Call before Update
-    void Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
+    void Render(Presentation::Modules::Viewport* viewport) override;
     /// Call after render
-    void Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
+    void Update(Presentation::Modules::Viewport* viewport) override;
     
     bool IsModifying() const override;
 
diff --git a/toolkit/editor/editor/tools/scaletool.cc b/toolkit/editor/editor/tools/scaletool.cc
@@ -34,7 +34,7 @@ namespace Tools
 /**
 */
 void
-ScaleTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+ScaleTool::Update(Presentation::Modules::Viewport* viewport)
 {
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
     Ptr<Input::Keyboard> keyboard = Input::InputServer::Instance()->GetDefaultKeyboard();
@@ -47,15 +47,15 @@ ScaleTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPort
 
     if (mouse->ButtonUp(Input::MouseButton::Code::LeftButton))
     {
-        Tools::SelectionContext::PerformPicking(viewPortPosition, viewPortSize, camera);
+        Tools::SelectionContext::PerformPicking(viewport->lastViewportImagePosition, viewport->lastViewportImageSize, &viewport->camera);
     }
 }
 
 //------------------------------------------------------------------------------
 /**
 */
 void
-ScaleTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+ScaleTool::Render(Presentation::Modules::Viewport* viewport)
 {
     SelectionContext::ValidateSelection();
 
@@ -66,7 +66,7 @@ ScaleTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPort
 
     Game::World* defaultWorld = Game::GetWorld(WORLD_DEFAULT);
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
-    Im3d::Im3dContext::SetViewportRect(viewPortPosition, viewPortSize);
+    Im3d::Im3dContext::SetViewportRect(viewport->lastViewportImagePosition, viewport->lastViewportImageSize);
 
     if (!this->translation.isDirty)
     {
diff --git a/toolkit/editor/editor/tools/scaletool.h b/toolkit/editor/editor/tools/scaletool.h
@@ -27,9 +27,9 @@ class ScaleTool : public ToolInterface
 {
 public:
     /// Call before Update
-    void Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
+    void Render(Presentation::Modules::Viewport* viewport) override;
     /// Call after render
-    void Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
+    void Update(Presentation::Modules::Viewport* viewport) override;
     
     bool IsModifying() const override;
 
diff --git a/toolkit/editor/editor/tools/selectiontool.cc b/toolkit/editor/editor/tools/selectiontool.cc
@@ -32,7 +32,7 @@ namespace Tools
 /**
 */
 void
-SelectionTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+SelectionTool::Update(Presentation::Modules::Viewport* viewport)
 {
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
     Ptr<Input::Keyboard> keyboard = Input::InputServer::Instance()->GetDefaultKeyboard();
@@ -45,15 +45,15 @@ SelectionTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& view
 
     if (mouse->ButtonUp(Input::MouseButton::Code::LeftButton))
     {
-        Tools::SelectionContext::PerformPicking(viewPortPosition, viewPortSize, camera);
+        Tools::SelectionContext::PerformPicking(viewport->lastViewportImagePosition, viewport->lastViewportImageSize, &viewport->camera);
     }
 }
 
 //------------------------------------------------------------------------------
 /**
 */
 void
-SelectionTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+SelectionTool::Render(Presentation::Modules::Viewport* viewport)
 {
     SelectionContext::ValidateSelection();
 
@@ -64,7 +64,7 @@ SelectionTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& view
 
     Game::World* defaultWorld = Game::GetWorld(WORLD_DEFAULT);
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
-    Im3d::Im3dContext::SetViewportRect(viewPortPosition, viewPortSize);
+    Im3d::Im3dContext::SetViewportRect(viewport->lastViewportImagePosition, viewport->lastViewportImageSize);
 
     Ptr<Input::Keyboard> keyboard = Input::InputServer::Instance()->GetDefaultKeyboard();
 
@@ -93,17 +93,17 @@ SelectionTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& view
     }
 
     Math::vec2 mousePos = mouse->GetScreenPosition();
-    mousePos -= viewPortPosition;
-    mousePos = { mousePos.x / viewPortSize.x, mousePos.y / viewPortSize.y };
+    mousePos -= viewport->lastViewportImagePosition;
+    mousePos = { mousePos.x / viewport->lastViewportImageSize.x, mousePos.y / viewport->lastViewportImageSize.y };
 
-    Math::mat4 const camTransform = Math::inverse(camera->GetViewTransform());
-    Math::mat4 const invProj = Math::inverse(camera->GetProjectionTransform());
+    Math::mat4 const camTransform = Math::inverse(viewport->camera.GetViewTransform());
+    Math::mat4 const invProj = Math::inverse(viewport->camera.GetProjectionTransform());
 
     Math::line ray = RenderUtil::MouseRayUtil::ComputeWorldMouseRay(mousePos, 10000, camTransform, invProj, 0.01f);
 
     if (this->translation.dragTimer.Running() && !this->translation.isDirty)
     {
-        this->translation.originEntity = SelectionContext::GetSelectedEntityUnderMouse(viewPortPosition, viewPortSize, camera);
+        this->translation.originEntity = SelectionContext::GetSelectedEntityUnderMouse(viewport->lastViewportImagePosition, viewport->lastViewportImageSize, &viewport->camera);
         if (this->translation.originEntity == Editor::Entity::Invalid())
         {
             // failed to find entity. Cancel translation attempt
diff --git a/toolkit/editor/editor/tools/selectiontool.h b/toolkit/editor/editor/tools/selectiontool.h
@@ -21,9 +21,9 @@ class SelectionTool : public ToolInterface
 {
 public:
     /// Call before Update
-    void Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
+    void Render(Presentation::Modules::Viewport* viewport) override;
     /// Call after render
-    void Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
+    void Update(Presentation::Modules::Viewport* viewport) override;
     
     bool IsModifying() const override;
 
diff --git a/toolkit/editor/editor/tools/toolinterface.h b/toolkit/editor/editor/tools/toolinterface.h
@@ -8,6 +8,8 @@
 */
 //------------------------------------------------------------------------------
 #include "editor/editor.h"
+#include "editor/ui/modules/viewport.h"
+
 
 namespace Editor
 {
@@ -21,9 +23,9 @@ class ToolInterface
 {
 public:
     /// Call before Update
-    virtual void Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) = 0;
+    virtual void Render(Presentation::Modules::Viewport* viewport) = 0;
     /// Call after render.
-    virtual void Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) = 0;
+    virtual void Update(Presentation::Modules::Viewport* viewport) = 0;
     /// Override to return true if the tool is currently modifying something (transforming, etc.)
     virtual bool IsModifying() const = 0;
     /// Override to abort any active actions
diff --git a/toolkit/editor/editor/tools/translatetool.cc b/toolkit/editor/editor/tools/translatetool.cc
@@ -34,7 +34,7 @@ namespace Tools
 /**
 */
 void
-TranslateTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+TranslateTool::Update(Presentation::Modules::Viewport* viewport)
 {
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
     Ptr<Input::Keyboard> keyboard = Input::InputServer::Instance()->GetDefaultKeyboard();
@@ -47,15 +47,15 @@ TranslateTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& view
 
     if (mouse->ButtonUp(Input::MouseButton::Code::LeftButton))
     {
-        Tools::SelectionContext::PerformPicking(viewPortPosition, viewPortSize, camera);
+        Tools::SelectionContext::PerformPicking(viewport->lastViewportImagePosition, viewport->lastViewportImageSize, &viewport->camera);
     }
 }
 
 //------------------------------------------------------------------------------
 /**
 */
 void
-TranslateTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)
+TranslateTool::Render(Presentation::Modules::Viewport* viewport)
 {
     SelectionContext::ValidateSelection();
 
@@ -66,7 +66,7 @@ TranslateTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& view
 
     Game::World* defaultWorld = Game::GetWorld(WORLD_DEFAULT);
     Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();
-    Im3d::Im3dContext::SetViewportRect(viewPortPosition, viewPortSize);
+    Im3d::Im3dContext::SetViewportRect(viewport->lastViewportImagePosition, viewport->lastViewportImageSize);
    
     if (!this->translation.isDirty)
     {
diff --git a/toolkit/editor/editor/tools/translatetool.h b/toolkit/editor/editor/tools/translatetool.h
@@ -27,10 +27,10 @@ class TranslateTool : public ToolInterface
 {
 public:
     /// Call before Update
-    void Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
+    void Render(Presentation::Modules::Viewport* viewport) override;
     /// Call after render
-    void Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera) override;
-    
+    void Update(Presentation::Modules::Viewport* viewport) override;
+
     bool IsModifying() const override;
 
     void Abort() override;
diff --git a/toolkit/editor/editor/ui/modules/viewport.cc b/toolkit/editor/editor/ui/modules/viewport.cc
@@ -221,6 +221,8 @@ Viewport::Render()
 
     ImVec2 imagePosition = { cursorPos.x + windowPos.x, cursorPos.y + windowPos.y };
     
+    this->lastViewportImagePositionAbsolute = { imagePosition.x, imagePosition.y };
+    this->lastViewportImageSizeAbsolute = { imageSize.x, imageSize.y };
     this->lastViewportImagePosition = { imagePosition.x / dims.width, imagePosition.y / dims.height };
     this->lastViewportImageSize = { imageSize.x / dims.width, imageSize.y / dims.height };
 
diff --git a/toolkit/editor/editor/ui/modules/viewport.h b/toolkit/editor/editor/ui/modules/viewport.h
@@ -51,6 +51,8 @@ class Viewport
     const Ptr<Graphics::View> GetView() const;
 
     Editor::Camera camera;
+    Math::vec2 lastViewportImagePositionAbsolute;
+    Math::vec2 lastViewportImageSizeAbsolute;
     /// the latest actual position of the viewport. This is in normalized space (0...1)
     Math::vec2 lastViewportImagePosition;
     /// the latest actual size of the viewport. This is in normalized space (0...1)
diff --git a/toolkit/editor/editor/ui/windows/scene.cc b/toolkit/editor/editor/ui/windows/scene.cc
@@ -14,13 +14,15 @@
 #include "basegamefeature/components/position.h"
 #include "graphicsfeature/components/model.h"
 #include "graphicsfeature/components/lighting.h"
+#include "graphicsfeature/components/terrain.h"
 #include "models/modelcontext.h"
 #include "dynui/im3d/im3dcontext.h"
 
 #include "editor/tools/selectiontool.h"
 #include "editor/tools/translatetool.h"
 #include "editor/tools/rotatetool.h"
 #include "editor/tools/scaletool.h"
+#include "editor/ui/windows/terraineditor/terraineditor.h"
 
 #include "input/keyboard.h"
 #include "input/mouse.h"
@@ -41,6 +43,7 @@ Scene::Scene()
     allTools[1] = new Tools::TranslateTool();
     allTools[2] = new Tools::RotateTool();
     allTools[3] = new Tools::ScaleTool();
+    allTools[4] = new Tools::TerrainEditorTool();
 
     currentTool = allTools[0];
 
@@ -66,6 +69,7 @@ Scene::~Scene()
     delete allTools[1];
     delete allTools[2];
     delete allTools[3];
+    delete allTools[4];
     currentTool = nullptr;
 }
 
@@ -92,7 +96,7 @@ Scene::Run(SaveMode save)
     if (this->currentTool != nullptr)
     {
         this->currentTool->Render(
-            this->viewPort.lastViewportImagePosition, this->viewPort.lastViewportImageSize, &this->viewPort.camera
+            &this->viewPort
         );
     }
 
@@ -103,7 +107,7 @@ Scene::Run(SaveMode save)
         if (this->currentTool != nullptr)
         {
             this->currentTool->Update(
-                this->viewPort.lastViewportImagePosition, this->viewPort.lastViewportImageSize, &this->viewPort.camera
+                &this->viewPort
             );
 
             if (!this->currentTool->IsModifying() && keyboard->KeyDown(Input::Key::Escape))
@@ -128,6 +132,17 @@ Scene::Run(SaveMode save)
             this->currentTool = this->allTools[TOOL_SCALE];
         }
     }
+
+    auto const& selection = Tools::SelectionContext::Selection();
+    for (auto const editorEntity : selection)
+    {
+        Game::Entity const gameEntity = Editor::state.editables[editorEntity.index].gameEntity;
+        Game::World* defaultWorld = Game::GetWorld(gameEntity.world);
+        if (defaultWorld->HasComponent<GraphicsFeature::Terrain>(gameEntity))
+        {
+            this->currentTool = this->allTools[TOOL_TERRAIN];
+        }
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -179,6 +194,9 @@ Scene::DrawOutlines()
                 Im3d::Im3dContext::DrawOrientedBox(Math::mat4::identity, bbox, {1.0f, 0.30f, 0.0f, 1.0f});
             }
         }
+        else if (defaultWorld->HasComponent<GraphicsFeature::Terrain>(gameEntity))
+        {
+        }
         else
         {
             Math::vec3 location = defaultWorld->GetComponent<Game::Position>(gameEntity);
diff --git a/toolkit/editor/editor/ui/windows/scene.h b/toolkit/editor/editor/ui/windows/scene.h
@@ -41,7 +41,8 @@ class Scene : public BaseWindow
         TOOL_SELECTION,
         TOOL_TRANSLATE,
         TOOL_ROTATE,
-        TOOL_SCALE
+        TOOL_SCALE,
+        TOOL_TERRAIN
     };
 
     void SetTool(ToolType type);
@@ -50,7 +51,7 @@ class Scene : public BaseWindow
 
     Tools::ToolInterface* currentTool;
 
-    Tools::ToolInterface* allTools[4];
+    Tools::ToolInterface* allTools[5];
 };
 
 __RegisterClass(Scene)
diff --git a/toolkit/editor/editor/ui/windows/terraineditor/terraineditor.cc b/toolkit/editor/editor/ui/windows/terraineditor/terraineditor.cc
diff --git a/toolkit/editor/editor/ui/windows/terraineditor/terraineditor.h b/toolkit/editor/editor/ui/windows/terraineditor/terraineditor.h

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ namespace Tools`
`34`	`34`	`/**`
`35`	`35`	`*/`
`36`	`36`	`void`
`37`		`-RotateTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)`
	`37`	`+RotateTool::Update(Presentation::Modules::Viewport* viewport)`
`38`	`38`	`{`
`39`	`39`	`Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();`
`40`	`40`	`Ptr<Input::Keyboard> keyboard = Input::InputServer::Instance()->GetDefaultKeyboard();`
`@@ -47,15 +47,15 @@ RotateTool::Update(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPor`
`47`	`47`
`48`	`48`	`if (mouse->ButtonUp(Input::MouseButton::Code::LeftButton))`
`49`	`49`	`{`
`50`		`- Tools::SelectionContext::PerformPicking(viewPortPosition, viewPortSize, camera);`
	`50`	`+ Tools::SelectionContext::PerformPicking(viewport->lastViewportImagePosition, viewport->lastViewportImageSize, &viewport->camera);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`//------------------------------------------------------------------------------`
`55`	`55`	`/**`
`56`	`56`	`*/`
`57`	`57`	`void`
`58`		`-RotateTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPortSize, Editor::Camera const* camera)`
	`58`	`+RotateTool::Render(Presentation::Modules::Viewport* viewport)`
`59`	`59`	`{`
`60`	`60`	`SelectionContext::ValidateSelection();`
`61`	`61`
`@@ -66,7 +66,7 @@ RotateTool::Render(Math::vec2 const& viewPortPosition, Math::vec2 const& viewPor`
`66`	`66`
`67`	`67`	`Game::World* defaultWorld = Game::GetWorld(WORLD_DEFAULT);`
`68`	`68`	`Ptr<Input::Mouse> mouse = Input::InputServer::Instance()->GetDefaultMouse();`
`69`		`- Im3d::Im3dContext::SetViewportRect(viewPortPosition, viewPortSize);`
	`69`	`+ Im3d::Im3dContext::SetViewportRect(viewport->lastViewportImagePosition, viewport->lastViewportImageSize);`
`70`	`70`
`71`	`71`	`if (!this->translation.isDirty)`
`72`	`72`	`{`