Changeset 1a1e8c7 in advance-wars

Timestamp:

Jan 31, 2011, 11:44:53 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

00c432c

Parents:

abe7b3d

Message:

Added a basic draw function to Unit and made some other minor code changes.

Files:

• res/layout/main.xml (modified) (1 diff)
• src/com/medievaltech/advancewars/GameView.java (modified) (4 diffs)
• src/com/medievaltech/game/Map.java (moved) (moved from src/com/medievaltech/advancewars/Map.java ) (4 diffs)
• src/com/medievaltech/game/Soldier.java (modified) (1 diff)
• src/com/medievaltech/game/Tile.java (moved) (moved from src/com/medievaltech/advancewars/Tile.java ) (2 diffs)
• src/com/medievaltech/game/Transport.java (modified) (1 diff)
• src/com/medievaltech/game/Unit.java (modified) (4 diffs)

res/layout/main.xml

@@ -3 +3 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
-        <com.example.advancewars.GameView android:id="@+id/lunar"
+        <com.medievaltech.advancewars.GameView android:id="@+id/lunar"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent" /> 

src/com/medievaltech/advancewars/GameView.java

@@ -1 +1 @@
 package com.medievaltech.advancewars;
 
+import com.medievaltech.game.*;
 import com.medievaltech.gui.*;
 
@@ -47 +48 @@
 
         /** Paint to draw the lines on screen. */
-        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2;
+        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2,
+                mUnitPaint;
         
         private Map mMap;
@@ -88 +90 @@
             mTilePaint2.setAntiAlias(true);
             mTilePaint2.setARGB(255, 0, 0, 255);
+            
+            mUnitPaint = new Paint();
+            mUnitPaint.setAntiAlias(true);
+            mUnitPaint.setARGB(255, 255, 0, 0);
             
             wndMainMenu = new com.medievaltech.gui.Window(0, 0, 320, 450);;
@@ -106 +112 @@
                         for(int y=0; y<mMap.getHeight(); y++) {
                                 if(land)
-                                        mMap.setTile(x, y, grassTile);
+                                        mMap.setTile(x, y, new Tile(grassTile));
                                 else
-                                        mMap.setTile(x, y, oceanTile);
+                                        mMap.setTile(x, y, new Tile(oceanTile));
                                 land = !land;
                         }
                         land = !land;
             }
+            
+            mMap.getTile(2, 3).addUnit(new Soldier(mUnitPaint));
+            mMap.getTile(5, 7).addUnit(new Soldier(mUnitPaint));
             
             mGameState = GameState.MAIN_MENU;

src/com/medievaltech/game/Map.java

@@ -1 @@
-package com.medievaltech.advancewars;
+package com.medievaltech.game;
 
 import android.graphics.Canvas;
@@ -16 +16 @@
                 for(int x=0; x<getWidth(); x++)
                         for(int y=0; y<getHeight(); y++)
-                                grid[x][y] = t;
+                                grid[x][y] = new Tile(t);
         }
         
@@ -25 +25 @@
         public int getHeight() {
                 return grid[0].length;
+        }
+        
+        public Tile getTile(int x, int y) {
+                return grid[x][y];
+        }
+        
+        public Tile getTile(Point point) {
+                return grid[point.x][point.y];
         }
         
@@ -36 +44 @@
                                 grid[x][y].draw(c, xStart+50*x, yStart+50*y);
         }
-        
-        public Tile getTile(Point point)
-        {
-                return grid[point.x][point.y];
-        }
 }

src/com/medievaltech/game/Soldier.java

@@ -3 +3 @@
 import java.util.List;
 
+import android.graphics.Paint;
 import android.graphics.Point;
 
 public class Soldier extends Unit{
-
+        public Soldier(Paint p) {
+                super(p);
+        }
+        
         @Override
         public boolean move(Point point) {

src/com/medievaltech/game/Tile.java

@@ -1 @@
-package com.medievaltech.advancewars;
-
-import com.medievaltech.game.Unit;
+package com.medievaltech.game;
 
 import android.graphics.Canvas;
@@ -17 +15 @@
         public Unit currentUnit;
         public Point point;
+        private Paint p;
         
-        public void addUnit(Unit unit)
-        {
+        public Tile(Paint p) {
+                this.p = p;
+                this.currentUnit = null;
+        }
+        
+        public Tile(Tile t) {
+                this.type = t.type;
+                this.moveCoefficent = t.moveCoefficent;
+                this.p = t.p;
+        }
+        
+        public void addUnit(Unit unit) {
                 currentUnit = unit;     
         }
         
-        public void removeUnit(Unit unit)
-        {
-                if(currentUnit != null)
-                {
+        public void removeUnit(Unit unit) {
+                if(currentUnit != null) {
                         currentUnit = null;
                 }
         
         }
-        private Paint p;
-        
-        public Tile(Paint p) {
-                this.p = p;
-        }
         
         public void draw(Canvas c, int x, int y) {
                 c.drawRect(x, y, x+50, y+50, p);
+                
+                if(currentUnit != null)
+                        currentUnit.draw(c, x+25, y+25);
         }
 }

src/com/medievaltech/game/Transport.java

@@ -1 +1 @@
 package com.medievaltech.game;
 
-public abstract class Transport extends Unit
-{
+import android.graphics.Paint;
+
+public abstract class Transport extends Unit {
         public Unit storedUnit;
         
-
+        public Transport(Paint p) {
+                super(p);
+        }
 }

src/com/medievaltech/game/Unit.java

@@ -3 +3 @@
 import java.util.List;
 
+import android.graphics.Canvas;
+import android.graphics.Paint;
 import android.graphics.Point;
 
 public abstract class Unit 
 {
-        public Unit()
-        {
-                
-        }
         public enum Type
         {
@@ -16 +14 @@
         }
 
+        private Paint p;
+        
         public Type type;
         public Player owner;
@@ -32 +32 @@
         public Point location;
         
+        public Unit(Paint p) {
+                this.p = p;
+        }
+        
         public abstract boolean move(Point point);
         public abstract boolean attack(Point point);
@@ -38 +42 @@
         public abstract List<Point> getAttackRange();
         
-        public  void die()
-        {
+        public  void die() {
                 
         }
         
-        
-        
-        
-        
-        
-        
-        
+        public void draw(Canvas c, int x, int y) {
+                c.drawCircle(x, y, 20, p);
+        }
 }