[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view Display.java, 1.47, 1.48
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2007-11-06 14:02:38
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24945/src/net/sourceforge/bprocessor/gl/view Modified Files: Display.java Log Message: group mechanism implemented, that moves geometry into a space Index: Display.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Display.java 5 Nov 2007 18:12:12 -0000 1.47 --- Display.java 6 Nov 2007 14:02:31 -0000 1.48 *************** *** 98,102 **** new HashMap<Geometric, Integer>(); ! private static final boolean USEDL = false; /** --- 98,102 ---- new HashMap<Geometric, Integer>(); ! private static final boolean USEDL = true; /** *************** *** 780,787 **** } ! private static boolean hidden(Surface surface) { ! Space front = surface.getFrontDomain(); ! Space back = surface.getBackDomain(); ! return hidden(front) && hidden(back); } --- 780,793 ---- } ! private static boolean active(Space space) { ! if (space == null) { ! return false; ! } else if (space == active) { ! return true; ! } else if (space.getEnvelope().isEmpty()) { ! return active(space.getOwner()); ! } else { ! return false; ! } } *************** *** 797,808 **** return; } else { - //if there aint any start generation of one index = gl.glGenLists(1); displayListsSelecting.put(space, index); - System.out.println(index + " for " + space); gl.glNewList(index, GL.GL_COMPILE_AND_EXECUTE); } } else { - //Locate displaylist for space and draw it Integer index = displayLists.get(space); if (index != null) { --- 803,811 ---- *************** *** 810,817 **** return; } else { - //if there aint any start generation of one index = gl.glGenLists(1); displayLists.put(space, index); - System.out.println(index + " for " + space); gl.glNewList(index, GL.GL_COMPILE_AND_EXECUTE); } --- 813,818 ---- *************** *** 831,839 **** if (selecting) { if (!intersecting && transparency) { ! if (space == active) { ! interior = true; ! } else { ! interior = false; ! } } else { interior = true; --- 832,836 ---- if (selecting) { if (!intersecting && transparency) { ! interior = active(space); } else { interior = true; |