Changeset 2e798d9 in advance-wars

Timestamp:

Jan 21, 2011, 4:50:20 AM (14 years ago)

Author:

sdanshinwrt <devnull@…>

Branches:

master

Children:

082b3cd

Parents:

5d9e7bb

Message:

-A simple 6x8 map now gets drawn to the screen, with green and blue tiles

-Added the bin folder to .hgignore

Files:

• .hgignore (added)
• src/com/example/advancewars/GameView.java (modified) (4 diffs)
• src/com/example/advancewars/Map.java (added)
• src/com/example/advancewars/Tile.java (added)

src/com/example/advancewars/GameView.java

@@ -47 +47 @@
 
         /** Paint to draw the lines on screen. */
-        private Paint mLinePaint, mTextPaint, mButtonPaint;
+        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2;
+        
+        private Map mMap;
 
         /** Indicate whether the surface has been created & is ready to draw */
@@ -61 +63 @@
             mHandler = handler;
             mContext = context;
-
-            // Initialize paints for speedometer
+            
             mLinePaint = new Paint();
             mLinePaint.setAntiAlias(true);
@@ -77 +78 @@
             mButtonPaint.setTextSize(20);
             mButtonPaint.setTextAlign(Paint.Align.CENTER);
+            
+            mTilePaint1 = new Paint();
+            mTilePaint1.setAntiAlias(true);
+            mTilePaint1.setARGB(255, 0, 255, 0);
+            
+            mTilePaint2 = new Paint();
+            mTilePaint2.setAntiAlias(true);
+            mTilePaint2.setARGB(255, 0, 0, 255);
+            
+            Tile grassTile = new Tile(mTilePaint1);
+            Tile oceanTile = new Tile(mTilePaint2);
+            
+            mMap = new Map(grassTile, 6, 8);
+            
+            boolean land = true;
+            
+            for(int x=0; x<mMap.getWidth(); x++) {
+                        for(int y=0; y<mMap.getHeight(); y++) {
+                                if(land)
+                                        mMap.setTile(x, y, grassTile);
+                                else
+                                        mMap.setTile(x, y, oceanTile);
+                                land = !land;
+                        }
+                        land = !land;
+            }
             
             mGameState = GameState.YOUR_TURN;
@@ -290 +317 @@
                 Paint.FontMetrics metrics = mTextPaint.getFontMetrics();
                 
-                String text = "Your Total: ";
-                canvas.drawText(text, 40-mTextPaint.measureText(text)/2, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+                mMap.draw(canvas, 10, 25);
                 
-                text = "Dealer Total: ";
-                canvas.drawText(text, 125-mTextPaint.measureText(text)/2, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
-                
-                text = mPlayerWins+" wins - "+mPlayerLosses+" losses";
-                canvas.drawText(text, 270-mTextPaint.measureText(text)/2, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+                String text = "Advance Wars grid test";
+                canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
         }