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

Timestamp:

Jun 5, 2010, 5:08:40 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

0986844, 95509e1

Parents:

9ef6f68

Message:

The player can now send fleets by clicking on the source and destination planets.

File:

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

src/com/example/helloandroid/GameView.java

@@ -171 +171 @@
         private double mY;
         
-        public Object planetsLock;
+        public Object planetsLock, fleetsLock;
         
         public ArrayList<Planet> planets;
+        public ArrayList<Fleet> fleets;
         public Planet planetSelected;
 
@@ -221 +222 @@
         
             planetsLock = new Object();
+            fleetsLock = new Object();
             
             planets = new ArrayList<Planet>();
             planetSelected = null;
+            
+            fleets = new ArrayList<Fleet>();
         }
 
@@ -589 +593 @@
                 }
                 
+                synchronized(fleetsLock) {
+                        for(Fleet f : fleets) {
+                        f.draw(canvas, mLinePaint);
+                }
+                }
+                
             int yTop = mCanvasHeight - ((int) mY + mLanderHeight / 2);
             int xLeft = (int) mX - mLanderWidth / 2;
@@ -665 +675 @@
             }
             
+            synchronized(fleetsLock) {
+                for(Fleet f : fleets) {
+                        f.update(planets);
+                }
+            }
+            
             double dxOld = mDX;
             double dyOld = mDY;
@@ -734 +750 @@
         Log.i("Gencon", "Detected touch event");
         
+        if(event.getAction() != MotionEvent.ACTION_DOWN)
+                return true;
+        
         synchronized(thread.planetsLock) {
                 if(thread.planetSelected != null) {
+                        Planet target = null;
+                        
+                        for(Planet p : thread.planets) {
+                                if(p.contains((int)event.getX(), (int)event.getY())) {
+                                        target = p;
+                                        break;
+                                }
+                        }
+                        
+                        if(target != null) {
+                                synchronized(thread.fleetsLock) {
+                                Fleet f = new Fleet(thread.planetSelected, target, 1, 1);
+                                thread.fleets.add(f);
+                    }
+                        }
+                                
                         thread.planetSelected.unselect();
                         thread.planetSelected = null;
+                }else {
+                        for(Planet p : thread.planets) {
+                                if(p.contains((int)event.getX(), (int)event.getY())) {
+                                        p.select();
+                                        thread.planetSelected = p;
+                                        break;
+                                }
+                        }
                 }
-                
-                for(Planet p : thread.planets) {
-                        if(p.contains((int)event.getX(), (int)event.getY())) {
-                                p.select();
-                                thread.planetSelected = p;
-                                break;
-                        }
-                }
         }