Changeset 17dfb52 in galcon-client

Timestamp:

Jun 5, 2010, 8:02:26 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

1bc5794, 6ebf60f

Parents:

c65ef39 (diff), 0986844 (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:

handeld merge

File:

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

src/com/example/helloandroid/Fleet.java

@@ -20 +20 @@
         private int faction;
         private boolean isNextToAPlanet;
-        private boolean dirChanged;
-        
+        private boolean dirChanged, isClockwise;
+
         /* Optimising: pre-calculate paths */
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
@@ -28 +28 @@
                 //Calculate initial coordinates and direction 
                 if((destination.getX() - source.getX()) != 0){
-                //line formula 
-                slope = getSlope(source.getX(),source.getY(),destination.getX(),destination.getY());
-                
-                xIntercept = destination.getY() - (slope*destination.getX());
-                
-                //direction
-                direction = Math.atan(slope);
-                
-                //coordinates for all 4 coordinates
-                if((destination.getX() - source.getX()) < 0 )
-                        direction += Math.PI;
-                
-                dblX = ((Math.cos(direction)*(source.radius + 10) + source.getX()));
-                dblY = ((Math.sin(direction)*(source.radius + 10) + source.getY()));
-                
+                        //line formula 
+                        slope = getSlope(source.getX(),source.getY(),destination.getX(),destination.getY());
+                
+                        xIntercept = destination.getY() - (slope*destination.getX());
+
+                        //direction
+                        direction = Math.atan(slope);
+
+                        //coordinates for all 4 coordinates
+                        if((destination.getX() - source.getX()) < 0 )
+                                direction += Math.PI;
+
+                        dblX = ((Math.cos(direction)*(source.radius + 10) + source.getX()));
+                        dblY = ((Math.sin(direction)*(source.radius + 10) + source.getY()));
+
                 } else {
                         if((destination.getY() - source.getY()) > 0 ){
@@ -53 +53 @@
                                 dblY = source.getY() - source.radius - 10;
                         }
-                }
-                
+                        xIntercept = destination.getX();
+                }
+
                 x = (int)dblX;
                 y = (int)dblY;
-                
+
                 this.numShips = numShips;
                 this.faction = faction;
@@ -64 +65 @@
                 dirChanged = false;
         }
-        
-                
+
+
         public int getX() {
                 return x;
@@ -175 +176 @@
         public void update(ArrayList<Planet> planets) {
                 int speed = 1; //pixels per move
-                double distance, tangentDirection;
+                double distance, tangentDirection, angle;
                 Planet temp = null;
                 //is the ship going around a planet already
@@ -193 +194 @@
                                 dblY += (Math.sin(direction)*speed);
                                 dblX += (Math.cos(direction)*speed);
-                                
+
                                 x = (int)dblX;
                                 y = (int)dblY;
                         }else {                         
                                 double radAngle = Math.atan(getSlope(temp.getX(), temp.getY(), dblX, dblY));
+                                //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;
                                 
                                 if(dblX < temp.getX())
                                         radAngle += Math.PI;
                                 
-                                double angle = radAngle + Math.PI/2;
+                                angle = radAngle + Math.PI/2;
                                 
                                 double diff = direction-angle;
                                 
+                                if(diff > 0)
+                                        isClockwise = false;
+                                else
+                                        isClockwise = true;
                                 if(Math.abs(diff)>Math.PI/2)
                                         direction = angle-Math.PI;
                                 else
                                         direction = angle;
-                                
+                                        
                                 dirChanged = true;
                                 
@@ -224 +234 @@
                         //if so set isNextToAPlanet to false and move 
                         //otherwise continue moving along the circumferenceds4
-                
-                }
-                
-                
-        }
-        
+                        
+                        
+                        if(true){
+                                
+                        } else {
+                                angle = speed/temp.radius;
+                                if(isClockwise){
+                                        dblX = ((Math.cos(direction + (Math.PI/2) - angle)*(temp.radius) + temp.getX()));
+                                        dblY = ((Math.sin(direction + (Math.PI/2) - angle)*(temp.radius) + temp.getY()));
+                                        direction = direction - (Math.PI/2);
+                                } else {
+                                        dblX = ((Math.cos(direction - (Math.PI/2) + angle)*(temp.radius) + temp.getX()));
+                                        dblY = ((Math.sin(direction - (Math.PI/2) + angle)*(temp.radius) + temp.getY()));
+                                        direction = direction + (Math.PI/2);
+                                }
+                        }
+                }
+        }
+
         // attack the destination planet
         //after the method is called the fleet needs to removed
@@ -240 +263 @@
                 }
         }
-        
+
         //helper functions
         private double getDistanceBetween(double x1, double y1, double x2, double y2) {
                 return Math.sqrt(Math.pow((x2 - x1),2) + Math.pow((y2 - y1),2));
         }
-        
+
         private double getSlope(double x1, double y1, double x2, double y2) {
                 return ((y2 - y1)/(double)(x2 - x1));