Optimize scripts.

mogoson · Jan 24, 2018 · 6d80cc8 · 6d80cc8
1 parent a7b808e
commit 6d80cc8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/Assets/MGS-Machinery/Scripts/Hinge/CrankRocker.cs b/Assets/MGS-Machinery/Scripts/Hinge/CrankRocker.cs
@@ -128,16 +128,25 @@ protected override void DriveLinkBars()
             }
 
             IsLock = false;
-            Point point;
+            var point = Point.Zero;
             if (points.Count == 1)
                 point = points[0];
             else
             {
-                //Adapt intertia and restrict.
+                //Adapt restrict and intertia.
                 var rID = useRestrict ? 1 : 0;
-                point = useInertia ? points[rID] : (points[0].y - points[1].y >= 0 == isTop ? points[rID] : points[1 - rID]);
+                if (useInertia)
+                    point = points[rID];
+                else
+                {
+                    var isPointTop = points[0].y - points[1].y >= 0;
+                    if (isPointTop == isTop)
+                        point = points[rID];
+                    else
+                        point = points[1 - rID];
+                }
             }
-            lrJoint.localPosition = new Vector3((float)point.x, (float)point.y, 0);
+            lrJoint.localPosition = new Vector3((float)point.x, (float)point.y);
 
             //Drive bars.
             rocker.DriveMechanism();

diff --git a/Assets/MGS-Machinery/Scripts/Hinge/CrankSlider.cs b/Assets/MGS-Machinery/Scripts/Hinge/CrankSlider.cs
@@ -116,12 +116,12 @@ protected override void DriveLinkBars()
             }
 
             IsLock = false;
-            Point point;
+            var point = Point.Zero;
             if (points.Count == 1)
                 point = points[0];
             else
                 point = isRight ? points[0] : points[1];
-            lsJoint.localPosition = new Vector3((float)point.x, (float)point.y, 0);
+            lsJoint.localPosition = new Vector3((float)point.x, (float)point.y);
 
             //Drive linkBar.
             linkBar.DriveMechanism();
@@ -134,7 +134,7 @@ protected override void DriveLinkBars()
         /// <returns>Correct lsJoint angles.</returns>
         protected Vector3 CorrectLSJointAngles(Vector3 angles)
         {
-            return new Vector3(angles.x, 90, 0);
+            return new Vector3(angles.x, 90);
         }
         #endregion
 

diff --git a/Assets/MGS-Machinery/Scripts/Mechanism/Mechanism.cs b/Assets/MGS-Machinery/Scripts/Mechanism/Mechanism.cs
@@ -181,7 +181,7 @@ protected Vector3 CorrectAngles(Vector3 angles)
         /// <returns>Correct position.</returns>
         protected Vector3 CorrectPosition(Vector3 position)
         {
-            return new Vector3(position.x, position.y, 0);
+            return new Vector3(position.x, position.y);
         }
 
         /// <summary>

diff --git a/Assets/MGS-Machinery/Scripts/Planimetry/Planimetry.cs b/Assets/MGS-Machinery/Scripts/Planimetry/Planimetry.cs
@@ -374,15 +374,13 @@ public static Relation GetRelation(Line L, Point p)
             var re = Relation.Undefined;
             if (L.k == double.PositiveInfinity)
             {
-                //Meet the linear equation.
                 if (p.x == L.b)
                     re = Relation.Coincidence;
                 else
                     re = Relation.External;
             }
             else
             {
-                //Meet the linear equation.
                 if (p.y == L.k * p.x + L.b)
                     re = Relation.Coincidence;
                 else