[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.254, 1.255 Display.java,
Status: Pre-Alpha
Brought to you by:
henryml
From: rimestad <rim...@us...> - 2007-11-06 18:27:05
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7212/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Display.java Log Message: Removed transformations from a space and removed all of its uses through space. Added a anchor to space to be used with instances. Changed the display code to use that. Added try catch clause arround display.draw to be able to continue using the tool even if the display method throws exceptions Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Display.java 6 Nov 2007 14:02:31 -0000 1.48 --- Display.java 6 Nov 2007 18:27:03 -0000 1.49 *************** *** 40,44 **** import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; - import net.sourceforge.bprocessor.model.TransformStack; import net.sourceforge.bprocessor.model.Vertex; --- 40,43 ---- *************** *** 47,51 **** */ public class Display { - private static final boolean TRUE = true; --- 46,49 ---- *************** *** 1037,1048 **** */ private static void translateToCoordinatesystem(Space space) { ! TransformStack ts = space.getTransformations(); ! Vertex center = ts.transform(new Vertex(0, 0, 0)); ! Vertex i = ts.transform(new Vertex(1, 0, 0)).minus(center); ! Vertex j = ts.transform(new Vertex(0, 1, 0)).minus(center); ! Vertex k = ts.transform(new Vertex(0, 0, 1)).minus(center); ! ! //CoordinateSystem cs = space.getCoordinateSystems().iterator().next(); ! //Vertex translation = cs.center(); gl.glPushMatrix(); double[] matrix = new double[]{ --- 1035,1043 ---- */ private static void translateToCoordinatesystem(Space space) { ! CoordinateSystem cs = space.getInstanceAnchor(); ! Vertex i = cs.getI(); ! Vertex j = cs.getJ(); ! Vertex k = cs.getN(); ! Vertex center = cs.center(); gl.glPushMatrix(); double[] matrix = new double[]{ *************** *** 1052,1056 **** center.getX(), center.getY(), center.getZ(), 1}; gl.glMultMatrixd(matrix, 0); - //gl.glTranslated(translation.getX(), translation.getY(), translation.getZ()); } --- 1047,1050 ---- Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.254 retrieving revision 1.255 diff -C2 -d -r1.254 -r1.255 *** View.java 24 Oct 2007 07:45:10 -0000 1.254 --- View.java 6 Nov 2007 18:27:00 -0000 1.255 *************** *** 20,24 **** import net.sourceforge.bprocessor.model.Constructor; import net.sourceforge.bprocessor.model.CoordinateSystem; - import net.sourceforge.bprocessor.model.AxisRotate; import net.sourceforge.bprocessor.model.Geometric; import net.sourceforge.bprocessor.model.Plane; --- 20,23 ---- *************** *** 26,38 **** import net.sourceforge.bprocessor.model.Edge; import net.sourceforge.bprocessor.model.Project; - import net.sourceforge.bprocessor.model.Rotate; - import net.sourceforge.bprocessor.model.Scale; import net.sourceforge.bprocessor.model.Selection; import net.sourceforge.bprocessor.model.Space; - import net.sourceforge.bprocessor.model.TransformStack; - import net.sourceforge.bprocessor.model.Translate; import net.sourceforge.bprocessor.model.Vertex; import net.sourceforge.bprocessor.model.Surface; - import net.sourceforge.bprocessor.model.Transform; import java.util.ArrayList; --- 25,32 ---- *************** *** 644,648 **** Display.extras(extras); Display.glos(glObjects3D); ! Display.draw(gld, gl, glu); Display.selecting(false); Display.intersecting(false); --- 638,646 ---- Display.extras(extras); Display.glos(glObjects3D); ! try { ! Display.draw(gld, gl, glu); ! } catch (Exception e) { ! e.printStackTrace(); ! } Display.selecting(false); Display.intersecting(false); *************** *** 877,923 **** /** - * - * @param space Space - */ - public void transformTo(Space space) { - if (space != null) { - transformTo(space.getOwner()); - transform(space.getTransformations()); - } - } - - /** - * Apply transformations - * @param transformations List of transformations - */ - private void transform(TransformStack transformations) { - Iterator iter = transformations.stack().iterator(); - while (iter.hasNext()) { - Transform current = (Transform) iter.next(); - if (current instanceof Translate) { - Translate translate = (Translate) current; - gl.glTranslated(translate.tx(), translate.ty(), translate.tz()); - } - if (current instanceof Scale) { - Scale scale = (Scale) current; - gl.glScaled(scale.sx(), scale.sy(), scale.sz()); - } - if (current instanceof Rotate) { - Rotate rotate = (Rotate) current; - double xaxis[] = new double[]{1, 0, 0, 0}; - double yaxis[] = new double[]{0, 1, 0, 0}; - double zaxis[] = new double[]{0, 0, 1, 0}; - gl.glRotated(rotate.rz(), zaxis[0], zaxis[1], zaxis[2]); - gl.glRotated(rotate.ry(), yaxis[0], yaxis[1], yaxis[2]); - gl.glRotated(rotate.rx(), xaxis[0], xaxis[1], xaxis[2]); - } - if (current instanceof AxisRotate) { - AxisRotate rotate = (AxisRotate) current; - gl.glRotated(rotate.angle(), rotate.rx(), rotate.ry(), rotate.rz()); - } - } - } - - /** * Draw string at specified position * @param x The x position --- 875,878 ---- |