Changes in src/com/example/helloandroid/Fleet.java [6ebf60f:0986844] in galcon-client

File:

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

src/com/example/helloandroid/Fleet.java

@@ -4 +4 @@
 
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
@@ -16 +15 @@
         private double slope, xIntercept; 
         private double direction;
-        private Planet destination, nearPlanet;
+        private Planet destination;
         private int numShips;
         private int faction;
         private boolean isNextToAPlanet;
-        private boolean isClockwise;
-        
+        private boolean dirChanged, isClockwise;
 
         /* Optimising: pre-calculate paths */
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
-                source.setNumShips(source.getNumShips()-numShips);
-                
                 //Calculate initial coordinates and direction 
                 if((destination.getX() - source.getX()) != 0){
@@ -64 +60 @@
                 this.destination = destination;
                 this.isNextToAPlanet = false;
+                dirChanged = false;
         }
 
@@ -137 +134 @@
         }
 
-        public void draw(Canvas canvas, Paint linePaint) {      
+        public void draw(Canvas canvas, Paint linePaint) {
+                //Log.i("Gencon", "direction: "+direction);
+                canvas.drawLine((float)x, (float)y, (float)(x+10*Math.cos(direction)), (float)(y+10*Math.sin(direction)), linePaint);
+                
                 Path p = new Path();
                 
@@ -145 +145 @@
                 p.lineTo((float)(x+5*Math.cos(direction+Math.PI/2)), (float)(y+5*Math.sin(direction+Math.PI/2)));
                 
-                int c, prevC = linePaint.getColor();
-                
-                switch(faction) {
-                case 0:
-                        c = Color.argb(255, 100, 100, 100);
-                        break;
-                case 1:
-                        c = Color.argb(255, 255, 0, 0);
-                        break;
-                case 2:
-                        c = Color.argb(255, 0, 180, 0);
-                        break;
-                case 3:
-                        c = Color.argb(255, 0, 0, 255);
-                        break;
-                case 4:
-                        c = Color.argb(255, 150, 150, 0);
-                        break;
-                default:
-                        c = prevC;
-                }
-                
-                linePaint.setColor(c);
                 
                 canvas.drawPath(p, linePaint);
-                
-                linePaint.setColor(prevC);
         }
 
         public void update(ArrayList<Planet> planets) {
-                int speed = 3; //pixels per move
+                int speed = 1; //pixels per move
                 double distance, tangentDirection, angle;
-                
+                Planet temp = null;
                 //is the ship going around a planet already
                 if(!isNextToAPlanet){
@@ -186 +161 @@
                                 distance = getDistanceBetween(dblX,dblY,p.getX(),p.getY());
                                 if(distance <= p.radius){
-                                        nearPlanet = p;
+                                        temp = p;
                                         break;
                                 }
                         }
                         //if temp planet is not picked move along the direction by #speed
-                        if(nearPlanet == null) {
+                        if(temp == null || dirChanged) {
                                 dblY += (Math.sin(direction)*speed);
                                 dblX += (Math.cos(direction)*speed);
@@ -198 +173 @@
                                 y = (int)dblY;
                         }else {                         
-                                if(nearPlanet == destination){
-                                        attack();
-                                        return;
-                                } 
-                                
-                                double radAngle = Math.atan(getSlope(nearPlanet.getX(), nearPlanet.getY(), dblX, dblY));
+                                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(nearPlanet.getX(),nearPlanet.getY(),dblX,dblY))) + (Math.PI/2);
+                                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 < nearPlanet.getX())
+                                if(dblX < temp.getX())
                                         radAngle += Math.PI;
                                 
@@ -222 +191 @@
                                 else
                                         isClockwise = true;
-                                
                                 if(Math.abs(diff)>Math.PI/2)
                                         direction = angle-Math.PI;
                                 else
                                         direction = angle;
-                                
-                                xIntercept = dblY - (dblX*Math.tan(direction));
-                                
-                                isNextToAPlanet = true;
+                                        
+                                dirChanged = true;
+                                
                                 //figure out which way to go clockwise or counter clockwise 
                                 /*tangentDirection = (Math.atan(getSlope(temp.getX(),temp.getY(),dblX,dblY))) + (Math.PI/2);
@@ -243 +210 @@
                         //otherwise continue moving along the circumferenceds4
                         
-                        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){
-                                dblY += (Math.sin(direction)*speed);
-                                dblX += (Math.cos(direction)*speed);
-
-                                x = (int)dblX;
-                                y = (int)dblY;
-                                
-                                if (getDistanceBetween(dblX,dblY,nearPlanet.getX(),nearPlanet.getY()) > nearPlanet.radius){
-                                        isNextToAPlanet = false;
-                                        nearPlanet = null;
+                        
+                        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);
                                 }
-                        } else {
-                                angle = speed/(double)nearPlanet.radius;
-                                Log.i("Gencon", angle + "%");
-                                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);
-                                } 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);
-                                }
-                                x = (int)dblX;
-                                y = (int)dblY;
-                                xIntercept = dblY - (dblX*Math.tan(direction));
                         }
                 }
@@ -278 +231 @@
         //after the method is called the fleet needs to removed
         public void attack() {
-                if(this.faction == destination.getFaction())
-                        destination.setNumShips(destination.getNumShips() + numShips);
-                else if(numShips <= destination.getNumShips()){
+                if(numShips <= destination.getNumShips()){
                         destination.setNumShips(destination.getNumShips() - numShips);
                 } else {
@@ -286 +237 @@
                         destination.setFaction(this.faction);
                 }
-                this.numShips = 0;
         }