Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24213/src/net/sourceforge/bprocessor/gl
Modified Files:
GLView.java
Log Message:
Now all tools take the camera from Project
Index: GLView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/GLView.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** GLView.java 6 Jan 2006 15:36:14 -0000 1.33
--- GLView.java 25 Jan 2006 14:45:25 -0000 1.34
***************
*** 10,15 ****
import net.sourceforge.bprocessor.gl.tool.ToolFactory;
import net.sourceforge.bprocessor.gl.view.View;
- import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Camera;
import net.sourceforge.bprocessor.model.Observer;
import net.sourceforge.bprocessor.model.Project;
--- 10,15 ----
import net.sourceforge.bprocessor.gl.tool.ToolFactory;
import net.sourceforge.bprocessor.gl.view.View;
import net.sourceforge.bprocessor.model.Camera;
+ import net.sourceforge.bprocessor.model.Edge;
import net.sourceforge.bprocessor.model.Observer;
import net.sourceforge.bprocessor.model.Project;
***************
*** 87,91 ****
jp.add(lengthPanel, BorderLayout.SOUTH);
! view = new View(this, Camera.create(Camera.VIEW_3D));
glc.addGLEventListener(view);
--- 87,91 ----
jp.add(lengthPanel, BorderLayout.SOUTH);
! view = new View(this, Project.getInstance().getCurrentCamera());
glc.addGLEventListener(view);
***************
*** 140,143 ****
--- 140,144 ----
glc.setCursor(cursor);
}
+
/**
* Change the tool
***************
*** 167,179 ****
/**
- * Change the camera
- * @param c The camera
- */
- public void changeCamera(Camera c) {
- view.changeCamera(c);
- this.repaint(true);
- }
-
- /**
* Repaint the canvas
*/
--- 168,171 ----
***************
*** 347,350 ****
--- 339,345 ----
if (entity == Selection.primary()) {
repaint();
+ } else if (entity instanceof Camera) {
+ getView().setCamera((Camera)entity);
+ repaint();
} else {
repaint();
|