Changeset 5a03a06 in galcon-client

Timestamp:

May 28, 2010, 3:32:34 AM (14 years ago)

Author:

Zero Cool <devnull@…>

Branches:

master

Children:

b6a9b5f

Parents:

1291908

Message:

Some more updates to fleet update method

File:

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

src/com/example/helloandroid/Fleet.java

@@ -1 +1 @@
 package com.example.helloandroid;
-
-import java.math.*;
 
 public class Fleet {
         private int x;
         private int y;
+        private double dblX;
+        private double dblY;
         private double slope, xIntercept; 
         private double direction;
@@ -15 +15 @@
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
                 //Calculate initial coordinates and direction 
-                if(destination.getX() - source.getX() != 0){
+                if((destination.getX() - source.getX()) != 0){
                 //line formula 
                 slope = ((source.getY() - destination.getY())/(source.getX() - destination.getX()));
@@ -24 +24 @@
                 
                 //coordinates for all 4 coordinates
-                if(destination.getX() - source.getX() < 0 )
+                if((destination.getX() - source.getX()) < 0 )
                         direction += Math.PI;
                 
-                x = (int)((Math.cos(direction)*(source.radius + 10) + source.getX()));
-                y = (int)((Math.sin(direction)*(source.radius + 10) + source.getY()));
+                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 ){
                                 direction = Math.PI/2;
-                                x = destination.getX();
-                                y = source.getY() + source.radius + 10;
+                                dblX = destination.getX();
+                                dblY = source.getY() + source.radius + 10;
                         } else {
                                 direction = 3*Math.PI/2;
-                                x = destination.getX();
-                                y = source.getY() - source.radius - 10;
+                                dblX = destination.getX();
+                                dblY = source.getY() - source.radius - 10;
                         }
                 }
+                
+                x = (int)dblX;
+                y = (int)dblY;
                 
                 this.numShips = numShips;
@@ -120 +124 @@
 
         public void update() {
-                
+                int speed = 1; //pixels per move
         }
         
         // attack the destination planet
+        //after the method is called the fleet needs to removed
         public void attack() {
                 if(numShips <= destination.getNumShips()){