Thread: [Nitsloch-svn] SF.net SVN: nitsloch: [104] trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 104
          http://nitsloch.svn.sourceforge.net/nitsloch/?rev=104&view=rev
Author:   ddwatts
Date:     2007-12-06 15:41:23 -0800 (Thu, 06 Dec 2007)

Log Message:
-----------
Move outside view code outside of the GUI layer.

Modified Paths:
--------------
    trunk/makefile
    trunk/src/game/GameWorld.java
    trunk/src/gui/Controller.java
    trunk/src/gui/GameFrame.java

Added Paths:
-----------
    trunk/src/game/OutsideView.java

Removed Paths:
-------------
    trunk/src/gui/RenderOutsideView.java

Modified: trunk/makefile
===================================================================

--- trunk/makefile	2007-12-05 22:45:51 UTC (rev 103)
+++ trunk/makefile	2007-12-06 23:41:23 UTC (rev 104)
@@ -22,7 +22,6 @@
 	$(gui)/GameFrame.java \
 	$(gui)/HospitalShop.java \
 	$(gui)/ItemShop.java \
-	$(gui)/RenderOutsideView.java \
 	$(gui)/UseFrame.java \
 	$(enums)/Armor.java \
 	$(enums)/DamageType.java \
@@ -56,6 +55,7 @@
 	$(game)/Item.java \
 	$(game)/Messages.java \
 	$(game)/NPC.java \
+	$(game)/OutsideView.java \
 	$(game)/Player.java \
 	$(game)/TheGame.java \
 	$(game)/Vehicle.java \

Modified: trunk/src/game/GameWorld.java
===================================================================
--- trunk/src/game/GameWorld.java	2007-12-05 22:45:51 UTC (rev 103)
+++ trunk/src/game/GameWorld.java	2007-12-06 23:41:23 UTC (rev 104)
@@ -41,6 +41,9 @@
 	private int currentLevel;
 	private ArrayList<Land[][]> cities;
 	private Land[][] landArray;
+	
+	private int explodeRow;
+	private int explodeCol;
 
 	// A collection of players for now, to make it easier later
 	// if networking is ever implemented.
@@ -50,6 +53,9 @@
 		players = new ArrayList<Player>();
 		cities = new ArrayList<Land[][]>();
 		currentLevel = 0;
+		
+		explodeRow = -1;
+		explodeCol = -1;
 
 		debugAddCity();
 	}
@@ -518,6 +524,38 @@
 			}
 		}
 	}
+	
+	/**
+	 * Accessor for the explode row for the display.
+	 * @return int : explode row
+	 */
+	public int getExplodeRow(){
+		return explodeRow;
+	}
+	
+	/**
+	 * Accessor for the explode column for the display.
+	 * @return int : explode column
+	 */
+	public int getExplodeCol(){
+		return explodeCol;
+	}
+	
+	/**
+	 * Mutator for explode row.
+	 * @param row int : row
+	 */
+	public void setExplodeRow(int row){
+		explodeRow = row;
+	}
+	
+	/**
+	 * Mutator for explode column.
+	 * @param col int : column
+	 */
+	public void setExplodeCol(int col){
+		explodeCol = col;
+	}
 
 	/**
 	 * Accessor for the current city.

Added: trunk/src/game/OutsideView.java
===================================================================
--- trunk/src/game/OutsideView.java	                        (rev 0)
+++ trunk/src/game/OutsideView.java	2007-12-06 23:41:23 UTC (rev 104)
@@ -0,0 +1,103 @@
+/*	
+	This file is part of NitsLoch.
+
+	Copyright (C) 2007 Darren Watts
+
+    NitsLoch is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    NitsLoch is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with NitsLoch.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package src.game;
+
+import java.awt.image.BufferedImage;
+
+import src.enums.ExplosionImages;
+import src.land.Land;
+import src.scenario.Images;
+
+/**
+ * Class that controls what is to be drawn to the main GUI window
+ * when the player is outside, not looking at the map.
+ * @author Darren Watts
+ * date 12/5/07
+ */
+public class OutsideView {
+
+	/**
+	 * Gets the view that will be drawn to the main GUI window.  Sets
+	 * up the buffered images and returns them to the main window.
+	 * @param worldView Land[][] : the land that is within view of the
+	 * player.
+	 * @return BufferedImage[][] : images for each cell in the main GUI
+	 * window.
+	 */
+	public static BufferedImage[][] getView(Land[][] worldView){
+		int explodeRow = GameWorld.getInstance().getExplodeRow();
+		int explodeCol = GameWorld.getInstance().getExplodeCol();
+		// Draw the explosion, if there is one
+		BufferedImage[][] bufImages = new BufferedImage[src.Constants.WORLD_VIEW_SIZE]
+		                                                [src.Constants.WORLD_VIEW_SIZE];
+		Images images = Images.getInstance();
+		
+		/* 
+		 * Checks the land at each cell within visible range and sets the
+		 * BufferedImage array to the correct image.  If there is an
+		 * explosion, it will overwrite the getImage call for that land
+		 * object with the picture of the explosion.
+		 */
+		for(int row = 0; row < src.Constants.WORLD_VIEW_SIZE; row++){
+			for(int col = 0; col < src.Constants.WORLD_VIEW_SIZE; col++){
+				
+				bufImages[row][col] = images.getImage(worldView[row][col].getImage());
+				
+				if(explodeRow > -1){ // There is an explosion
+					try{
+						bufImages[row][col] = null;
+						if(row == explodeRow-1 && 
+								col == explodeCol-1)
+							bufImages[row][col] = images.getImage(ExplosionImages.NORTHWEST.getImage());//ImageIO.read(new File("images/explosionNW" + Constants.IMG_EXTENSION));
+						else if(row == explodeRow-1 && 
+								col == explodeCol)
+							bufImages[row][col] = images.getImage(ExplosionImages.NORTH.getImage());
+						else if(row == explodeRow-1 && 
+								col == explodeCol+1)
+							bufImages[row][col] = images.getImage(ExplosionImages.NORTHEAST.getImage());
+						else if(row == explodeRow && 
+								col == explodeCol+1)
+							bufImages[row][col] = images.getImage(ExplosionImages.EAST.getImage());
+						else if(row == explodeRow+1 && 
+								col == explodeCol+1)
+							bufImages[row][col] = images.getImage(ExplosionImages.SOUTHEAST.getImage());
+						else if(row == explodeRow+1 && 
+								col == explodeCol)
+							bufImages[row][col] = images.getImage(ExplosionImages.SOUTH.getImage());
+						else if(row == explodeRow+1 && 
+								col == explodeCol-1)
+							bufImages[row][col] = images.getImage(ExplosionImages.SOUTHWEST.getImage());
+						else if(row == explodeRow && 
+								col == explodeCol-1)
+							bufImages[row][col] = images.getImage(ExplosionImages.WEST.getImage());
+						else if(row == explodeRow && 
+								col == explodeCol)
+							bufImages[row][col] = images.getImage(ExplosionImages.CENTER.getImage());
+
+						if(row == 3 && col == 3) bufImages[row][col] = null;
+					} catch(Exception e){
+						System.out.println("Cannot find explosion picture");
+					}
+				}
+			}
+		}
+		return bufImages;
+	}
+}

Modified: trunk/src/gui/Controller.java
===================================================================
--- trunk/src/gui/Controller.java	2007-12-05 22:45:51 UTC (rev 103)
+++ trunk/src/gui/Controller.java	2007-12-06 23:41:23 UTC (rev 104)
@@ -19,12 +19,15 @@
 
 package src.gui;
 
+import java.awt.image.BufferedImage;
+
 import src.land.Land;
 import src.enums.Armor;
 import src.enums.Direction;
 import src.enums.Facing;
 import src.enums.Weapon;
 import src.game.GameWorld;
+import src.game.OutsideView;
 import src.game.TheGame;
 
 /**
@@ -36,8 +39,8 @@
 public class Controller {
 	
 	private GameFrame gf;
-	private int explodeRow;
-	private int explodeCol;
+	//private int explodeRow;
+	//private int explodeCol;
 	
 	/**
 	 * Sets the game frame for this controller.
@@ -45,8 +48,6 @@
 	 */
 	public void setGameFrame(GameFrame frame){
 		gf = frame;
-		explodeRow = -1;
-		explodeCol = -1;
 	}
 	
 	/**
@@ -56,27 +57,17 @@
 	 * @param col itn : column
 	 */
 	public void explode(int row, int col){
-		explodeRow = row;
-		explodeCol = col;
+		GameWorld.getInstance().setExplodeRow(row);
+		GameWorld.getInstance().setExplodeCol(col);
 	}
 	
-	/**
-	 * Accessor for the explode row for the display.
-	 * @return int : explode row
-	 */
-	public int getExplodeRow(){
-		return explodeRow;
+	public BufferedImage[][] getOutsideView(){
+		int row = GameWorld.getInstance().getLocalPlayer().getRow();
+		int col = GameWorld.getInstance().getLocalPlayer().getCol();
+		return OutsideView.getView(GameWorld.getInstance().getGameWorld(row, col));
 	}
 	
 	/**
-	 * Accessor for the explode column for the display.
-	 * @return int : explode column
-	 */
-	public int getExplodeCol(){
-		return explodeCol;
-	}
-	
-	/**
 	 * Checks whether or not the local player is in a dungeon or not.
 	 * @return boolean : in dungeon
 	 */

Modified: trunk/src/gui/GameFrame.java
===================================================================
--- trunk/src/gui/GameFrame.java	2007-12-05 22:45:51 UTC (rev 103)
+++ trunk/src/gui/GameFrame.java	2007-12-06 23:41:23 UTC (rev 104)
@@ -108,7 +108,6 @@
 	private final Polygon SW_POLY = new Polygon(SW_X, SW_Y, 5);
 
 	private Controller controller = null;
-	private RenderOutsideView outside = null;
 	private JPanel jContentPane = null;
 	private JMenuBar jMenuBar = null;
 	private JTextArea messages = null;
@@ -147,7 +146,6 @@
 	public GameFrame(Controller cont){
 		super("NitsLoch");
 		controller = cont;
-		outside = new RenderOutsideView(controller);
 		this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		initialize();
 		readyForInput(jContentPane);
@@ -1303,7 +1301,7 @@
 
 		BufferedImage img = null;
 		// Get the images that should be drawn.
-		BufferedImage[][] bufImages = outside.getView(worldView);
+		BufferedImage[][] bufImages = controller.getOutsideView();
 
 		/*
 		 * Draws the image obtained from the outside view renderer in

Deleted: trunk/src/gui/RenderOutsideView.java
===================================================================
--- trunk/src/gui/RenderOutsideView.java	2007-12-05 22:45:51 UTC (rev 103)
+++ trunk/src/gui/RenderOutsideView.java	2007-12-06 23:41:23 UTC (rev 104)
@@ -1,111 +0,0 @@
-/*	
-	This file is part of NitsLoch.
-
-	Copyright (C) 2007 Darren Watts
-
-    NitsLoch is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    NitsLoch is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with NitsLoch.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package src.gui;
-
-import java.awt.image.BufferedImage;
-
-import src.enums.ExplosionImages;
-import src.land.Land;
-import src.scenario.Images;
-
-/**
- * Class that controls what is to be drawn to the main GUI window
- * when the player is outside, not looking at the map.
- * @author Darren Watts
- * date 12/5/07
- */
-public class RenderOutsideView {
-
-	private Controller controller;
-
-	/**
-	 * Sets up the renderer for the outside view.
-	 * @param control Controller : controller
-	 */
-	public RenderOutsideView(Controller control){
-		controller = control;
-	}
-
-	/**
-	 * Gets the view that will be drawn to the main GUI window.  Sets
-	 * up the buffered images and returns them to the main window.
-	 * @param worldView Land[][] : the land that is within view of the
-	 * player.
-	 * @return BufferedImage[][] : images for each cell in the main GUI
-	 * window.
-	 */
-	public BufferedImage[][] getView(Land[][] worldView){
-		// Draw the explosion, if there is one
-		BufferedImage[][] bufImages = new BufferedImage[src.Constants.WORLD_VIEW_SIZE]
-		                                                [src.Constants.WORLD_VIEW_SIZE];
-		Images images = Images.getInstance();
-		
-		/* 
-		 * Checks the land at each cell within visible range and sets the
-		 * BufferedImage array to the correct image.  If there is an
-		 * explosion, it will overwrite the getImage call for that land
-		 * object with the picture of the explosion.
-		 */
-		for(int row = 0; row < src.Constants.WORLD_VIEW_SIZE; row++){
-			for(int col = 0; col < src.Constants.WORLD_VIEW_SIZE; col++){
-				
-				bufImages[row][col] = images.getImage(worldView[row][col].getImage());
-				
-				if(controller.getExplodeRow() > -1){ // There is an explosion
-					try{
-						bufImages[row][col] = null;
-						if(row == controller.getExplodeRow()-1 && 
-								col == controller.getExplodeCol()-1)
-							bufImages[row][col] = images.getImage(ExplosionImages.NORTHWEST.getImage());//ImageIO.read(new File("images/explosionNW" + Constants.IMG_EXTENSION));
-						else if(row == controller.getExplodeRow()-1 && 
-								col == controller.getExplodeCol())
-							bufImages[row][col] = images.getImage(ExplosionImages.NORTH.getImage());
-						else if(row == controller.getExplodeRow()-1 && 
-								col == controller.getExplodeCol()+1)
-							bufImages[row][col] = images.getImage(ExplosionImages.NORTHEAST.getImage());
-						else if(row == controller.getExplodeRow() && 
-								col == controller.getExplodeCol()+1)
-							bufImages[row][col] = images.getImage(ExplosionImages.EAST.getImage());
-						else if(row == controller.getExplodeRow()+1 && 
-								col == controller.getExplodeCol()+1)
-							bufImages[row][col] = images.getImage(ExplosionImages.SOUTHEAST.getImage());
-						else if(row == controller.getExplodeRow()+1 && 
-								col == controller.getExplodeCol())
-							bufImages[row][col] = images.getImage(ExplosionImages.SOUTH.getImage());
-						else if(row == controller.getExplodeRow()+1 && 
-								col == controller.getExplodeCol()-1)
-							bufImages[row][col] = images.getImage(ExplosionImages.SOUTHWEST.getImage());
-						else if(row == controller.getExplodeRow() && 
-								col == controller.getExplodeCol()-1)
-							bufImages[row][col] = images.getImage(ExplosionImages.WEST.getImage());
-						else if(row == controller.getExplodeRow() && 
-								col == controller.getExplodeCol())
-							bufImages[row][col] = images.getImage(ExplosionImages.CENTER.getImage());
-
-						if(row == 3 && col == 3) bufImages[row][col] = null;
-					} catch(Exception e){
-						System.out.println("Cannot find explosion picture");
-					}
-				}
-			}
-		}
-		return bufImages;
-	}
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Nitsloch-svn] SF.net SVN: nitsloch: [104] trunk

nitsloch-svn