Changeset 8a4e64f in galcon-client for src/com/example/helloandroid/Planet.java

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.

File:

• src/com/example/helloandroid/Planet.java (modified) (3 diffs)

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;
+        }
 }