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(distSetOverrideMaterial(mi); axis[size_t(AXIS::X)].cone->SetOverrideMaterial(mi); std::cout<<"Mouse: "<