Mercurial > hg > ristipolku

changeset 39:e682b623aea9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 18 Feb 2011 15:47:15 +0200
parents 736de7b28701
children a69103644bf6
files game/Engine.java game/Piece.java
diffstat 2 files changed, 23 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/game/Engine.java	Fri Feb 18 04:58:42 2011 +0200
+++ b/game/Engine.java	Fri Feb 18 15:47:15 2011 +0200
@@ -205,22 +205,20 @@
                     
                     // Get next piece
                     point = curr.getConnection(point);
-                    int npoint = -1;
                     switch (point)
                     {
-                        case 0: y--; npoint = 5; break;
-                        case 1: y--; npoint = 4; break;
+                        case 0: y--; point = 5; break;
+                        case 1: y--; point = 4; break;
                         
-                        case 2: x++; npoint = 7; break;
-                        case 3: x++; npoint = 6; break;
+                        case 2: x++; point = 7; break;
+                        case 3: x++; point = 6; break;
                         
-                        case 4: y++; npoint = 1; break;
-                        case 5: y++; npoint = 0; break;
+                        case 4: y++; point = 1; break;
+                        case 5: y++; point = 0; break;
                         
-                        case 6: x--; npoint = 3; break;
-                        case 7: x--; npoint = 2; break;
+                        case 6: x--; point = 3; break;
+                        case 7: x--; point = 2; break;
                     }
-                    point = npoint;
                 }
             }
             else
--- a/game/Piece.java	Fri Feb 18 04:58:42 2011 +0200
+++ b/game/Piece.java	Fri Feb 18 15:47:15 2011 +0200
@@ -114,22 +114,29 @@
             // Normal line starting and ending points
             case  0: ox = 3.0f; oy = 0.4f; break;
             case  1: ox = 7.0f; oy = 0.4f; break;
+
             case  2: ox = 9.6f; oy = 3.0f; break;
             case  3: ox = 9.6f; oy = 7.0f; break;
+
             case  4: ox = 7.0f; oy = 9.6f; break;
             case  5: ox = 3.0f; oy = 9.6f; break;
+
             case  6: ox = 0.4f; oy = 7.0f; break;
             case  7: ox = 0.4f; oy = 3.0f; break;
 
+
             // Matching control points for each point above (+8)
-            case  8: ox = 3.0f; oy = 3.0f; break;
-            case  9: ox = 7.0f; oy = 3.0f; break;
-            case 10: ox = 7.0f; oy = 3.0f; break;
-            case 11: ox = 7.0f; oy = 7.0f; break;
-            case 12: ox = 7.0f; oy = 7.0f; break;
-            case 13: ox = 3.0f; oy = 7.0f; break;
-            case 14: ox = 3.0f; oy = 7.0f; break;
-            case 15: ox = 3.0f; oy = 3.0f; break;
+            case  8: ox = 3.0f; oy = 2.5f; break;
+            case  9: ox = 7.0f; oy = 2.5f; break;
+
+            case 10: ox = 7.5f; oy = 3.0f; break;
+            case 11: ox = 7.5f; oy = 7.0f; break;
+
+            case 12: ox = 7.0f; oy = 7.5f; break;
+            case 13: ox = 3.0f; oy = 7.5f; break;
+
+            case 14: ox = 2.5f; oy = 7.0f; break;
+            case 15: ox = 2.5f; oy = 3.0f; break;
         }
 
         return new Point2D.Float(x + ox * step, y + oy * step);