Changeset 730d808 in galcon-client

Timestamp:

Jun 6, 2010, 2:02:24 AM (15 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

647a312

Parents:

4a1f590

Message:

Currently debugging fleet pathing.

File:

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

src/com/example/helloandroid/Fleet.java

@@ -22 +22 @@
         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);
                 
@@ -64 +67 @@
                 this.destination = destination;
                 this.isNextToAPlanet = false;
+                
+                Log.d("Galcon", "Source: ("+source.getX()+", "+source.getY()+")");
+                Log.d("Galcon", "Destination: ("+destination.getX()+", "+destination.getY()+")");
+                Log.d("Galcon", "Initial direction: "+direction);
+                
+                if(direction < 0)
+                        direction += Math.PI*2;
         }
 
@@ -176 +186 @@
         public void update(ArrayList<Planet> planets) {
                 int speed = 3; //pixels per move
-                double distance, tangentDirection, angle;
+                double distance, tangentAngle, angle;
                 
                 //is the ship going around a planet already
@@ -203 +213 @@
                                 } 
                                 
-                                double radAngle = Math.atan(getSlope(nearPlanet.getX(), nearPlanet.getY(), dblX, dblY));
+                                //double radAngle = Math.atan(getSlope(destination.getX(), destination.getY(), dblX, dblY));
                                 //figure out which way to go clockwise or counter clockwise 
-                                tangentDirection = (Math.atan(getSlope(nearPlanet.getX(),nearPlanet.getY(),dblX,dblY))) + (Math.PI/2);
-                                angle = Math.atan((Math.tan(tangentDirection) - Math.tan(direction))/(1 + Math.tan(tangentDirection)*Math.tan(direction)));
+                                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;
                                 
-                                if(dblX < nearPlanet.getX())
-                                        radAngle += Math.PI;
-                                
-                                angle = radAngle + Math.PI/2;
-                                
-                                double diff = direction-angle;
-                                
-                                if(diff > 0)
+                                //double diff = direction-angle;
+                                
+                                //if(diff > 0)
+                                if(Math.abs(tangentAngle-direction) > Math.PI/2) {
                                         isClockwise = false;
-                                else
+                                        direction = tangentAngle-Math.PI;
+                                }else {
                                         isClockwise = true;
-                                
-                                if(Math.abs(diff)>Math.PI/2)
-                                        direction = angle-Math.PI;
-                                else
-                                        direction = angle;
+                                        direction = tangentAngle;
+                                }
+                                
+                                Log.d("Galcon", "isClockwise: "+isClockwise);
                                 
                                 xIntercept = dblY - (dblX*Math.tan(direction));
@@ -241 +250 @@
                         //can you reach the center of the planet by following this direction
                         //if so set isNextToAPlanet to false and move 
-                        //otherwise continue moving along the circumferenceds4
+                        //otherwise continue moving along the circumference
                         
-                        double dist = Math.abs(destination.getY() - (direction*destination.getY()) - xIntercept)/(double)Math.sqrt(Math.pow(direction,2)+1);
-                        Log.i("Gencon", dist + " units");
-                        if(dist < 5){
+                        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){
                                 dblY += (Math.sin(direction)*speed);
                                 dblX += (Math.cos(direction)*speed);
@@ -257 +266 @@
                                 }
                         } else {
-                                angle = speed/(double)nearPlanet.radius;
-                                Log.i("Gencon", angle + "%");
+                                angle = speed/(double)nearPlanet.radius*.1;
+                                
+                                if(!done) {
+                                        Log.d("Galcon", "direction: "+direction+", angle: "+angle);
+                                        Log.d("Galcon", "original: ("+dblX+", "+dblY+")");
+                                }
+                                
                                 if(isClockwise){
-                                        dblX = ((Math.cos(direction + (Math.PI/2) - angle)*(nearPlanet.radius) + nearPlanet.getX()));
-                                        dblY = ((Math.sin(direction + (Math.PI/2) - angle)*(nearPlanet.radius) + nearPlanet.getY()));
-                                        direction = direction - (angle*.4);
+                                        dblX = Math.cos(direction - (Math.PI/2) + angle)*nearPlanet.radius + nearPlanet.getX();
+                                        dblY = Math.sin(direction - (Math.PI/2) + angle)*nearPlanet.radius + nearPlanet.getY();
+                                        direction = direction + angle;
                                 } else {
-                                        dblX = ((Math.cos(direction - (Math.PI/2) + angle)*(nearPlanet.radius) + nearPlanet.getX()));
-                                        dblY = ((Math.sin(direction - (Math.PI/2) + angle)*(nearPlanet.radius) + nearPlanet.getY()));
-                                        direction = direction + (angle*.4);
-                                }
+                                        dblX = Math.cos(direction + (Math.PI/2) - angle)*nearPlanet.radius + nearPlanet.getX();
+                                        dblY = Math.sin(direction + (Math.PI/2) - angle)*nearPlanet.radius + nearPlanet.getY();
+                                        direction = direction - angle;
+                                }
+                                
+                                if(!done)
+                                        Log.d("Galcon", "new: ("+dblX+", "+dblY+")");
+                                
+                                done = true;
+                                
                                 x = (int)dblX;
                                 y = (int)dblY;