Changes in / [9d030cb:04a9a00] in galcon-client

Location:

src/com/example/helloandroid

Files:

• Fleet.java (modified) (3 diffs)
• GameView.java (modified) (7 diffs)

src/com/example/helloandroid/Fleet.java

@@ -22 +22 @@
         private boolean isClockwise;
 
-        /* Optimizing: pre-calculate paths */
+        /* Optimising: pre-calculate paths */
         public Fleet(Planet source, Planet destination, int numShips, int faction) {
                 source.setNumShips(source.getNumShips()-numShips);
@@ -236 +236 @@
                         
                         double dist = Math.abs(destination.getY() - (Math.tan(direction)*destination.getX()) - xIntercept)/(double)Math.sqrt(Math.pow(direction,2)+1);
-                        int allowedError = 2;
-                        if(nearPlanet.radius <= 10)
-                                allowedError = 10;
-                        else if(nearPlanet.radius <= 30)
-                                allowedError = 5;
-                        if(dist < allowedError){
+                        if(dist < 2){
                                 dblY += (Math.sin(direction)*speed);
                                 dblX += (Math.cos(direction)*speed);
@@ -251 +246 @@
                                         isNextToAPlanet = false;
                                         nearPlanet = null;
-                                        
-                                        slope = getSlope(x,y,destination.getX(),destination.getY());
-                                        
-                                        xIntercept = destination.getY() - (slope*destination.getX());
-
-                                        //direction
-                                        direction = Math.atan(slope);
-
-                                        //coordinates for all 4 coordinates
-                                        if((destination.getX() - x) < 0 )
-                                                direction += Math.PI;
                                 }
                         } else {

src/com/example/helloandroid/GameView.java

@@ -10 +10 @@
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.RectF;
-import android.graphics.Paint.FontMetrics;
 import android.os.Bundle;
 import android.os.Handler;
@@ -79 +77 @@
         public ArrayList<Fleet> fleets;
         public Planet planetSelected;
-        
-        int mFleetSize;
 
         public DrawingThread(SurfaceHolder surfaceHolder, Context context,
@@ -105 +101 @@
             
             fleets = new ArrayList<Fleet>();
-            
-            mFleetSize = 50;
         }
 
@@ -242 +236 @@
                                 if(Planet.collisionDetected(p, planets)) {
                                         x--;
-                                }else if(p.getX()-p.getRadius() < 0 || mCanvasWidth-20<=p.getX()+p.getRadius() ||
-                                                 p.getY()-p.getRadius() < 0 || mCanvasHeight-20<=p.getY()+p.getRadius()) {
+                                }else if(p.getX()-p.getRadius() < 0 || mCanvasWidth<=p.getX()+p.getRadius() ||
+                                                 p.getY()-p.getRadius() < 0 || mCanvasHeight<=p.getY()+p.getRadius()) {
                                         x--;
                                 }else {
@@ -346 +340 @@
                 }
                 }
-                
-                float textSize = mTextPaint.getTextSize();
-                mTextPaint.setTextSize(24);
-                FontMetrics metrics = mTextPaint.getFontMetrics();
-                mTextPaint.setColor(Color.WHITE);
-                
-                canvas.drawText(mFleetSize+"%", mCanvasWidth-mTextPaint.measureText(mFleetSize+"%"), mCanvasHeight-20-(metrics.ascent+metrics.descent), mTextPaint);
-                
-                mTextPaint.setTextSize(textSize);
-                
-                mLinePaint.setColor(Color.YELLOW);
-                canvas.drawRoundRect(new RectF(70, mCanvasHeight-15, mCanvasWidth-70, mCanvasHeight-5), 5, 5, mLinePaint);
-                
-                mLinePaint.setColor(Color.GREEN);
-                canvas.drawRoundRect(new RectF(70, mCanvasHeight-15, 70+(mCanvasWidth-140)*mFleetSize/100, mCanvasHeight-5), 5, 5, mLinePaint);
         }
 
@@ -387 +366 @@
                 while(i.hasNext()){
                         f = i.next();
-                        if(f.getNumShips() == 0) {
+                        if(f.getNumShips() == 0)
                                 i.remove();
-                        }else
+                        else
                                 f.update(planets);
                 }
@@ -429 +408 @@
         Log.i("Gencon", "Detected touch event");
         
-        if(event.getAction() == MotionEvent.ACTION_UP) {
-                if(70 <= event.getX() && event.getX() <= thread.mCanvasWidth-70 &&
-                   thread.mCanvasHeight-15 <= event.getY() && event.getY() <= thread.mCanvasHeight-5) {
-                        thread.mFleetSize = ((int)event.getX()-70)*100/(thread.mCanvasWidth-140);
+        if(event.getAction() != MotionEvent.ACTION_DOWN)
+                return true;
+        
+        synchronized(thread.planetsLock) {
+                if(thread.planetSelected != null) {
+                        Planet target = null;
+                        
+                        for(Planet p : thread.planets) {
+                                if(p.contains((int)event.getX(), (int)event.getY())) {
+                                        target = p;
+                                        break;
+                                }
+                        }
+                        
+                        if(target != null && thread.planetSelected.getFaction() != 0) {
+                                synchronized(thread.fleetsLock) {
+                                Fleet f = new Fleet(thread.planetSelected, target, 1, 1);
+                                f.setFaction(thread.planetSelected.getFaction());
+                                thread.fleets.add(f);
+                    }
+                        }
+                                
+                        thread.planetSelected.unselect();
+                        thread.planetSelected = null;
+                }else {
+                        for(Planet p : thread.planets) {
+                                if(p.contains((int)event.getX(), (int)event.getY())) {
+                                        p.select();
+                                        thread.planetSelected = p;
+                                        break;
+                                }
+                        }
                 }
-        }else if(event.getAction() == MotionEvent.ACTION_DOWN) {
-                synchronized(thread.planetsLock) {
-                        if(thread.planetSelected != null) {
-                                Planet target = null;
-                                
-                                for(Planet p : thread.planets) {
-                                        if(p.contains((int)event.getX(), (int)event.getY())) {
-                                                target = p;
-                                                break;
-                                        }
-                                }
-                                
-                                if(target != null && target != thread.planetSelected && thread.planetSelected.getFaction() != 0) {
-                                        synchronized(thread.fleetsLock) {
-                                        Fleet f = new Fleet(thread.planetSelected, target, thread.planetSelected.getNumShips()*thread.mFleetSize/100, thread.planetSelected.getFaction());
-                                        f.setFaction(thread.planetSelected.getFaction());
-                                        thread.fleets.add(f);
-                            }
-                                }
-                                        
-                                thread.planetSelected.unselect();
-                                thread.planetSelected = null;
-                        }else {
-                                for(Planet p : thread.planets) {
-                                        if(p.contains((int)event.getX(), (int)event.getY())) {
-                                                p.select();
-                                                thread.planetSelected = p;
-                                                break;
-                                        }
-                                }
-                        }
-                }
         }