Changeset 13497 for branches/HeuristicLab.BinPacking/PackingPlanVisualizations/3D/CuboidShapePreparations.cs

Timestamp:

01/12/16 10:42:58 (8 years ago)

Author:

gkronber

Message:

#1966: fixed various problems: bugs in cloning, bugs in persistence, method names, various minor improvements of source code for readability.

File:

• branches/HeuristicLab.BinPacking/PackingPlanVisualizations/3D/CuboidShapePreparations.cs (moved) (moved from branches/HeuristicLab.BinPacking/PackingPlanVisualizations/3D/CuboidShapePreperations.cs) (4 diffs)

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

@@ -25 +25 @@
   public class CuboidShapePreparations {
 
-    #region Private Members 
+    #region Private Members
     //Define the shape in a way so that the position is in the center of the shape.
     //Define the 8 defining points of the cube
-    Vector3 topLeftFront;
-    Vector3 bottomLeftFront;
-    Vector3 topRightFront;
-    Vector3 bottomRightFront;
-    Vector3 topLeftBack;
-    Vector3 topRightBack;
-    Vector3 bottomLeftBack;
-    Vector3 bottomRightBack;
+    private readonly Vector3 topLeftFront;
+    private readonly Vector3 bottomLeftFront;
+    private readonly Vector3 topRightFront;
+    private readonly Vector3 bottomRightFront;
+    private readonly Vector3 topLeftBack;
+    private readonly Vector3 topRightBack;
+    private readonly Vector3 bottomLeftBack;
+    private readonly Vector3 bottomRightBack;
 
     //Define normal vectors of the 6 surfaces
-    Vector3 frontNormal;
-    Vector3 backNormal;
-    Vector3 topNormal;
-    Vector3 bottomNormal;
-    Vector3 leftNormal;
-    Vector3 rightNormal;
+    private readonly Vector3 frontNormal;
+    private readonly Vector3 backNormal;
+    private readonly Vector3 topNormal;
+    private readonly Vector3 bottomNormal;
+    private readonly Vector3 leftNormal;
+    private readonly Vector3 rightNormal;
 
     //Define colors of the 6 surfaces
-    Color frontColor = Color.Black;
-    Color backColor = Color.Black;
-    Color topColor = Color.Black;
-    Color bottomColor = Color.Black;
-    Color leftColor = Color.Black;
-    Color rightColor = Color.Black;
+    private readonly Color frontColor = Color.Black;
+    private readonly Color backColor = Color.Black;
+    private readonly Color topColor = Color.Black;
+    private readonly Color bottomColor = Color.Black;
+    private readonly Color leftColor = Color.Black;
+    private readonly Color rightColor = Color.Black;
 
     #endregion Private Members
 
 
-    public CuboidShapePreparations(Vector3 shapeSize, Vector3 shapePosition) : this (shapeSize, shapePosition, Color.Black) { }
+    public CuboidShapePreparations(Vector3 shapeSize, Vector3 shapePosition) : this(shapeSize, shapePosition, Color.Black) { }
     public CuboidShapePreparations(Vector3 shapeSize, Vector3 shapePosition, Color color) {
       var halfShapeSize = shapeSize / 2;
@@ -85 +85 @@
       leftColor = color;
       rightColor = color;
-
-    }
-
-    public VertexPositionColorNormal[] CreateVertexDefinitionsForTriangles () {
+    }
+
+    public VertexPositionColorNormal[] CreateVertexDefinitionsForTriangles() {
       //Definition of the actual triangles
       VertexPositionColorNormal[] shapeVertices = new VertexPositionColorNormal[36];
@@ -160 +159 @@
     public VertexPositionColorNormal[] CreateVertexDefinitionsForEdgeLines(Color color) {
       //Definition of the actual lines
-      VertexPositionColorNormal[] shapeVertices = new VertexPositionColorNormal[48];
-
-      Vector3 topRightFrontNormal = (topNormal + rightNormal + frontNormal) / 3;
-      Vector3 topRightBackNormal = (topNormal + rightNormal + backNormal) / 3;
-      Vector3 topLeftFrontNormal = (topNormal + leftNormal + frontNormal) / 3;
-      Vector3 topLeftBackNormal = (topNormal + leftNormal + backNormal) / 3;
-      Vector3 bottomRightFrontNormal = (topNormal + rightNormal + frontNormal) / 3;
-      Vector3 bottomRightBackNormal = (topNormal + rightNormal + backNormal) / 3;
-      Vector3 bottomLeftFrontNormal = (topNormal + leftNormal + frontNormal) / 3;
-      Vector3 bottomLeftBackNormal = (topNormal + leftNormal + backNormal) / 3;
+      var shapeVertices = new VertexPositionColorNormal[48];
+
+      var topRightFrontNormal = (topNormal + rightNormal + frontNormal) / 3;
+      var topRightBackNormal = (topNormal + rightNormal + backNormal) / 3;
+      var topLeftFrontNormal = (topNormal + leftNormal + frontNormal) / 3;
+      var topLeftBackNormal = (topNormal + leftNormal + backNormal) / 3;
+      var bottomRightFrontNormal = (topNormal + rightNormal + frontNormal) / 3;
+      var bottomRightBackNormal = (topNormal + rightNormal + backNormal) / 3;
+      var bottomLeftFrontNormal = (topNormal + leftNormal + frontNormal) / 3;
+      var bottomLeftBackNormal = (topNormal + leftNormal + backNormal) / 3;
 
       shapeVertices[0] = new VertexPositionColorNormal(color, topRightFront, topRightFrontNormal);
@@ -227 +226 @@
       return shapeVertices;
     }
-
-
   }
 }