Changeset 5053d90 in galcon-client

Timestamp:

May 30, 2010, 9:32:02 PM (15 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

c27abf4

Parents:

b6a9b5f

Message:

The game now responds to touchscreen events and the player can select planets.

Location:

src/com/example/helloandroid

Files:

• Game.java (modified) (1 diff)
• GameView.java (modified) (9 diffs)
• Planet.java (modified) (7 diffs)

src/com/example/helloandroid/Game.java

@@ -6 +6 @@
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.Window;
 import android.widget.TextView;

src/com/example/helloandroid/GameView.java

@@ -17 +17 @@
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
@@ -170 +171 @@
         private double mY;
         
-        private ArrayList<Planet> planets;
+        public Object planetsLock;
+        
+        public ArrayList<Planet> planets;
+        public Planet planetSelected;
 
         public DrawingThread(SurfaceHolder surfaceHolder, Context context,
@@ -215 +219 @@
             mHeading = 0;
             mEngineFiring = true;
+        
+            planetsLock = new Object();
             
             planets = new ArrayList<Planet>();
+            planetSelected = null;
         }
 
@@ -463 +470 @@
             }
         }
-
+        
         /* Callback invoked when the surface dimensions change. */
         public void setSurfaceSize(int width, int height) {
@@ -475 +482 @@
                 Random rand = new Random();
 
-                for(int x=0; x<15; x++) {
-                        Planet p = new Planet(rand.nextInt(45)+5, rand.nextInt(mCanvasWidth), rand.nextInt(mCanvasHeight));
-                        
-                        if(Planet.collisionDetected(p, planets)) {
-                                x--;
-                        }else if(p.getX()-p.getRadius() < 0 || mCanvasWidth<=p.getX()+p.getRadius() ||
-                                         p.getY()-p.getRadius() < 0 || mCanvasHeight<=p.getY()+p.getRadius()) {
-                                x--;
-                        }else {
-                                p.setNumShips(rand.nextInt(150));
-                                p.setFaction(rand.nextInt(5));
-                                planets.add(p);
-                        }
+                synchronized(planetsLock) {
+                        for(int x=0; x<15; x++) {
+                                Planet p = new Planet(rand.nextInt(45)+5, rand.nextInt(mCanvasWidth), rand.nextInt(mCanvasHeight));
+                                
+                                if(Planet.collisionDetected(p, planets)) {
+                                        x--;
+                                }else if(p.getX()-p.getRadius() < 0 || mCanvasWidth<=p.getX()+p.getRadius() ||
+                                                 p.getY()-p.getRadius() < 0 || mCanvasHeight<=p.getY()+p.getRadius()) {
+                                        x--;
+                                }else {
+                                        p.setNumShips(rand.nextInt(150));
+                                        p.setFaction(rand.nextInt(5));
+                                        planets.add(p);
+                                }
+                        }
                 }
                         
@@ -569 +578 @@
          */
         private void doDraw(Canvas canvas) {
-            // Draw the background image. Operations on the Canvas accumulate
-            // so this is like clearing the screen.
+                canvas.drawBitmap(mBackgroundImage, 0, 0, null);
+                synchronized(planetsLock) {
+                        for(Planet p : planets) {
+                        p.draw(canvas, mLinePaint, mTextPaint);
+                }
+                }
             
-                //Log.i("Gencon", "doDraw called");
+                if(planetSelected != null) {
+                        planetSelected.drawSelectionCircle(canvas);
+                }
                 
-                canvas.drawBitmap(mBackgroundImage, 0, 0, null);
-            for(Planet p : planets) {
-                p.draw(canvas, mLinePaint, mTextPaint);
-            }
-            
             int yTop = mCanvasHeight - ((int) mY + mLanderHeight / 2);
             int xLeft = (int) mX - mLanderWidth / 2;
@@ -585 +595 @@
             canvas.save();
             canvas.rotate((float)mHeading, (float)mX, mCanvasHeight - (float)mY);
-            if (mMode == STATE_LOSE) {
-                //mCrashedImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop + mLanderHeight);
-                //mCrashedImage.draw(canvas);
-            } else if (mEngineFiring) {
-                //mFiringImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop + mLanderHeight);
-                //mFiringImage.draw(canvas);
-            } else {
-                mLanderImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop + mLanderHeight);
-                mLanderImage.draw(canvas);
-            }
+            
+            mLanderImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop + mLanderHeight);
+            mLanderImage.draw(canvas);
+                
             canvas.restore();
         }
@@ -655 +659 @@
             }
 
-            for(Planet p : planets) {
-                p.update();
+            synchronized(planetsLock) {
+                for(Planet p : planets) {
+                        p.update();
+                }
             }
             
@@ -740 +746 @@
     }
 
+    @Override public boolean onTouchEvent(MotionEvent event) {
+        Log.i("Gencon", "Detected touch event");
+        
+        synchronized(thread.planetsLock) {
+                if(thread.planetSelected != null) {
+                        thread.planetSelected.unselect();
+                        thread.planetSelected = null;
+                }
+                
+                for(Planet p : thread.planets) {
+                        if(p.contains((int)event.getX(), (int)event.getY())) {
+                                p.select();
+                                thread.planetSelected = p;
+                                break;
+                        }
+                }
+        }
+        
+        return true;
+    }
+    
     /**
      * Fetches the animation thread corresponding to this LunarView.

src/com/example/helloandroid/Planet.java

@@ -3 +3 @@
 import java.util.ArrayList;
 
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Paint.FontMetrics;
-import android.util.Log;
 
 public class Planet {
@@ -16 +16 @@
         int faction;
         int numShips;
-
+        boolean selected;
+        private Bitmap selection;
+        
         public Planet(int radius, int x, int y) {
                 this.radius = radius;
@@ -23 +25 @@
                 faction = 0;
                 numShips = 0;
+                selected = false;
                 
                 regenRate = 0;  //change this to some expression / funcion call
+                
+                int size = getRadius()+15;
+                
+                selection = Bitmap.createBitmap(size*2, size*2, Bitmap.Config.ARGB_8888);
+                Canvas c = new Canvas(selection);
+                c.drawColor(Color.argb(0, 0, 0, 0));
+                
+                Paint p = new Paint();
+        p.setAntiAlias(true);
+                
+                p.setColor(Color.argb(255, 255, 255, 255));
+                c.drawCircle(size, size, getRadius()+11, p);
+                
+                p.setColor(Color.argb(255, 100, 100, 100));
+                c.drawCircle(size, size, getRadius()+5, p);
+                
+                for(int i=0; i<size*2; i++) {
+                        for(int j=0; j<size*2; j++) {
+                                if(selection.getPixel(i,j) == Color.argb(255, 100, 100, 100))
+                                        selection.setPixel(i, j, Color.argb(0, 0, 0, 0));
+                        }
+                }
         }
         
@@ -43 +68 @@
         }
         
+        public boolean isSelected() {
+                return selected;
+        }
+        
         public void setNumShips(int num) {
                 numShips = num;
@@ -51 +80 @@
         }
         
+        public void select() {
+                selected = true;
+        }
+        
+        public void unselect() {
+                selected = false;
+        }
+        
         public void draw(Canvas canvas, Paint linePaint, Paint textPaint) {
                 FontMetrics metrics = textPaint.getFontMetrics();
                 
                 int c, prevC = linePaint.getColor();
+                
+                if(selected) {
+                        //drawSelectionCircle(canvas);
+                }
                 
                 switch(faction) {
@@ -84 +125 @@
         }
         
+        public void drawSelectionCircle(Canvas canvas) {
+                int size = getRadius()+15;
+                
+                canvas.drawBitmap(selection, x-size, y-size, null);
+        }
+        
         public void update() {
                 if(faction != 0)
@@ -92 +139 @@
         public void sendFleet(Planet p, int numShips) {
                 
+        }
+        
+        public boolean contains(int x, int y) {
+                double dist = Math.sqrt(Math.pow(this.x-x, 2) + Math.pow(this.y-y, 2));
+                
+                return dist <= this.radius;
         }