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

File:

• src/com/example/helloandroid/Fleet.java (modified) (9 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;
@@ -19 +20 @@
         private int faction;
         private boolean isNextToAPlanet;
-        private boolean dirChanged, isClockwise;
-
+        private boolean dirChanged;
+        
         /* 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){
-                        //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 ){
@@ -50 +53 @@
                                 dblY = source.getY() - source.radius - 10;
                         }
-                        xIntercept = destination.getX();
-                }
-
+                }
+                
                 x = (int)dblX;
                 y = (int)dblY;
-
+                
                 this.numShips = numShips;
                 this.faction = faction;
@@ -62 +64 @@
                 dirChanged = false;
         }
-
-
+        
+                
         public int getX() {
                 return x;
@@ -134 +136 @@
         }
 
-        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);
-                
+        public void draw(Canvas canvas, Paint linePaint) {      
                 Path p = new Path();
                 
@@ -145 +144 @@
                 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 = 1; //pixels per move
-                double distance, tangentDirection, angle;
+                double distance, tangentDirection;
                 Planet temp = null;
                 //is the ship going around a planet already
@@ -169 +193 @@
                                 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;
                                 
-                                angle = radAngle + Math.PI/2;
+                                double 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;
                                 
@@ -209 +224 @@
                         //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
@@ -238 +240 @@
                 }
         }
-
+        
         //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));