[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view Display.java, 1.64, 1.65
Status: Pre-Alpha
Brought to you by:
henryml
From: rimestad <rim...@us...> - 2007-12-12 10:51:43
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3053/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: translate hilite through all instances not just the active one Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Display.java 7 Dec 2007 14:38:53 -0000 1.64 --- Display.java 12 Dec 2007 10:51:40 -0000 1.65 *************** *** 1136,1153 **** /** ! * @param space */ 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(); ! double[] matrix = new double[]{ ! i.getX(), i.getY(), i.getZ(), 0, ! j.getX(), j.getY(), j.getZ(), 0, ! k.getX(), k.getY(), k.getZ(), 0, ! center.getX(), center.getY(), center.getZ(), 1}; ! gl.glMultMatrixd(matrix, 0); } --- 1136,1166 ---- /** ! * Translate through all spaces till (containing) space ! * @param space The last space in the line of translations */ private static void translateToCoordinatesystem(Space space) { ! List<CoordinateSystem> translation = new LinkedList<CoordinateSystem>(); ! if (space.isInstance()) { ! translation.add(space.getInstanceAnchor()); ! } ! while (space.getOwner() != null) { ! if (space.getOwner().isInstance()) { ! translation.add(0, space.getOwner().getInstanceAnchor()); ! } ! space = space.getOwner(); ! } ! ! for (CoordinateSystem cs : translation) { ! Vertex i = cs.getI(); ! Vertex j = cs.getJ(); ! Vertex k = cs.getN(); ! Vertex center = cs.center(); ! double[] matrix = new double[]{ ! i.getX(), i.getY(), i.getZ(), 0, ! j.getX(), j.getY(), j.getZ(), 0, ! k.getX(), k.getY(), k.getZ(), 0, ! center.getX(), center.getY(), center.getZ(), 1}; ! gl.glMultMatrixd(matrix, 0); ! } } |