Merge pull request #34 from ABTSoftware/SciChart_v8_Dev

Merged recent fixed from the v8 Dev branch

Author: joerirg

Sandbox/CustomerExamples/3DScatterChart_DragPointModifier/DragPointYAxisModifier3D.cs

@@ -50,37 +50,28 @@ private Vector3 GetCoordVector(Vector3D pointVector)
 
         private double GetYDrag(Point endPoint, Vector3 coordVector)
         {
-            // 1.Create a plane at the highlighted point using its position and camera forward vector
-            // 2.Calculate a ray using the camera and mouse x,y position
-            // 3.Intersect the ray with the plane giving a point in world space
-
-            // Repeat 1,2,3 using the start point and actual mouse point
-            // Calculate the Y delta using 2 positions in world space
-
             if (Viewport3D == null || coordVector == null) return double.NaN;
 
+            // Project 3D point to screen, cast a ray through that screen pixel,
+            // find where the ray intersects a plane perpendicular to the camera
+            // passing through the original 3D point, and return the Y of that intersection.
             var camera = Viewport3D.GetWorld().GetMainCamera();
-            var pointPlane = new TSRPlane(camera.m_Fwd, coordVector);
-
             var rayStart = new TSRVector3();
             var rayDirection = new TSRVector3();
             var rayEnd = new TSRVector3();
-
             var viewport = new TSRViewPort
             {
                 Width = Convert.ToUInt32(Viewport3D.ViewportSize.Width),
                 Height = Convert.ToUInt32(Viewport3D.ViewportSize.Height)
             };
 
-            int iScreenX = 0;
-            int iScreenY = 0;
-            float fDepth = 0.0f;
-            camera.TransformIntoScreenCoords(viewport, coordVector, out iScreenX, out iScreenY, out fDepth);
-            camera.ComputeRay(viewport, (int)iScreenX, (int)endPoint.Y, rayStart, rayDirection);
+            camera.TransformIntoScreenCoords(viewport, coordVector, out var screenX, out var screenY, out var depth);
+            camera.ComputeRay(viewport, (int)screenX, (int)endPoint.Y, rayStart, rayDirection);
             rayEnd.x = rayStart.x + rayDirection.x;
             rayEnd.y = rayStart.y + rayDirection.y;
             rayEnd.z = rayStart.z + rayDirection.z;
 
+            var pointPlane = new TSRPlane(camera.m_Fwd, coordVector);
             var endVector = pointPlane.Split(rayStart, rayEnd);
             return endVector.y;
         }

Sandbox/CustomerExamples/3DScatterChart_DragPointModifier/MainWindow.xaml

@@ -57,8 +57,8 @@
                 <s3D:ModifierGroup3D>
                     <s3D:MouseWheelZoomModifier3D />
                     <s3D:OrbitModifier3D ExecuteOn="MouseRightButton" />
-                    <local:TestWorldScreenCoordModifier3D/>
-                    <local:DragPointYAxisModifier3D PointDragStart="OnPointDragStart"
+                    <local:DragPointYAxisModifier3D ExecuteWhen="Ctrl"
+                                                    PointDragStart="OnPointDragStart"
                                                     PointDragDelta="OnPointDragDelta"
                                                     PointDragEnd="OnPointDragEnd"/>
 
@@ -75,7 +75,7 @@
 
             <TextBlock Foreground="Gray"
                        Margin="0,5"
-                       Text="SHIFT+LMB to test world-screen coords transformation (see Output in Debug mode)"/>
+                       Text="RMB+Drag to rotate the chart around"/>
         </StackPanel>
 
         <TextBlock x:Name="pointInfo"