[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java,1.55,1.56 CatmullClark.java,1.4,1.5

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23724/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	AbstractTool.java CatmullClark.java 
Log Message:
Changed the use of center method to Entity 

Index: CatmullClark.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CatmullClark.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CatmullClark.java	19 Dec 2005 07:51:30 -0000	1.4
--- CatmullClark.java	27 Jan 2006 11:42:47 -0000	1.5
***************
*** 372,377 ****
        while (iter.hasNext()) {
          Edge current = (Edge) iter.next();
!         double[] values = current.center();
!         Vertex center = new Vertex(values[0], values[1], values[2]);
          edgepoints.add(center);
          edgemap.put(current, center);
--- 372,376 ----
        while (iter.hasNext()) {
          Edge current = (Edge) iter.next();
!         Vertex center = current.center();
          edgepoints.add(center);
          edgemap.put(current, center);

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** AbstractTool.java	25 Jan 2006 14:45:25 -0000	1.55
--- AbstractTool.java	27 Jan 2006 11:42:47 -0000	1.56
***************
*** 9,12 ****
--- 9,13 ----
  import net.sourceforge.bprocessor.model.Camera;
  import net.sourceforge.bprocessor.model.Edge;
+ import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Project;
***************
*** 137,147 ****
      if (it.hasNext()) {
        Object o = it.next();
!       if (o instanceof Surface) {
!         Vertex v = ((Surface)o).center();
!         center = new double[] {v.getX(), v.getY(), v.getZ()};
!       } else if (o instanceof Edge) {
!         center = ((Edge)o).center();
!       } else if (o instanceof Vertex) {
!         Vertex v = (Vertex)o;
          center = new double[] {v.getX(), v.getY(), v.getZ()};
        }
--- 138,143 ----
      if (it.hasNext()) {
        Object o = it.next();
!       if (o instanceof Entity) {
!         Vertex v = ((Entity)o).center();
          center = new double[] {v.getX(), v.getY(), v.getZ()};
        }
***************
*** 212,216 ****
          glv.changeTool(Tool.MOVE_TOOL);
        } else if (e.getKeyCode() == KeyEvent.VK_R) {
!         glv.changeTool(Tool.ROTATION_TOOL);
        } else if (e.getKeyCode() == KeyEvent.VK_E) {
          glv.changeTool(Tool.EXTRUSION_TOOL);
--- 208,212 ----
          glv.changeTool(Tool.MOVE_TOOL);
        } else if (e.getKeyCode() == KeyEvent.VK_R) {
!         glv.changeTool(Tool.CAMERA_TOOL);
        } else if (e.getKeyCode() == KeyEvent.VK_E) {
          glv.changeTool(Tool.EXTRUSION_TOOL);