v 1.2: improved graphics, balls can collide

krosaen@google.com · krosaen@google.com · commit ffb210c78913 · 2009-01-03T18:58:41.000Z
git-svn-id: https://apps-for-android.googlecode.com/svn/trunk@149 4c97771b-2a47-0410-a901-cdf36a16b7d0
diff --git a/DivideAndConquer/AndroidManifest.xml b/DivideAndConquer/AndroidManifest.xml
@@ -2,8 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.divideandconquer"
-    android:versionName="1.1"
-    android:versionCode="11">
+    android:versionName="1.2"
+    android:versionCode="12">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 
diff --git a/DivideAndConquer/res/drawable/ball.png b/DivideAndConquer/res/drawable/ball.png
diff --git a/DivideAndConquer/res/layout/main.xml b/DivideAndConquer/res/layout/main.xml
@@ -15,7 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             />
 
         <TextView
@@ -24,14 +24,14 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_centerInParent="true"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             />
 
         <TextView android:id="@+id/livesLeft"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAppearance="?android:attr/textAppearanceMedium"
             />
     </RelativeLayout>
 
diff --git a/DivideAndConquer/src/com/google/android/divideandconquer/AnimatingLine.java b/DivideAndConquer/src/com/google/android/divideandconquer/AnimatingLine.java
@@ -35,7 +35,7 @@ public class AnimatingLine extends Shape2d {
     float mMax;
 
     private long mLastUpdate = 0;
-    private float mPixelsPerSecond = 100.0f;
+    private float mPixelsPerSecond = 101.0f;
 
     /**
      * @param direction The direction of the line
diff --git a/DivideAndConquer/src/com/google/android/divideandconquer/Ball.java b/DivideAndConquer/src/com/google/android/divideandconquer/Ball.java
@@ -107,6 +107,27 @@ public void setNow(long now) {
         mLastUpdate = now;
     }
 
+    public boolean isCircleOverlapping(Ball otherBall) {
+        final float dy = otherBall.mY - mY;
+        final float dx = otherBall.mX - mX;
+
+        final float distance = dy * dy + dx * dx;
+
+        return (distance < ((2 * mRadiusPixels) * (2 *mRadiusPixels)))
+                // avoid jittery collisions
+                && !movingAwayFromEachother(this, otherBall);
+    }
+
+    private boolean movingAwayFromEachother(Ball ballA, Ball ballB) {
+        double collA = Math.atan2(ballB.mY - ballA.mY, ballB.mX - ballA.mX);
+        double collB = Math.atan2(ballA.mY - ballB.mY, ballA.mX - ballB.mX);
+
+        double ax = Math.cos(ballA.mAngle - collA);
+        double bx = Math.cos(ballB.mAngle - collB);
+
+        return ax + bx < 0;        
+    }
+
     public void update(long now) {
         if (now <= mLastUpdate) return;
 
@@ -180,6 +201,44 @@ private void bounceOffLeft() {
     }
 
 
+    /**
+     * Given that ball a and b have collided, adjust their angles to reflect their state
+     * after the collision.
+     *
+     * This method works based on the conservation of energy and momentum in an elastic
+     * collision.  Because the balls have equal mass and speed, it ends up being that they
+     * simply swap velocities along the axis of the collision, keeping the velocities tangent
+     * to the collision constant.
+     *
+     * @param ballA The first ball in a collision
+     * @param ballB The second ball in a collision
+     */
+    public static void adjustForCollision(Ball ballA, Ball ballB) {
+
+        final double collA = Math.atan2(ballB.mY - ballA.mY, ballB.mX - ballA.mX);
+        final double collB = Math.atan2(ballA.mY - ballB.mY, ballA.mX - ballB.mX);
+
+        final double ax = Math.cos(ballA.mAngle - collA);
+        final double ay = Math.sin(ballA.mAngle - collA);
+
+        final double bx = Math.cos(ballB.mAngle - collB);
+        final double by = Math.cos(ballB.mAngle - collB);
+
+        final double diffA = Math.atan2(ay, -bx);
+        final double diffB = Math.atan2(by, -ax);
+
+        ballA.mAngle = collA + diffA;
+        ballB.mAngle = collB + diffB;
+    }
+
+
+    @Override
+    public String toString() {
+        return String.format(
+            "Ball(x=%f, y=%f, angle=%f)",
+                mX, mY, Math.toDegrees(mAngle));
+    }
+
     /**
      * A more readable way to create balls than using a 5 param
      * constructor of all numbers.
@@ -244,6 +303,5 @@ public Builder setRadiusPixels(float pixels) {
             mRadiusPixels = pixels;
             return this;
         }
-
     }
 }
diff --git a/DivideAndConquer/src/com/google/android/divideandconquer/BallRegion.java b/DivideAndConquer/src/com/google/android/divideandconquer/BallRegion.java
@@ -128,14 +128,6 @@ public void setNow(long now) {
         }
     }
 
-//    /**
-//     * @return the area in the region in pixel*pixel
-//     */
-//    public float getArea() {
-//        return (mRight - mLeft) * (mBottom - mTop);
-//    }
-
-
     /**
      * Update the balls an (if it exists) the animating line in this region.
      * @param now in millis
@@ -150,8 +142,9 @@ public BallRegion update(long now) throws BallHitMovingLineException {
         final boolean newRegion =
                 (mAnimatingLine != null && mAnimatingLine.update(now));
 
-        // update the balls, look for collision
         final int numBalls = mBalls.size();
+
+        // move balls, check for collision with animating line
         for (int i = 0; i < numBalls; i++) {
             final Ball ball = mBalls.get(i);
             ball.update(now);
@@ -160,8 +153,20 @@ public BallRegion update(long now) throws BallHitMovingLineException {
             }
         }
 
+        // update ball to ball collisions
+        for (int i = 0; i < numBalls; i++) {
+            final Ball ball = mBalls.get(i);
+            for (int j = i + 1; j < numBalls; j++) {
+                Ball other = mBalls.get(j);
+                if (ball.isCircleOverlapping(other)) {
+                    Ball.adjustForCollision(ball, other);
+                    break;
+                }
+            }
+        }        
+
         handleShrinkToFit(now);
-        
+
         // no collsion, new region means we need to split out the apropriate
         // balls into a new region
         if (newRegion) {
diff --git a/DivideAndConquer/src/com/google/android/divideandconquer/DivideAndConquerActivity.java b/DivideAndConquer/src/com/google/android/divideandconquer/DivideAndConquerActivity.java
@@ -42,30 +42,6 @@ public class DivideAndConquerActivity extends Activity
         NewGameCallback,
         DialogInterface.OnCancelListener {
 
-    /**
-     * Each level has a different background color and ball color.
-     */
-    static class LevelStyle {
-        private final int mBgColor;
-        private final int mBallColor;
-
-        LevelStyle(int bgColor, int ballColor) {
-            mBgColor = 0xFF000000 | bgColor;
-            mBallColor = 0xFF000000 |ballColor;
-        }
-    }
-
-    /**
-     * The styles we cycle through when leveling up.
-     */
-    static LevelStyle[] LEVEL_STYLES = new LevelStyle[] {
-            new LevelStyle(0xFFD162FF, 0xFF76A7FF),
-            new LevelStyle(0xFF76A7FF, 0xFF75FFE9),
-            new LevelStyle(0xFF7E33, 0x8DBDD9),
-            new LevelStyle(0x61FF6E, 0xD9B4D6),
-            new LevelStyle(0x2BA7FF, 0xFF842B),
-    };
-
     private static final int NEW_GAME_NUM_BALLS = 1;
     private static final double LEVEL_UP_THRESHOLD = 0.8;
     private static final int TRY_AGAIN_PAUSE = 1000;
@@ -91,29 +67,6 @@ static class LevelStyle {
 
     private Toast mCurrentToast;
 
-// usefull for playing around with colors
-//    private int theindex = 0;
-//    public boolean onKeyUp(int i, KeyEvent event) {
-//        if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_RIGHT) {
-//            theindex++;
-//            theindex = theindex % LEVEL_STYLES.length;
-//            mBallsView.setColors(
-//                    LEVEL_STYLES[theindex].mBgColor,
-//                    LEVEL_STYLES[theindex].mBallColor
-//                    );
-//            return true;
-//        } else if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_LEFT) {
-//            theindex--;
-//            if (theindex < 0) theindex = LEVEL_STYLES.length - 1;
-//            mBallsView.setColors(
-//                    LEVEL_STYLES[theindex].mBgColor,
-//                    LEVEL_STYLES[theindex].mBallColor
-//                    );
-//            return true;
-//        }
-//        return false;
-//    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -136,10 +89,6 @@ public void onCreate(Bundle savedInstanceState) {
     public void onEngineReady(BallEngine ballEngine) {
         // display 10 balls bouncing around for visual effect
         ballEngine.reset(SystemClock.elapsedRealtime(), 10);
-        mBallsView.setColors(
-                LEVEL_STYLES[0].mBgColor,
-                LEVEL_STYLES[0].mBallColor
-                );
         mBallsView.setMode(DivideAndConquerView.Mode.Bouncing);
 
         // show the welcome dialog
@@ -233,7 +182,8 @@ public void onOptionsMenuClosed(Menu menu) {
     private void saveMode() {
         // don't want to restore to a state where user can't resume game.
         final DivideAndConquerView.Mode mode = mBallsView.getMode();
-        final DivideAndConquerView.Mode toRestore = mode == DivideAndConquerView.Mode.Paused ? DivideAndConquerView.Mode.PausedByUser : mode;
+        final DivideAndConquerView.Mode toRestore = (mode == DivideAndConquerView.Mode.Paused) ?
+                DivideAndConquerView.Mode.PausedByUser : mode;
         mRestoreMode.push(toRestore);
     }
 
@@ -291,7 +241,6 @@ private void levelUp(final BallEngine ballEngine) {
         updatePercentDisplay(0);
         updateLevelDisplay(mNumBalls);
         ballEngine.reset(SystemClock.elapsedRealtime(), mNumBalls);
-        updateLevelColors();
         mBallsView.setMode(DivideAndConquerView.Mode.Bouncing);
         showToast("level " + mNumBalls);
     }
@@ -326,22 +275,10 @@ public void onNewGame() {
         updatePercentDisplay(0);
         updateLivesDisplay(mNumLives, false);
         updateLevelDisplay(mNumBalls);
-        updateLevelColors();
         mBallsView.getEngine().reset(SystemClock.elapsedRealtime(), mNumBalls);
         mBallsView.setMode(DivideAndConquerView.Mode.Bouncing);
     }
 
-    /**
-     * Update the background color and ball color appropriate to the current level.
-     */
-    private void updateLevelColors() {
-        final int index = (mNumBalls - 1) % LEVEL_STYLES.length;
-        mBallsView.setColors(
-                LEVEL_STYLES[index].mBgColor,
-                LEVEL_STYLES[index].mBallColor
-                );
-    }
-
     /**
      * Update the header displaying the current level
      */
diff --git a/DivideAndConquer/src/com/google/android/divideandconquer/DivideAndConquerView.java b/DivideAndConquer/src/com/google/android/divideandconquer/DivideAndConquerView.java
diff --git a/DivideAndConquer/src/com/google/android/divideandconquer/R.java b/DivideAndConquer/src/com/google/android/divideandconquer/R.java
