Changeset 13478

Timestamp:

12/17/15 20:06:23 (9 years ago)

Author:

gkronber

Message:

#1966 fixed rotation and zooming for 3d packings

File:

• branches/HeuristicLab.BinPacking/PackingPlanVisualizations/3D/PackingGame.cs (modified) (5 diffs)

branches/HeuristicLab.BinPacking/PackingPlanVisualizations/3D/PackingGame.cs

@@ -21 +21 @@
 
 using System;
+using System.Drawing.Printing;
 using SharpDX;
 using SharpDX.Direct3D11;
@@ -198 +199 @@
 
       worldMatrix =
-        Matrix.RotationY(MathUtil.DegreesToRadians(-currentViewAngle.X / 4)) *
-        Matrix.RotationX(MathUtil.DegreesToRadians(currentViewAngle.Y / 4));
+        Matrix.RotationY(MathUtil.DegreesToRadians(-currentViewAngle.X * control.Width / 4)) *
+        Matrix.RotationX(MathUtil.DegreesToRadians(currentViewAngle.Y * control.Height / 4));
       basicEffect.World = worldMatrix;
 
@@ -231 +232 @@
     }
 
-
-
-
-
-
     protected override void Update(GameTime gameTime) {
       computeMouseHandling();
@@ -255 +251 @@
     }
     private void computeLeftMouseBtnHandling(MouseState mouseState) {
-      //Left btn released
-      //if (mouseState.LeftButton.Released && mouseState.LeftButton.Equals(previousMouseState.LeftButton)) {
-      //  //Console.WriteLine("Released");
-      //} else
-
       //Left btn pressed
-
-      if (mouseState.LeftButton.Pressed && mouseState.LeftButton.Equals(previousMouseState.LeftButton)) {
+      if (mouseState.LeftButton.Down && (previousMouseState.LeftButton.Pressed || previousMouseState.LeftButton.Down)) {
         currentViewAngle = new Vector2(
           viewAngleOnBtnRelease.X + mouseState.X - mousePositionOnBtnDown.X,
           viewAngleOnBtnRelease.Y + mouseState.Y - mousePositionOnBtnDown.Y);
-
       }
 
       //Left btn freshly pressed ==> ONLICK-EVENT
-      else if (mouseState.LeftButton.Pressed && !previousMouseState.LeftButton.Pressed) {
-        //Console.WriteLine("OnClick");
-        //PackingPlan3D native = (PackingPlan3D)Window.NativeWindow;
-        //Console.WriteLine("Window: " + Window.ClientBounds.ToString());
-        //Console.WriteLine("native: " + native.ClientSize.ToString());
-        //Console.WriteLine("native.parent: " + native.Parent.ClientSize.ToString());
-        //
-        //Console.WriteLine(native.ParentForm.ToString());
-        //Console.WriteLine(Window.Name);
-        //Console.WriteLine(this.IsActive);
+      else if (mouseState.LeftButton.Pressed && !(previousMouseState.LeftButton.Pressed || previousMouseState.LeftButton.Down)) {
         mousePositionOnBtnDown = new Vector2(mouseState.X, mouseState.Y);
       }
@@ -285 +265 @@
       //Left btn freshly released ==> ONRELEASE-EVENT
       else if (mouseState.LeftButton.Released && !previousMouseState.LeftButton.Released) {
-        //Console.WriteLine("OnRelease");
         viewAngleOnBtnRelease = currentViewAngle;
       }
     }
     private void computeMouseWheelHandling(MouseState mouseState) {
-      int prev = previousMouseState.WheelDelta;
       int curr = mouseState.WheelDelta;
-      if (curr < prev && zoom > 1) {
+      if (curr < 0 && zoom > 1) {
         zoom++;
-        //Console.WriteLine(zoom);
-      } else if (curr > prev && zoom < 300) {
+      } else if (curr > 0 && zoom < 300) {
         zoom--;
-        //Console.WriteLine(zoom);
       }
     }