[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.143, 1.144 OrbitStrategy.java, 1.5, 1.6 CatmullClarkActionListener.java, 1.2, NONE CatmullClark.java, 1.8, NONE

[Michael L. <he...@us...>]

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

Modified Files:
	AbstractTool.java OrbitStrategy.java 
Removed Files:
	CatmullClarkActionListener.java CatmullClark.java 
Log Message:
Cleanup

Index: OrbitStrategy.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/OrbitStrategy.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OrbitStrategy.java	18 Nov 2007 21:30:17 -0000	1.5
--- OrbitStrategy.java	12 Dec 2007 15:07:01 -0000	1.6
***************
*** 8,12 ****
  
  import net.sourceforge.bprocessor.gl.Editor;
- import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Camera;
  import net.sourceforge.bprocessor.model.Project;
--- 8,11 ----
***************
*** 64,78 ****
     */
    public void dragged(MouseEvent e) {
-     View view = editor.getView();
      Camera c = Project.getInstance().getCurrentCamera();
-     double[] roll = c.getRoll();
      if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 
                  MouseEvent.BUTTON1_DOWN_MASK || e.getButton() == MouseEvent.BUTTON1) {
        double angleX = ((double)(e.getX() - x) / 360) * Math.PI;
        double angleY = ((double)(e.getY() - y) / 360) * Math.PI;
-       double turn = 1;
-       if (roll[2] < 0) {
-         turn = -1;
-       }
        
        if (e.isShiftDown()) {
--- 63,71 ----
***************
*** 84,93 ****
          Camera.rotateVerticallyEye(c, angleY);
        } else {
!         // rotate camera about point of view (or selection if any)
!         double[] pivot = AbstractTool.selectionCenter();
          Camera.rotateHorizontally(c, -angleX, pivot);
          Camera.rotateVertically(c, angleY, pivot);
        }
-       //Project.getInstance().changed(c);
        x = e.getX();
        y = e.getY();
--- 77,85 ----
          Camera.rotateVerticallyEye(c, angleY);
        } else {
!         // rotate camera about point of view
!         double[] pivot = c.getCenter();
          Camera.rotateHorizontally(c, -angleX, pivot);
          Camera.rotateVertically(c, angleY, pivot);
        }
        x = e.getX();
        y = e.getY();

--- CatmullClark.java DELETED ---

--- CatmullClarkActionListener.java DELETED ---

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** AbstractTool.java	12 Dec 2007 12:48:27 -0000	1.143
--- AbstractTool.java	12 Dec 2007 15:07:01 -0000	1.144
***************
*** 232,253 ****
    
    /**
-    * Calculate the center of the selection
-    * TODO calculate the average..
-    * @return The center of the selection
-    */
-   public static double[] selectionCenter() {
-     double[] center = Project.getInstance().getCurrentCamera().getCenter();
-     Iterator it = Selection.primary().iterator();
-     if (it.hasNext()) {
-       Object o = it.next();
-       if (o instanceof Geometric) {
-         Vertex v = ((Geometric)o).center();
-         center = new double[] {v.getX(), v.getY(), v.getZ()};
-       }
-     }
-     return center;
-   }
-   
-   /**
     * Sets the tip in the tip-panel
     * @param tip the tip
--- 232,235 ----