Changeset 8a4e64f in galcon-client

Timestamp:

May 25, 2010, 2:46:37 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

3e9f39e

Parents:

9b87c8d

Message:

Generated planets are guaranteed not to collide or or be off the screen. Number of ships on each planet is also displayed.

Location:

src/com/example/helloandroid

Files:

• GameView.java (modified) (13 diffs)
• Planet.java (modified) (3 diffs)

src/com/example/helloandroid/GameView.java

@@ -99 +99 @@
         private int mCanvasWidth = 1;
 
-        /** What to draw for the Lander when it has crashed */
-        private Drawable mCrashedImage;
-
         /** Default is MEDIUM. */
         private int mDifficulty;
@@ -112 +109 @@
         private boolean mEngineFiring;
 
-        /** What to draw for the Lander when the engine is firing */
-        private Drawable mFiringImage;
-
         /** Fuel remaining */
         private double mFuel;
@@ -152 +146 @@
 
         /** Paint to draw the lines on screen. */
-        private Paint mLinePaint;
+        private Paint mLinePaint, mTextPaint;
 
         /** "Bad" speed-too-high variant of the line color. */
@@ -188 +182 @@
             // cache handles to our key sprites & other drawables
             mLanderImage = context.getResources().getDrawable(R.drawable.lander_plain);
-            mFiringImage = context.getResources().getDrawable(R.drawable.lander_firing);
-            mCrashedImage = context.getResources().getDrawable(R.drawable.lander_crashed);
 
             // load background image as a Bitmap instead of a Drawable b/c
@@ -207 +199 @@
             mLinePaintBad.setAntiAlias(true);
             mLinePaintBad.setARGB(255, 120, 180, 0);
+            
+            mTextPaint = new Paint();
+            mTextPaint.setAntiAlias(true);
+            mTextPaint.setARGB(255, 255, 0, 0);
 
             mWinsInARow = 0;
@@ -422 +418 @@
              * thread, which updates the user-text View.
              */
+                boolean test = true;
+                if(test)
+                        return;
             synchronized (mSurfaceHolder) {
                 mMode = mode;
@@ -475 +474 @@
                 Random rand = new Random();
 
-                for(int x=0; x<6; x++) {
-                        planets.add(new Planet(rand.nextInt(45)+5, rand.nextInt(mCanvasWidth), rand.nextInt(mCanvasHeight)));
+                for(int x=0; x<10; x++) {
+                        Planet p = new Planet(rand.nextInt(45)+5, rand.nextInt(mCanvasWidth), rand.nextInt(mCanvasHeight));
+                        p.setNumShips(rand.nextInt(150));
+                        
+                        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 {
+                                planets.add(p);
+                        }
                 }
                         
@@ -519 +528 @@
                     return true;
                 } else if (mMode == STATE_RUNNING) {
-                    // center/space -> fire
-                    if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER
-                            || keyCode == KeyEvent.KEYCODE_SPACE) {
-                        setFiring(true);
-                        return true;
-                        // left/q -> left
-                    } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT
-                            || keyCode == KeyEvent.KEYCODE_Q) {
-                        mRotating = -1;
-                        return true;
-                        // right/w -> right
-                    } else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT
-                            || keyCode == KeyEvent.KEYCODE_W) {
-                        mRotating = 1;
-                        return true;
-                        // up -> pause
-                    } else if (keyCode == KeyEvent.KEYCODE_DPAD_UP) {
-                        pause();
-                        return true;
-                    }
+                    return true;
                 }
 
@@ -559 +549 @@
                     if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER
                             || keyCode == KeyEvent.KEYCODE_SPACE) {
-                        setFiring(false);
                         handled = true;
                     } else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT
@@ -565 +554 @@
                             || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT
                             || keyCode == KeyEvent.KEYCODE_W) {
-                        mRotating = 0;
                         handled = true;
                     }
@@ -585 +573 @@
             for(Planet p : planets) {
                 canvas.drawCircle(p.getX(), p.getY(), p.getRadius(), mLinePaint);
+                canvas.drawText(Integer.toString(p.getNumShips()), p.getX(), p.getY(), mTextPaint);
             }
             
@@ -592 +581 @@
             // Draw the ship with its current rotation
             canvas.save();
-            canvas.rotate((float) mHeading, (float) mX, mCanvasHeight
-                    - (float) mY);
+            canvas.rotate((float)mHeading, (float)mX, mCanvasHeight - (float)mY);
             if (mMode == STATE_LOSE) {
-                mCrashedImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop
-                        + mLanderHeight);
-                mCrashedImage.draw(canvas);
+                //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);
+                //mFiringImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop + mLanderHeight);
+                //mFiringImage.draw(canvas);
             } else {
-                mLanderImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop
-                        + mLanderHeight);
+                mLanderImage.setBounds(xLeft, yTop, xLeft + mLanderWidth, yTop + mLanderHeight);
                 mLanderImage.draw(canvas);
             }
@@ -665 +650 @@
             }
 
+            for(Planet p : planets) {
+                p.update();
+            }
+            
             double dxOld = mDX;
             double dyOld = mDY;

src/com/example/helloandroid/Planet.java

@@ -1 +1 @@
 package com.example.helloandroid;
+
+import java.util.ArrayList;
 
 public class Planet {
@@ -31 +33 @@
         }
         
+        public int getNumShips() {
+                return numShips;
+        }
+        
+        public void setNumShips(int num) {
+                numShips = num;
+        }
+        
         public void update() {
                 //regen ships if not owned by faction 0
+                numShips++;
         }
         
@@ -38 +49 @@
                 
         }
+        
+        public boolean collides(Planet p) {
+                double dist = Math.sqrt(Math.pow(this.x-p.x, 2) + Math.pow(this.y-p.y, 2));
+                
+                return dist <= this.radius + p.radius;
+        }
+        
+        public static boolean collisionDetected(Planet p, ArrayList<Planet> curPlanets) {
+                for(Planet p2 : curPlanets) {
+                        if(p.collides(p2))
+                                return true;
+                }
+                
+                return false;
+        }
 }