Changeset 1a91f0d in galcon-client

Timestamp:

May 28, 2010, 12:34:15 AM (14 years ago)

Author:

Zero Cool <devnull@…>

Branches:

master

Children:

3e9f39e

Parents:

96857ee

Message:

Fleet Class pdate

File:

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

src/com/example/helloandroid/Fleet.java

@@ -15 +15 @@
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
                 //Calculate initial coordinates and direction 
-                
+                if(destination.x - source.x != 0){
                 //line formula 
                 slope = ((source.y - destination.y)/(source.x - destination.x));
@@ -24 +24 @@
                 
                 //coordinates for all 4 coordinates
-                if ((direction >= 0) && (direction < Math.PI/2)){
-                        x = (int)(Math.cos(direction)*(source.radius + 10) + source.x );
-                        y = (int)(Math.sin(direction)*(source.radius + 10) + source.y );
-                } else if((direction >= Math.PI/2) && (direction < Math.PI)){
-                        
-                } else if((direction >= Math.PI) && (direction < 3*Math.PI/2)){
+                if(destination.x - source.x < 0 )
+                        direction += Math.PI;
                 
+                x = (int)((Math.cos(direction)*(source.radius + 10) + source.x));
+                y = (int)((Math.sin(direction)*(source.radius + 10) + source.y));
                 } else {
+                        if((destination.y - source.y) > 0 ){
+                                direction = Math.PI/2;
+                                x = destination.x;
+                                y = source.y + source.radius + 10;
+                        } else {
+                                direction = 3*Math.PI/2;
+                                x = destination.x;
+                                y = source.y - source.radius - 10;
+                        }
+                }
                 
-                }
                 this.numShips = numShips;
                 this.faction = faction;
@@ -113 +120 @@
 
         public void update() {
-                //update coordinates
-        
+                
         }
         
         // attack the destination planet
         public void attack() {
-                //planet attack
+                if(numShips <= destination.numShips ){
+                
+                }
         }
 }