Changeset 3e9f39e in galcon-client for src/com/example/helloandroid

Timestamp:

May 28, 2010, 12:47:31 AM (14 years ago)

Author:

Zero Cool <devnull@…>

Branches:

master

Children:

1291908

Parents:

1a91f0d (diff), 8a4e64f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with a30e7e8b565e27d0defe9bba05b1e60e10906df6

Location:

src/com/example/helloandroid

Files:

• Game.java (added)
• GameView.java (added)
• HelloAndroid.java (deleted)
• LunarLander.java (added)
• LunarView.java (added)
• Planet.java (modified) (3 diffs)

src/com/example/helloandroid/Planet.java

@@ -1 +1 @@
 package com.example.helloandroid;
+
+import java.util.ArrayList;
 
 public class Planet {
         int radius;
         int regenRate;  // ships per second
-        int x;
-        int y;
+        private int x;
+        private int y;
         int faction;
         int numShips;
@@ -27 +29 @@
         }
         
+        public int getRadius() {
+                return radius;
+        }
+        
+        public int getNumShips() {
+                return numShips;
+        }
+        
+        public void setNumShips(int num) {
+                numShips = num;
+        }
+        
         public void update() {
                 //regen ships if not owned by faction 0
+                numShips++;
         }
         
@@ -34 +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;
+        }
 }