[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool CameraFlyTool.java,1.5,1.6 AbstractTool.java,1.57,1.58 CameraWalkTool.java,1.3,1.4 CameraTool.java,1.7,1.8

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

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

Modified Files:
	CameraFlyTool.java AbstractTool.java CameraWalkTool.java 
	CameraTool.java 
Log Message:
Now changed are called on project with the camera when one of the camera tools are used.

In abstractTool the drag plane are fixed so that dragging work better

Index: CameraTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraTool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CameraTool.java	25 Jan 2006 14:45:25 -0000	1.7
--- CameraTool.java	11 Feb 2006 17:22:17 -0000	1.8
***************
*** 90,94 ****
          Camera.rotateVertically(c, angleY, pivot);
        }
!       glv.repaint();
      }
    }
--- 90,94 ----
          Camera.rotateVertically(c, angleY, pivot);
        }
!       Project.getInstance().changed(c);
      }
    }

Index: CameraWalkTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraWalkTool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CameraWalkTool.java	25 Jan 2006 14:45:25 -0000	1.3
--- CameraWalkTool.java	11 Feb 2006 17:22:17 -0000	1.4
***************
*** 53,56 ****
--- 53,57 ----
        Camera.rotateHorizontallyEye(c, -angleX);
        Camera.rotateVerticallyEye(c, angleY);
+       Project.getInstance().changed(c);
      }
    }
***************
*** 96,100 ****
        super.keyPressed(e);
      }
!     glv.repaint(true);
    }
  }
--- 97,101 ----
        super.keyPressed(e);
      }
!     Project.getInstance().changed(c);
    }
  }

Index: CameraFlyTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraFlyTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CameraFlyTool.java	25 Jan 2006 14:45:25 -0000	1.5
--- CameraFlyTool.java	11 Feb 2006 17:22:17 -0000	1.6
***************
*** 53,56 ****
--- 53,57 ----
        Camera.rotateHorizontallyEye(c, -angleX);
        Camera.rotateVerticallyEye(c, angleY);
+       Project.getInstance().changed(c);
      }
    }
***************
*** 96,100 ****
        super.keyPressed(e);
      }
!     glv.repaint(true);
    }
  }
--- 97,101 ----
        super.keyPressed(e);
      }
!     Project.getInstance().changed(c);
    }
  }

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** AbstractTool.java	30 Jan 2006 11:32:52 -0000	1.57
--- AbstractTool.java	11 Feb 2006 17:22:17 -0000	1.58
***************
*** 262,274 ****
          dz *= 1 / sqr;
        }
        Vertex first = view.toPlaneCoords(new double[] {previousPos[0],
                                                        previousPos[1]}, 
!                                                       new Plane(dx, dy, dz, 0));
        Vertex second = view.toPlaneCoords(new double[] {e.getX(),
                                                         e.getY()}, 
!                                                        new Plane(dx, dy, dz, 0));
        c.translate(new double[] {first.getX() - second.getX(), 
                                     first.getY() - second.getY(), 
                                     first.getZ() - second.getZ()});
      } else {
        dragged(e);
--- 262,276 ----
          dz *= 1 / sqr;
        }
+       double d = -dx * center[0] - dy * center[1] - dz * center[2];
        Vertex first = view.toPlaneCoords(new double[] {previousPos[0],
                                                        previousPos[1]}, 
!                                                       new Plane(dx, dy, dz, d));
        Vertex second = view.toPlaneCoords(new double[] {e.getX(),
                                                         e.getY()}, 
!                                                        new Plane(dx, dy, dz, d));
        c.translate(new double[] {first.getX() - second.getX(), 
                                     first.getY() - second.getY(), 
                                     first.getZ() - second.getZ()});
+       Project.getInstance().changed(c);
      } else {
        dragged(e);
***************
*** 432,440 ****
        Vertex yDir = new Vertex(0, 1, 0);
        Vertex zDir = new Vertex(0, 0, 1);
!       double[] center = glv.getView().getCamera().getCenter();
!       double[] camera = glv.getView().getCamera().getCamera();
!       Vertex cameraDir = new Vertex(center[0] - camera[0],
!                                     center[1] - camera[1],
!                                     center[2] - camera[2]);
        
        Edge x = new Edge(xAxis.getFrom().add(v),
--- 434,443 ----
        Vertex yDir = new Vertex(0, 1, 0);
        Vertex zDir = new Vertex(0, 0, 1);
!       Camera camera = Project.getInstance().getCurrentCamera();
!       double[] center = camera.getCenter();
!       double[] eye = camera.getCamera();
!       Vertex cameraDir = new Vertex(center[0] - eye[0],
!                                     center[1] - eye[1],
!                                     center[2] - eye[2]);
        
        Edge x = new Edge(xAxis.getFrom().add(v),