[Arianne-commits] stendhal/src/games/stendhal/client GameScreen.java, 1.139, 1.140 IGameScreen.java, 1.19, 1.20

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18337/src/games/stendhal/client

Modified Files:
	GameScreen.java IGameScreen.java 
Log Message:
removed some coordinate transformations that are no longer needed


Index: IGameScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/IGameScreen.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** IGameScreen.java	10 Jan 2010 20:02:02 -0000	1.19
--- IGameScreen.java	13 Jan 2010 21:37:48 -0000	1.20
***************
*** 10,16 ****
  import java.awt.Graphics;
  import java.awt.Point;
- import java.awt.Rectangle;
  import java.awt.geom.Point2D;
- import java.awt.geom.Rectangle2D;
  
  public interface IGameScreen {
--- 10,14 ----
***************
*** 165,189 ****
  
  	/**
- 	 * Convert world coordinates to screen coordinates.
- 	 *
- 	 * @param wrect
- 	 *            World area.
- 	 *
- 	 * @return Screen rectangle (in integer values).
- 	 */
- 	Rectangle convertWorldToScreenView(Rectangle2D wrect);
- 
- 	/**
- 	 * Determine if an area is in the screen view.
- 	 *
- 	 * @param srect
- 	 *            Screen area.
- 	 *
- 	 * @return <code>true</code> if some part of area in in the visible
- 	 *         screen, otherwise <code>false</code>.
- 	 */
- 	boolean isInScreen(Rectangle srect);
- 
- 	/**
  	 * Draws a sprite in screen given its world coordinates.
  	 * 
--- 163,166 ----
***************
*** 201,214 ****
  
  	/**
- 	 * Convert a world unit value to a screen unit value.
- 	 *
- 	 * @param w
- 	 *            World value.
- 	 *
- 	 * @return A screen value (in pixels).
- 	 */
- 	int convertWorldToScreen(double w);
- 
- 	/**
  	 * Convert screen view coordinates to world coordinates.
  	 *
--- 178,181 ----

Index: GameScreen.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/GameScreen.java,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** GameScreen.java	13 Jan 2010 21:17:05 -0000	1.139
--- GameScreen.java	13 Jan 2010 21:37:48 -0000	1.140
***************
*** 37,41 ****
  import java.awt.event.ComponentListener;
  import java.awt.geom.Point2D;
- import java.awt.geom.Rectangle2D;
  import java.awt.image.BufferStrategy;
  import java.util.Collections;
--- 37,40 ----
***************
*** 958,1021 ****
  	 * (non-Javadoc)
  	 *
- 	 * @see games.stendhal.client.IGameScreen#convertWorldToScreenView(java.awt.geom.Rectangle2D)
- 	 */
- 	public Rectangle convertWorldToScreenView(final Rectangle2D wrect) {
- 		return convertWorldToScreenView(wrect.getX(), wrect.getY(),
- 				wrect.getWidth(), wrect.getHeight());
- 	}
- 
- 	/**
- 	 * Convert world coordinates to screen coordinates.
- 	 *
- 	 * @param wx
- 	 *            World X coordinate.
- 	 * @param wy
- 	 *            World Y coordinate.
- 	 * @param wwidth
- 	 *            World area width.
- 	 * @param wheight
- 	 *            World area height.
- 	 *
- 	 * @return Screen rectangle (in integer values).
- 	 */
- 	private Rectangle convertWorldToScreenView(final double wx, final double wy,
- 			final double wwidth, final double wheight) {
- 		return new Rectangle(convertWorldXToScreenView(wx),
- 				convertWorldYToScreenView(wy),
- 				(int) (wwidth * SIZE_UNIT_PIXELS),
- 				(int) (wheight * SIZE_UNIT_PIXELS));
- 	}
- 
- 	/*
- 	 * (non-Javadoc)
- 	 *
- 	 * @see games.stendhal.client.IGameScreen#isInScreen(java.awt.Rectangle)
- 	 */
- 	public boolean isInScreen(final Rectangle srect) {
- 		return isInScreen(srect.x, srect.y, srect.width, srect.height);
- 	}
- 
- 	/**
- 	 * Determine if an area is in the screen view.
- 	 *
- 	 * @param sx
- 	 *            Screen X coordinate.
- 	 * @param sy
- 	 *            Screen Y coordinate.
- 	 * @param swidth
- 	 *            Screen area width.
- 	 * @param sheight
- 	 *            Screen area height.
- 	 *
- 	 * @return <code>true</code> if some part of area in in the visible
- 	 *         screen, otherwise <code>false</code>.
- 	 */
- 	private boolean isInScreen(final int sx, final int sy, final int swidth, final int sheight) {
- 		return (((sx >= -swidth) && (sx < sw)) && ((sy >= -sheight) && (sy < sh)));
- 	}
- 
- 	/*
- 	 * (non-Javadoc)
- 	 *
  	 * @see games.stendhal.client.IGameScreen#draw(games.stendhal.client.sprite.Sprite,
  	 *      int, int)
--- 957,960 ----
***************
*** 1045,1054 ****
  	}
  
! 	/*
! 	 * (non-Javadoc)
  	 *
! 	 * @see games.stendhal.client.IGameScreen#convertWorldToScreen(double)
  	 */
! 	public int convertWorldToScreen(final double w) {
  		return (int) (w * SIZE_UNIT_PIXELS);
  	}
--- 984,995 ----
  	}
  
! 	/**
! 	 * Convert a world unit value to a screen unit value.
  	 *
! 	 * @param w World value.
! 	 *
! 	 * @return A screen value (in pixels).
  	 */
! 	private int convertWorldToScreen(final double w) {
  		return (int) (w * SIZE_UNIT_PIXELS);
  	}