Changeset 647a312 in galcon-client for src/com/example/helloandroid/Fleet.java

Timestamp:

Jun 6, 2010, 2:50:25 AM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

012e702, 04a9a00, 69f6f01

Parents:

730d808

Message:

Fleet pathing seems to be working correctly, even if the fleet needs to go through two intermediate planets. Fleet speed around planets probably still needs some tweaking.

File:

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

src/com/example/helloandroid/Fleet.java

@@ -21 +21 @@
         private boolean isNextToAPlanet;
         private boolean isClockwise;
-        
-        private boolean done;   
 
         /* Optimising: pre-calculate paths */
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
-                done = false;
-                
                 source.setNumShips(source.getNumShips()-numShips);
                 
@@ -213 +209 @@
                                 } 
                                 
-                                //double radAngle = Math.atan(getSlope(destination.getX(), destination.getY(), dblX, dblY));
-                                //figure out which way to go clockwise or counter clockwise 
-                                tangentAngle = (Math.atan(getSlope(nearPlanet.getX(),nearPlanet.getY(),dblX,dblY))) + (Math.PI/2);
-                                angle = Math.atan((Math.tan(tangentAngle) - Math.tan(direction))/(1 + Math.tan(tangentAngle)*Math.tan(direction)));
-                                
-                                Log.d("Galcon", "tangentAngle: "+tangentAngle);
-                                Log.d("Galcon", "direction: "+direction+",  angle: "+angle);
-                                
-                                if (angle <= Math.PI/2)
-                                        angle = Math.PI - angle;
-                                
-                                //double diff = direction-angle;
-                                
-                                //if(diff > 0)
+                                tangentAngle = Math.atan(getSlope(nearPlanet.getX(),nearPlanet.getY(),dblX,dblY));
+                                
+                                if(dblX < nearPlanet.getX())
+                                        tangentAngle += Math.PI;
+                                
+                                tangentAngle += Math.PI/2;
+                                
                                 if(Math.abs(tangentAngle-direction) > Math.PI/2) {
                                         isClockwise = false;
@@ -240 +229 @@
                                 
                                 isNextToAPlanet = true;
-                                //figure out which way to go clockwise or counter clockwise 
-                                /*tangentDirection = (Math.atan(getSlope(temp.getX(),temp.getY(),dblX,dblY))) + (Math.PI/2);
-                                angle = Math.atan((Math.tan(tangentDirection) - Math.tan(direction))/(1 + Math.tan(tangentDirection)*Math.tan(direction)));
-                                if (angle <= Math.PI/2)
-                                        angle = Math.PI - angle;*/
-                                //get next point and the direction and set it
                         }
                 } else {
@@ -253 +236 @@
                         
                         double dist = Math.abs(destination.getY() - (Math.tan(direction)*destination.getX()) - xIntercept)/(double)Math.sqrt(Math.pow(direction,2)+1);
-                        //Log.d("Galcon", "dist: "+dist);
-                        if(dist < 5 && dist == 1){
+                        if(dist < 2){
                                 dblY += (Math.sin(direction)*speed);
                                 dblX += (Math.cos(direction)*speed);
@@ -267 +249 @@
                         } else {
                                 angle = speed/(double)nearPlanet.radius*.1;
-                                
-                                if(!done) {
-                                        Log.d("Galcon", "direction: "+direction+", angle: "+angle);
-                                        Log.d("Galcon", "original: ("+dblX+", "+dblY+")");
-                                }
                                 
                                 if(isClockwise){
@@ -282 +259 @@
                                         direction = direction - angle;
                                 }
-                                
-                                if(!done)
-                                        Log.d("Galcon", "new: ("+dblX+", "+dblY+")");
-                                
-                                done = true;
                                 
                                 x = (int)dblX;