Changeset 9d030cb in galcon-client for src/com/example/helloandroid/Fleet.java

Timestamp:

Jun 14, 2010, 1:19:14 AM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

3a0d468

Parents:

04a9a00 (diff), 38ac100 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 422c8ef5772e988da2065d1c4b95e6d6ab6192e7

File:

• src/com/example/helloandroid/Fleet.java (modified) (3 diffs)

src/com/example/helloandroid/Fleet.java

@@ -22 +22 @@
         private boolean isClockwise;
 
-        /* Optimising: pre-calculate paths */
+        /* Optimizing: pre-calculate paths */
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
                 source.setNumShips(source.getNumShips()-numShips);
@@ -236 +236 @@
                         
                         double dist = Math.abs(destination.getY() - (Math.tan(direction)*destination.getX()) - xIntercept)/(double)Math.sqrt(Math.pow(direction,2)+1);
-                        if(dist < 2){
+                        int allowedError = 2;
+                        if(nearPlanet.radius <= 10)
+                                allowedError = 10;
+                        else if(nearPlanet.radius <= 30)
+                                allowedError = 5;
+                        if(dist < allowedError){
                                 dblY += (Math.sin(direction)*speed);
                                 dblX += (Math.cos(direction)*speed);
@@ -246 +251 @@
                                         isNextToAPlanet = false;
                                         nearPlanet = null;
+                                        
+                                        slope = getSlope(x,y,destination.getX(),destination.getY());
+                                        
+                                        xIntercept = destination.getY() - (slope*destination.getX());
+
+                                        //direction
+                                        direction = Math.atan(slope);
+
+                                        //coordinates for all 4 coordinates
+                                        if((destination.getX() - x) < 0 )
+                                                direction += Math.PI;
                                 }
                         } else {