From 6b8682375508cd5fb87a8b01b10a89794a076f4d Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Mon, 28 Jul 2025 13:28:05 +0800
Subject: [PATCH] =?UTF-8?q?[OK]=20=E5=B7=B2=E8=AF=81=E6=98=8E=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84Ray::ToLineSegmentDistance=E5=87=BD=E6=95=B0=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=EF=BC=8C=E6=B5=8B=E8=AF=95=E6=88=90=E5=8A=9F=E3=80=82?=
 =?UTF-8?q?=E4=BD=86=E5=9B=A0=E4=B8=BA=E6=B2=A1=E6=9C=89=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?RENDER=20LIST=E6=9B=B4=E6=96=B0AssignBuffer=E6=89=80=E4=BB=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=87=BA=E6=9D=A5=E6=95=88=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMSceneGraph                  |  2 +-
 example/Gizmo/Gizmo3DMove.cpp | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CMSceneGraph b/CMSceneGraph
index fde1c85a..65cefb3f 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit fde1c85ad1437123d89971df6ec43e9683e52acc
+Subproject commit 65cefb3f129e244a938b281f0b1cbd7170dfbd4f
diff --git a/example/Gizmo/Gizmo3DMove.cpp b/example/Gizmo/Gizmo3DMove.cpp
index 1f3bc261..b5ab77b2 100644
--- a/example/Gizmo/Gizmo3DMove.cpp
+++ b/example/Gizmo/Gizmo3DMove.cpp
@@ -202,21 +202,26 @@ namespace
             {
                 end=TransformPosition(l2w,Vector3f(GIZMO_CYLINDER_HALF_LENGTH*20,0,0));
 
-                cross_point=ray.ClosestPoint(start);
+                dist=ray.ToLineSegmentDistance(start,end);
 
-                dist=length(cross_point,start);
+                MaterialInstance *mi;
 
-                //dist=ray.ToLineSegmentDistance(start,end);
+                if(dist<GIZMO_CYLINDER_RADIUS*10)
+                {
+                    mi=GetGizmoMI3D(GizmoColor::Yellow);
+                }
+                else
+                {
+                    mi=GetGizmoMI3D(GizmoColor::Red);
+                }
 
-                //dist=ray.ToPointDistance(start);
-
-                MaterialInstance *mi=GetGizmoMI3D(dist<GIZMO_CYLINDER_RADIUS*100?GizmoColor::Yellow:GizmoColor::Red);
+                //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<<"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;