Changeset b6a9b5f in galcon-client for src/com/example/helloandroid/GameView.java

Timestamp:

May 28, 2010, 4:02:05 AM (15 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

5053d90

Parents:

5a03a06

Message:

Each planet is colored based on the faction that controls it and the ship count is centered on the planet and increases over time.

File:

• src/com/example/helloandroid/GameView.java (modified) (8 diffs)

src/com/example/helloandroid/GameView.java

@@ -202 +202 @@
             mTextPaint = new Paint();
             mTextPaint.setAntiAlias(true);
-            mTextPaint.setARGB(255, 255, 0, 0);
+            mTextPaint.setARGB(255, 255, 255, 255);
 
             mWinsInARow = 0;
@@ -310 +310 @@
         public void run() {
             while (mRun) {
+                //Log.i("Gencon", "run called");
+                
                 Canvas c = null;
                 try {
                     c = mSurfaceHolder.lockCanvas(null);
                     synchronized (mSurfaceHolder) {
+                        //Log.i("Gencon", "about to call stuff: mode is "+mMode);
+                        
                         if (mMode == STATE_RUNNING) updatePhysics();
                         doDraw(c);
@@ -418 +422 @@
              * thread, which updates the user-text View.
              */
-                boolean test = true;
-                if(test)
-                        return;
             synchronized (mSurfaceHolder) {
                 mMode = mode;
@@ -470 +471 @@
                 mCanvasHeight = height;
                 
-                Log.i(this.getClass().getName(), "width: "+mCanvasWidth+", height: "+mCanvasHeight);
+                Log.i("Gencon", "width: "+mCanvasWidth+", height: "+mCanvasHeight);
                 
                 Random rand = new Random();
 
-                for(int x=0; x<10; x++) {
+                for(int x=0; x<15; 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)) {
@@ -484 +484 @@
                                 x--;
                         }else {
+                                p.setNumShips(rand.nextInt(150));
+                                p.setFaction(rand.nextInt(5));
                                 planets.add(p);
                         }
@@ -569 +571 @@
             // Draw the background image. Operations on the Canvas accumulate
             // so this is like clearing the screen.
-            canvas.drawBitmap(mBackgroundImage, 0, 0, null);
             
+                //Log.i("Gencon", "doDraw called");
+                
+                canvas.drawBitmap(mBackgroundImage, 0, 0, null);
             for(Planet p : planets) {
-                canvas.drawCircle(p.getX(), p.getY(), p.getRadius(), mLinePaint);
-                canvas.drawText(Integer.toString(p.getNumShips()), p.getX(), p.getY(), mTextPaint);
+                p.draw(canvas, mLinePaint, mTextPaint);
             }
             
@@ -601 +604 @@
          */
         private void updatePhysics() {
+                //Log.i("Gencon", "updatePhysics called");
+                
             long now = System.currentTimeMillis();
 
@@ -702 +707 @@
                 }
 
-                setState(result, message);
+                //setState(result, message);
             }
         }