[Arianne-commits] marboard/src/net/sf/arianne/marboard/client/entity/shape StraightLine.java, 1.5, 1.6

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/marboard/src/net/sf/arianne/marboard/client/entity/shape
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15920/src/net/sf/arianne/marboard/client/entity/shape

Modified Files:
	StraightLine.java 
Log Message:
implemented isAt

Index: StraightLine.java
===================================================================
RCS file: /cvsroot/arianne/marboard/src/net/sf/arianne/marboard/client/entity/shape/StraightLine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StraightLine.java	6 Sep 2009 09:53:59 -0000	1.5
--- StraightLine.java	10 Sep 2009 21:30:15 -0000	1.6
***************
*** 4,7 ****
--- 4,8 ----
  import java.awt.Color;
  import java.awt.Graphics2D;
+ import java.awt.geom.Line2D;
  
  import marauroa.common.game.RPObject;
***************
*** 17,31 ****
  		graphics.setColor(new Color(rpobject.getInt("color"), true));
  		graphics.setStroke(new BasicStroke(rpobject.getInt("thickness")));
! 		int startX = rpobject.getInt("x");
! 		int startY = rpobject.getInt("y");
! 		int directionX = rpobject.getInt("x2");
! 		int directionY = rpobject.getInt("y2");
! 		graphics.drawLine(startX, startY, directionX, directionY);
  	}
  
  	@Override
  	public boolean isAt(int x, int y) {
! 		// TODO Auto-generated method stub
! 		return false;
  	}
  	
--- 18,37 ----
  		graphics.setColor(new Color(rpobject.getInt("color"), true));
  		graphics.setStroke(new BasicStroke(rpobject.getInt("thickness")));
! 		int x1 = rpobject.getInt("x");
! 		int y1 = rpobject.getInt("y");
! 		int x2 = rpobject.getInt("x2");
! 		int y2 = rpobject.getInt("y2");
! 		graphics.drawLine(x1, y1, x2, y2);
  	}
  
  	@Override
  	public boolean isAt(int x, int y) {
! 		int x1 = rpobject.getInt("x");
! 		int y1 = rpobject.getInt("y");
! 		int x2 = rpobject.getInt("x2");
! 		int y2 = rpobject.getInt("y2");
! 		int thickness = rpobject.getInt("thickness"); 
! 		Line2D line = new Line2D.Float(x1, y1, x2, y2);
! 		return line.intersects(x, y, thickness, thickness);
  	}