Changeset 13161 for branches/HeuristicLab.BinPacking/PackingPlanVisualizations/3D

Timestamp:

11/15/15 13:56:30 (8 years ago)

Author:

gkronber

Message:

#1966: removed SharpDX binaries since these are available through a transport plugin now (see #2504) and also made some changes to make the code work with the latest stable release of SharpDX

File:

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

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

@@ -22 +22 @@
 using System;
 using SharpDX;
-using SharpDX.Toolkit;     
+using SharpDX.Direct3D11;
+using SharpDX.Toolkit;
 using SharpDX.Toolkit.Graphics;
 using SharpDX.Toolkit.Input;
 
 using ButtonStateDX = SharpDX.Toolkit.Input.ButtonState;
-using SharpDX.Direct3D11;
+
 
 namespace PackingPlanVisualizations {
@@ -33 +34 @@
 
 
-    #region Global Private Variables   
+    #region Global Private Variables
     private GraphicsDeviceManager graphicsDeviceManager;
     private PackingPlan3D control;
@@ -42 +43 @@
     private int selectedItemIndex = -1;
 
-    private BasicEffect basicEffect;      
+    private BasicEffect basicEffect;
     private Color backgroundColor { get; set; }
 
-    private CenteredContainer container;   
+    private CenteredContainer container;
     private MouseManager Mouse;
-    #endregion Global Private Variables     
+    #endregion Global Private Variables
 
     protected override void Dispose(bool disposeManagedResources) {
@@ -58 +59 @@
     public PackingGame(PackingPlan3D control)
       : base() {
-        this.control = control;
+      this.control = control;
       graphicsDeviceManager = new GraphicsDeviceManager(this);
       graphicsDeviceManager.PreferMultiSampling = true;
-      graphicsDeviceManager.PreparingDeviceSettings += 
-        (object sender, PreparingDeviceSettingsEventArgs e) => {           
+      graphicsDeviceManager.PreparingDeviceSettings +=
+        (object sender, PreparingDeviceSettingsEventArgs e) => {
           e.GraphicsDeviceInformation.PresentationParameters.MultiSampleCount = MSAALevel.X4;
           return;
         };
       var controlColor = Color.White;//System.Drawing.SystemColors.Control;
-      backgroundColor = new Color (controlColor.R,controlColor.G, controlColor.B, controlColor.A);
+      backgroundColor = new Color(controlColor.R, controlColor.G, controlColor.B, controlColor.A);
 
       Mouse = new MouseManager(this);
@@ -135 +136 @@
       //Primitive color
       basicEffect.AmbientLightColor = new Vector3(0.1f, 0.1f, 0.1f);
-      basicEffect.DiffuseColor = new Vector3(1.0f, 1.0f, 1.0f);
+      basicEffect.DiffuseColor = new Vector4(1.0f, 1.0f, 1.0f, 1.0f);
       basicEffect.SpecularColor = new Vector3(0.25f, 0.25f, 0.25f);
       basicEffect.SpecularPower = 5.0f;
@@ -204 +205 @@
       GraphicsDevice.Clear(backgroundColor);
 
-      worldMatrix = 
+      worldMatrix =
         Matrix.RotationY(MathUtil.DegreesToRadians(-currentViewAngle.X / 4)) *
         Matrix.RotationX(MathUtil.DegreesToRadians(currentViewAngle.Y / 4));
@@ -229 +230 @@
                 item.RenderShapeTriangles(GraphicsDevice);
               } else
-                item.RenderShapeLines(GraphicsDevice, new Color(0,0,0));
+                item.RenderShapeLines(GraphicsDevice, new Color(0, 0, 0));
             }
           }
@@ -235 +236 @@
       }
 
-      base.Draw(gameTime);        
+      base.Draw(gameTime);
     }
 
@@ -244 +245 @@
 
     protected override void Update(GameTime gameTime) {
-      computeMouseHandling();                                      
+      computeMouseHandling();
       base.Update(gameTime);
     }
@@ -263 +264 @@
     private void computeLeftMouseBtnHandling(MouseState mouseState) {
       //Left btn released
-      if (mouseState.Left.Equals(ButtonStateDX.Released) && mouseState.Left.Equals(previousMouseState.Left)) {
+      if (mouseState.LeftButton.Released && mouseState.LeftButton.Equals(previousMouseState.LeftButton)) {
         //Console.WriteLine("Released");
       }
 
       //Left btn pressed
-      else if (mouseState.Left.Equals(ButtonStateDX.Pressed) && mouseState.Left.Equals(previousMouseState.Left)) {
+      else if (mouseState.LeftButton.Pressed && mouseState.LeftButton.Equals(previousMouseState.LeftButton)) {
         currentViewAngle = new Vector2(
           viewAngleOnBtnRelease.X + mouseState.X - mousePositionOnBtnDown.X,
@@ -279 +280 @@
 
       //Left btn freshly pressed ==> ONLICK-EVENT
-      else if (mouseState.Left.Equals(ButtonStateDX.Pressed) && !previousMouseState.Left.Equals(ButtonStateDX.Pressed)) {
+      else if (mouseState.LeftButton.Pressed && !previousMouseState.LeftButton.Pressed) {
         Console.WriteLine("OnClick");
         PackingPlan3D native = (PackingPlan3D)Window.NativeWindow;
@@ -293 +294 @@
 
       //Left btn freshly released ==> ONRELEASE-EVENT
-      else if (mouseState.Left.Equals(ButtonStateDX.Released) && !previousMouseState.Left.Equals(ButtonStateDX.Released)) {
+      else if (mouseState.LeftButton.Released && !previousMouseState.LeftButton.Released) {
         Console.WriteLine("OnRelease");
         viewAngleOnBtnRelease = currentViewAngle;