From cb93ade96fbf599fb7d5edb1fa799edc8c7f1a9d Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Mon, 28 Jul 2025 00:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=B8=BAGizmo3DMove::OnMove?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMCore                        |  2 +-
 CMSceneGraph                  |  2 +-
 example/Gizmo/Gizmo3DMove.cpp | 49 +++++++++++++++++++++++++++++++++++
 inc/hgl/graph/RenderList.h    |  2 +-
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/CMCore b/CMCore
index 0ed44f05..11838e9c 160000
--- a/CMCore
+++ b/CMCore
@@ -1 +1 @@
-Subproject commit 0ed44f05318c8163dec5353b4ba6bcf7b77ee61a
+Subproject commit 11838e9cc813395d57b6bfbc501e99b6526436c0
diff --git a/CMSceneGraph b/CMSceneGraph
index b914dbfb..fde1c85a 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit b914dbfb66a2be85b2bcf362f832eb18f44eb179
+Subproject commit fde1c85ad1437123d89971df6ec43e9683e52acc
diff --git a/example/Gizmo/Gizmo3DMove.cpp b/example/Gizmo/Gizmo3DMove.cpp
index 14f3372d..1f3bc261 100644
--- a/example/Gizmo/Gizmo3DMove.cpp
+++ b/example/Gizmo/Gizmo3DMove.cpp
@@ -26,8 +26,12 @@
 #include<hgl/graph/VKRenderResource.h>
 #include<hgl/graph/InlineGeometry.h>
 #include<hgl/graph/RenderFramework.h>
+#include<hgl/graph/Scene.h>
 #include<hgl/component/MeshComponent.h>
 #include<hgl/io/event/MouseEvent.h>
+#include<hgl/graph/Ray.h>
+
+#include<iostream>
 
 VK_NAMESPACE_BEGIN
 
@@ -175,6 +179,51 @@ namespace
 
             return(true);
         }
+
+        bool OnMove(const Vector2i &mouse_coord) override
+        {
+            CameraControl *cc=GetCameraControl();
+
+            if(!cc)
+                return(false);
+
+            Ray ray;
+
+            cc->SetMouseRay(&ray,mouse_coord);
+
+            Matrix4f l2w=GetLocalToWorldMatrix();
+            Vector3f start;
+            Vector3f end;
+            Vector3f cross_point;
+            float dist;
+
+            start=TransformPosition(l2w,Vector3f(0,0,0)); //将原点转换到世界坐标
+
+            {
+                end=TransformPosition(l2w,Vector3f(GIZMO_CYLINDER_HALF_LENGTH*20,0,0));
+
+                cross_point=ray.ClosestPoint(start);
+
+                dist=length(cross_point,start);
+
+                //dist=ray.ToLineSegmentDistance(start,end);
+
+                //dist=ray.ToPointDistance(start);
+
+                MaterialInstance *mi=GetGizmoMI3D(dist<GIZMO_CYLINDER_RADIUS*100?GizmoColor::Yellow:GizmoColor::Red);
+
+                axis[size_t(AXIS::X)].cylinder->SetOverrideMaterial(mi);
+                axis[size_t(AXIS::X)].cone->SetOverrideMaterial(mi);
+
+                std::cout<<"Mouse:    "<<mouse_coord.x<<","<<mouse_coord.y<<std::endl;
+                std::cout<<"CrossPoint: "<<cross_point.x<<","<<cross_point.y<<","<<cross_point.z<<std::endl;
+                std::cout<<"Ray(Ori): "<<ray.origin.x<<","<<ray.origin.y<<","<<ray.origin.z<<")"<<std::endl;
+                std::cout<<"Ray(Dir): "<<ray.direction.x<<","<<ray.direction.y<<","<<ray.direction.z<<")"<<std::endl;
+                std::cout<<"Distance: "<<dist<<std::endl;
+            }
+
+            return false;
+        }
     };//class GizmoMoveNode:public SceneNode
 
     static GizmoMoveNode *sn_gizmo_move=nullptr;
diff --git a/inc/hgl/graph/RenderList.h b/inc/hgl/graph/RenderList.h
index 0cd75e27..59c1c6fd 100644
--- a/inc/hgl/graph/RenderList.h
+++ b/inc/hgl/graph/RenderList.h
@@ -46,7 +46,7 @@ namespace hgl
             virtual bool Render(RenderCmdBuffer *);                                 ///<渲染所有对象
 
             virtual void UpdateLocalToWorld();                                      ///<更新所有对象的变换数据
-            virtual void UpdateMaterialInstance(MeshComponent *);             ///<有对象互换了材质实例
+            virtual void UpdateMaterialInstance(MeshComponent *);                   ///<有对象互换了材质实例
 
             virtual void Clear();                                                   ///<彻底清理
         };//class RenderList