[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ToolFactory.java, 1.63, 1.64 ClipplaneTool.java, 1.9, 1.10

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

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

Modified Files:
	ToolFactory.java ClipplaneTool.java 
Log Message:
changes to clippingplane tool and visualization

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** ToolFactory.java	31 Oct 2006 14:22:46 -0000	1.63
--- ToolFactory.java	7 Nov 2006 10:51:19 -0000	1.64
***************
*** 236,262 ****
      
      tb.addSeparator(10);     
! 
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
!         public void actionPerformed(ActionEvent agr0) {
!           Project.getInstance().getCurrentCamera().setType(Camera.ORTHOGRAPHIC);
!           glv.repaint();
!         }
!       };
! 
      Action perspAction = new ToolAction(glv, 0, "Bpers.gif") {
!         public void actionPerformed(ActionEvent agr0) {
!           Project.getInstance().getCurrentCamera().setType(Camera.PERSPECTIVE);
!           glv.repaint();
!         }
!       };
      
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
      perspBut.setToolTipText("Perspective");
!     perspBut.setMnemonic(KeyEvent.VK_J);
      viewGroup.add(perspBut);
      JToggleButton orthoBut = Toolbar.getInstance().registerAction(orthoAction);
      orthoBut.setToolTipText("Orthographic");
!     orthoBut.setMnemonic(KeyEvent.VK_K);
      viewGroup.add(orthoBut);
      perspBut.setSelected(true);
--- 236,291 ----
      
      tb.addSeparator(10);     
!     
      Action orthoAction = new ToolAction(glv, 0, "Borto.gif") {
!       public void actionPerformed(ActionEvent agr0) {
!         Project.getInstance().getCurrentCamera().setType(Camera.ORTHOGRAPHIC);
!         glv.repaint();
!       }
!     };
!     
      Action perspAction = new ToolAction(glv, 0, "Bpers.gif") {
!       public void actionPerformed(ActionEvent agr0) {
!         Project.getInstance().getCurrentCamera().setType(Camera.PERSPECTIVE);
!         glv.repaint();
!       }
!     };
!     
!     Action topAction = new ToolAction(glv, 0, "xyicon.png") {
!       public void actionPerformed(ActionEvent arg0) {
!         Camera.makeTop(Project.getInstance().getCurrentCamera());
!         glv.repaint();
!       }
!     };
!     Action butAction = new ToolAction(glv, 0, "xyicon.png") {
!       public void actionPerformed(ActionEvent arg0) {
!         Camera.makeButtom(Project.getInstance().getCurrentCamera());
!         glv.repaint();
!       }
!     };
!     Action leftAction = new ToolAction(glv, 0, "xzicon.png") {
!       public void actionPerformed(ActionEvent arg0) {
!         Camera.makeLeft(Project.getInstance().getCurrentCamera());
!         glv.repaint();
!       }
!     };
!     Action rightAction = new ToolAction(glv, 0, "xzicon.png") {
!       public void actionPerformed(ActionEvent arg0) {
!         Camera.makeRight(Project.getInstance().getCurrentCamera());
!         glv.repaint();
!       }
!     };
!     Toolbar.getInstance().registerPushButtonAction(topAction, "See from above");
!     Toolbar.getInstance().registerPushButtonAction(butAction, "See from below");
!     Toolbar.getInstance().registerPushButtonAction(leftAction, "See from left");
!     Toolbar.getInstance().registerPushButtonAction(rightAction, "See from right");
      
      ButtonGroup viewGroup = new ButtonGroup();
      JToggleButton perspBut = Toolbar.getInstance().registerAction(perspAction);
      perspBut.setToolTipText("Perspective");
!     perspBut.setMnemonic(KeyEvent.VK_P);
      viewGroup.add(perspBut);
      JToggleButton orthoBut = Toolbar.getInstance().registerAction(orthoAction);
      orthoBut.setToolTipText("Orthographic");
!     orthoBut.setMnemonic(KeyEvent.VK_O);
      viewGroup.add(orthoBut);
      perspBut.setSelected(true);

Index: ClipplaneTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ClipplaneTool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ClipplaneTool.java	4 Jul 2006 09:37:00 -0000	1.9
--- ClipplaneTool.java	7 Nov 2006 10:51:19 -0000	1.10
***************
*** 49,60 ****
          Vertex i = system.getI();
          Vertex j = system.getJ();
!         Vertex o = system.getOrigin();
          boolean front = glv.getView().facingFront(system);
          if (front) {
            n.scale(-1);
          }
-         Vertex v = n.copy();
-         v.scale(0.001);
-         o = o.add(v);
          system = new CoordinateSystem(i, j, n, o);
          
--- 49,57 ----
          Vertex i = system.getI();
          Vertex j = system.getJ();
!         Vertex o = system.getOrigin().copy();
          boolean front = glv.getView().facingFront(system);
          if (front) {
            n.scale(-1);
          }
          system = new CoordinateSystem(i, j, n, o);