Add coordinate system and viewcube into ViewportCore

alex4omnicon · Dec 28, 2018 · 26b9efb · 26b9efb
1 parent ace5fce
commit 26b9efb
Show file tree

Hide file tree

Showing 4 changed files with 481 additions and 273 deletions.
diff --git a/Source/Examples/SharpDX.Core/CoreTest/CoreTestApp.cs b/Source/Examples/SharpDX.Core/CoreTest/CoreTestApp.cs
@@ -71,6 +71,7 @@ public CoreTestApp(Form window)
             viewport.StartRendering += Viewport_OnStartRendering;
             viewport.StopRendering += Viewport_OnStopRendering;
             viewport.ErrorOccurred += Viewport_OnErrorOccurred;
+            viewport.CoordinateSystemLabelColor = new Color4(1, 1, 0, 1);
             options.Viewport = viewport;
             AssignViewportOption();
             InitializeScene();
@@ -170,8 +171,6 @@ private void InitializeScene()
             groupSphere.AddChildNode(groupPoints);
             groupSphere.AddChildNode(groupLines);
 
-            var viewbox = new ViewBoxNode();
-            viewport.Items.AddChildNode(viewbox);
             var imGui = new ImGuiNode();
             viewport.Items.AddChildNode(imGui);
             imGui.UpdatingImGuiUI += ImGui_UpdatingImGuiUI;
@@ -318,6 +317,7 @@ private void Window_MouseMove(object sender, MouseEventArgs e)
             else if (!io.WantCaptureMouse)
             {
                 cameraController.MouseMove(new Vector2(e.X, e.Y));
+                viewport.MouseMove(new Vector2(e.X, e.Y));
             }
         }
 
@@ -341,6 +341,7 @@ private void Window_MouseUp(object sender, MouseEventArgs e)
                 switch (e.Button)
                 {
                     case MouseButtons.Left:
+                        viewport.MouseUp(new Vector2(e.X, e.Y));
                         break;
                     case MouseButtons.Right:
                         cameraController.EndRotate(new Vector2(e.X, e.Y));
@@ -374,6 +375,7 @@ private void Window_MouseDown(object sender, MouseEventArgs e)
                     switch (e.Button)
                     {
                         case MouseButtons.Left:
+                            viewport.MouseDown(new Vector2(e.X, e.Y));
                             break;
                         case MouseButtons.Right:
                             cameraController.StartRotate(new Vector2(e.X, e.Y));

diff --git a/Source/HelixToolkit.SharpDX.Core/Controls/CameraController.cs b/Source/HelixToolkit.SharpDX.Core/Controls/CameraController.cs
@@ -94,10 +94,22 @@ public sealed class CameraController
         /// <value> The minimum field of view. </value>
         public float MinimumFieldOfView = 10.0f;
 
+        private Vector3 modelUpDirection = Vector3.UnitY;
         /// <summary>
         /// Gets or sets the model up direction.
         /// </summary>
-        public Vector3 ModelUpDirection = new Vector3(0, 1, 0);
+        public Vector3 ModelUpDirection
+        {
+            set
+            {
+                modelUpDirection = value;
+                if (Viewport != null)
+                {
+                    Viewport.ModelUpDirection = value;
+                }
+            }
+            get => modelUpDirection;
+        }
 
         /// <summary>
         /// Gets or sets the move sensitivity.