fix: arrow handles

core/src/datatypes/cframe.cpp

@@ -10,6 +10,7 @@
 // #include "meta.h" // IWYU pragma: keep
 
 const Data::CFrame Data::CFrame::IDENTITY(glm::vec3(0, 0, 0), glm::mat3(1.f));
+ const Data::CFrame Data::CFrame::YToZ(glm::vec3(0, 0, 0), glm::mat3(glm::vec3(1, 0, 0), glm::vec3(0, 0, 1), glm::vec3(0, 1, 0)));
 
 Data::CFrame::CFrame(float x, float y, float z, float R00, float R01, float R02, float R10, float R11, float R12, float R20, float R21, float R22)
     : translation(x, y, z)

core/src/datatypes/cframe.h

@@ -31,6 +31,7 @@ namespace Data {
         ~CFrame();
 
         static const CFrame IDENTITY;
+        static const CFrame YToZ;
 
         virtual const TypeInfo& GetType() const override;
         static const TypeInfo TYPE;

core/src/objects/handles.cpp

@@ -67,8 +67,9 @@ std::optional<HandleFace> Handles::RaycastHandle(rp3d::Ray ray) {
     for (HandleFace face : HandleFace::Faces) {
         Data::CFrame cframe = GetCFrameOfHandle(face);
         // Implement manual detection via boxes instead of... this shit
-        rp3d::RigidBody* body = world->createRigidBody(cframe);
-        body->addCollider(common.createBoxShape(Data::Vector3(.5, .5, .5)), rp3d::Transform::identity());
+        // This code also hardly works, and is not good at all... Hooo nope.
+        rp3d::RigidBody* body = world->createRigidBody(Data::CFrame::IDENTITY + cframe.Position());
+        body->addCollider(common.createBoxShape(cframe.Rotation() * Data::Vector3(HandleSize(face) / 2.f)), rp3d::Transform::identity());
 
         rp3d::RaycastInfo info;
         if (body->raycast(ray, info)) {
@@ -80,4 +81,10 @@ std::optional<HandleFace> Handles::RaycastHandle(rp3d::Ray ray) {
     }
 
     return std::nullopt;
+}
+
+Data::Vector3 Handles::HandleSize(HandleFace face) {
+    if (handlesType == HandlesType::MoveHandles)
+        return glm::vec3(0.5f, 0.5f, 2.f);
+    return glm::vec3(1,1,1);
 }

core/src/objects/handles.h

@@ -24,12 +24,20 @@ class HandleFace {
     static std::array<HandleFace, 6> Faces;
 };
 
+enum HandlesType {
+    MoveHandles,
+    ScaleHandles,
+    RotateHandles,
+};
+
 class Handles : public Instance {
 public:
     const static InstanceType TYPE;
 
     bool active;
     std::optional<std::weak_ptr<Part>> adornee;
+    HandlesType handlesType;
+
     // inline std::optional<std::weak_ptr<Part>> GetAdornee() { return adornee; }
     // inline void SetAdornee(std::optional<std::weak_ptr<Part>> newAdornee) { this->adornee = newAdornee; updateAdornee(); };
 
@@ -39,6 +47,7 @@ public:
     bool worldMode = false;
     Data::CFrame GetCFrameOfHandle(HandleFace face);
     Data::CFrame PartCFrameFromHandlePos(HandleFace face, Data::Vector3 newPos);
+    Data::Vector3 HandleSize(HandleFace face);
     std::optional<HandleFace> RaycastHandle(rp3d::Ray ray);
 
     static inline std::shared_ptr<Handles> New() { return std::make_shared<Handles>(); };

core/src/rendering/renderer.cpp

@@ -177,7 +177,7 @@ void renderHandles() {
 
     for (auto face : HandleFace::Faces) {
         glm::mat4 model = editorToolHandles->GetCFrameOfHandle(face);
-        model = glm::scale(model, glm::vec3(1,1,1));
+        model = glm::scale(model, (glm::vec3)editorToolHandles->HandleSize(face));
         handleShader->set("model", model);
         handleShader->set("material", Material {
             .diffuse = glm::abs(face.normal),
@@ -187,8 +187,13 @@ void renderHandles() {
         glm::mat3 normalMatrix = glm::mat3(glm::transpose(glm::inverse(model)));
         handleShader->set("normalMatrix", normalMatrix);
 
-        ARROW_MESH->bind();
-        glDrawArrays(GL_TRIANGLES, 0, ARROW_MESH->vertexCount);
+        if (editorToolHandles->handlesType == HandlesType::MoveHandles) {
+            ARROW_MESH->bind();
+            glDrawArrays(GL_TRIANGLES, 0, ARROW_MESH->vertexCount);
+        } else {
+            SPHERE_MESH->bind();
+            glDrawArrays(GL_TRIANGLES, 0, SPHERE_MESH->vertexCount);
+        }
     }
 
     // 2d square overlay

editor/mainwindow.cpp

@@ -17,6 +17,7 @@
 #include "editorcommon.h"
 #include "objects/base/instance.h"
 #include "objects/datamodel.h"
+#include "objects/handles.h"
 #include "physics/simulation.h"
 #include "objects/part.h"
 #include "qfiledialog.h"
@@ -167,6 +168,11 @@ void MainWindow::updateToolbars() {
     if (selectedTool == SelectedTool::MOVE) editorToolHandles->worldMode = true;
     if (selectedTool == SelectedTool::SCALE) editorToolHandles->worldMode = false;
     editorToolHandles->active = selectedTool != SelectedTool::SELECT;
+    editorToolHandles->handlesType =
+      selectedTool == SelectedTool::MOVE ? HandlesType::MoveHandles
+    : selectedTool == SelectedTool::SCALE ? HandlesType::ScaleHandles
+    : selectedTool == SelectedTool::ROTATE ? HandlesType::RotateHandles
+    : HandlesType::ScaleHandles;
 }
 
 MainWindow::~MainWindow()