Changeset 95509e1 in galcon-client for src/com/example/helloandroid/Fleet.java

Timestamp:

Jun 5, 2010, 7:01:47 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

c65ef39

Parents:

61c4fbc

Message:

Removed reference Lunar Lander classes and lots of code that was originally from Lunar Lander. Fleets are now the same color as the player who sent them.

File:

• src/com/example/helloandroid/Fleet.java (modified) (4 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;
@@ -23 +24 @@
         /* 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){
@@ -133 +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();
                 
@@ -144 +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);
         }