Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2288/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java
Log Message:
Now the main coordinatesystem keeps size even when it is moved
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** View.java 23 Jul 2006 09:17:44 -0000 1.121
--- View.java 24 Jul 2006 13:42:34 -0000 1.122
***************
*** 533,542 ****
// grid and coords are always completely lit
gl.glLineWidth(1.0f);
! grid(Project.getInstance().getActiveCoordinateSystem());
Camera camera = Project.getInstance().getCurrentCamera();
double scale = (camera.getFocalwidth() / 65) * (500 / height);
! drawCoordinateSystem(Project.getInstance().getActiveCoordinateSystem(),
! camera.dist() * scale, true);
Iterator clipit = Project.getInstance().getCurrentCamera().getClipplanes().iterator();
--- 533,543 ----
// grid and coords are always completely lit
gl.glLineWidth(1.0f);
! CoordinateSystem cs = Project.getInstance().getActiveCoordinateSystem();
! grid(cs);
Camera camera = Project.getInstance().getCurrentCamera();
double scale = (camera.getFocalwidth() / 65) * (500 / height);
! drawCoordinateSystem(cs,
! ((new Vertex(camera.getCamera())).minus(cs.center())).length() * scale, true);
Iterator clipit = Project.getInstance().getCurrentCamera().getClipplanes().iterator();
***************
*** 1119,1124 ****
gl.glPushMatrix();
gl.glTranslated(to.getX(), to.getY(), to.getZ());
! gl.glRotated(Math.toDegrees(Geometry.degreesAboutZ(d)), 0, 0, 1);
! gl.glRotated(-Math.toDegrees(Geometry.degreesAboutY(d)), 0, 1, 0);
gl.glRotated(90, 0, 1, 0);
glu.gluCylinder(quad, (dist / 90), 0, (dist / 20), 10, 10);
--- 1120,1125 ----
gl.glPushMatrix();
gl.glTranslated(to.getX(), to.getY(), to.getZ());
! gl.glRotated(Math.toDegrees(Geometry.degreesAboutZ(direction)), 0, 0, 1);
! gl.glRotated(-Math.toDegrees(Geometry.degreesAboutY(direction)), 0, 1, 0);
gl.glRotated(90, 0, 1, 0);
glu.gluCylinder(quad, (dist / 90), 0, (dist / 20), 10, 10);
|
