[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.69, 1.70 MoveTool.java, 1.57, 1.58 ToolFactory.java, 1.44, 1.45 ClipplaneTool.java, 1.6, 1.7 RotationTool.java, 1.13, 1.14 SelectTool.java, 1.57, 1.58

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

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

Modified Files:
	AbstractTool.java MoveTool.java ToolFactory.java 
	ClipplaneTool.java RotationTool.java SelectTool.java 
Log Message:
Refactored clippingplanes to the model (still needs to do xml saving along with camera as well as display them on the attribute view) and changed the storing of clipping planes to the camera instead of View...

Index: MoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** MoveTool.java	15 May 2006 14:55:41 -0000	1.57
--- MoveTool.java	6 Jun 2006 09:22:25 -0000	1.58
***************
*** 8,14 ****
  
  import net.sourceforge.bprocessor.gl.GLView;
- import net.sourceforge.bprocessor.gl.model.ClippingPlane;
  import net.sourceforge.bprocessor.gl.model.Intersection;
  
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;
--- 8,14 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
  import net.sourceforge.bprocessor.gl.model.Intersection;
  
+ import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;

Index: ClipplaneTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ClipplaneTool.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ClipplaneTool.java	22 Feb 2006 09:02:45 -0000	1.6
--- ClipplaneTool.java	6 Jun 2006 09:22:25 -0000	1.7
***************
*** 8,13 ****
  
  import net.sourceforge.bprocessor.gl.GLView;
! import net.sourceforge.bprocessor.gl.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
--- 8,14 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
! import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.CoordinateSystem;
+ import net.sourceforge.bprocessor.model.Project;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 59,63 ****
          
          ClippingPlane cp = new ClippingPlane(system);
!         (glv.getView()).addClippingPlane(cp);
        }
      }
--- 60,67 ----
          
          ClippingPlane cp = new ClippingPlane(system);
!         if (Project.getInstance().getCurrentCamera().getClipplanes().size() < 
!             glv.getView().getMaxClipPlanes()) {
!           Project.getInstance().getCurrentCamera().addClipplane(cp);
!         }
        }
      }

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** ToolFactory.java	23 May 2006 16:41:44 -0000	1.44
--- ToolFactory.java	6 Jun 2006 09:22:25 -0000	1.45
***************
*** 183,187 ****
      move.setStrategy(vectorStrategy);
      rotation = new RotationTool(glv, pencilcursor);
!     extrusion = new ExtrudeTool(glv, pencilcursor);
      clipplane = new ClipplaneTool(glv, pencilcursor);
      tapeMeasure = new TapeMeasureTool(glv, pencilcursor);
--- 183,187 ----
      move.setStrategy(vectorStrategy);
      rotation = new RotationTool(glv, pencilcursor);
!     extrusion = new MultiExtrudeTool(glv, pencilcursor);
      clipplane = new ClipplaneTool(glv, pencilcursor);
      tapeMeasure = new TapeMeasureTool(glv, pencilcursor);

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** SelectTool.java	22 Mar 2006 10:53:23 -0000	1.57
--- SelectTool.java	6 Jun 2006 09:22:25 -0000	1.58
***************
*** 8,15 ****
  
  import net.sourceforge.bprocessor.gl.GLView;
- import net.sourceforge.bprocessor.gl.model.ClippingPlane;
  import net.sourceforge.bprocessor.gl.view.Transformation;
  import net.sourceforge.bprocessor.gl.view.View;
  
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;
--- 8,15 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
  import net.sourceforge.bprocessor.gl.view.Transformation;
  import net.sourceforge.bprocessor.gl.view.View;
  
+ import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;
***************
*** 200,204 ****
            vertices.add((Vertex) selected);
          } else if (selected instanceof ClippingPlane) {
!           glv.getView().removeClippingPlane((ClippingPlane)selected);
          }
        }
--- 200,204 ----
            vertices.add((Vertex) selected);
          } else if (selected instanceof ClippingPlane) {
!           Project.getInstance().getCurrentCamera().removeClipplane((ClippingPlane)selected);
          }
        }

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** AbstractTool.java	19 Apr 2006 16:13:54 -0000	1.69
--- AbstractTool.java	6 Jun 2006 09:22:25 -0000	1.70
***************
*** 8,11 ****
--- 8,12 ----
  
  import net.sourceforge.bprocessor.model.Camera;
+ import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Entity;
***************
*** 18,22 ****
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
- import net.sourceforge.bprocessor.gl.model.ClippingPlane;
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.gl.GLView;
--- 19,22 ----

Index: RotationTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RotationTool.java	12 Mar 2006 12:33:01 -0000	1.13
--- RotationTool.java	6 Jun 2006 09:22:25 -0000	1.14
***************
*** 8,13 ****
  
  import net.sourceforge.bprocessor.gl.GLView;
- import net.sourceforge.bprocessor.gl.model.ClippingPlane;
  
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Entity;
--- 8,13 ----
  
  import net.sourceforge.bprocessor.gl.GLView;
  
+ import net.sourceforge.bprocessor.model.ClippingPlane;
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Entity;