[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view Display.java, 1.104, 1.105

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18592/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	Display.java 
Log Message:


Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** Display.java	9 Mar 2010 13:24:25 -0000	1.104
--- Display.java	9 Mar 2010 14:04:23 -0000	1.105
***************
*** 1288,1292 ****
    }
  
!   private static void hilite(Collection<Geometric> geometrics) {
      enable(GL.GL_DEPTH_TEST);
      
--- 1288,1292 ----
    }
  
!   private static void hiliteSpaces(Collection<Geometric> geometrics) {
      enable(GL.GL_DEPTH_TEST);
      
***************
*** 1329,1333 ****
--- 1329,1335 ----
      disable(GL.GL_POLYGON_STIPPLE);
      disable(GL.GL_DEPTH_TEST);
+   }
  
+   private static void hiliteVertices(Collection<Geometric> geometrics) {
      for (Geometric current : geometrics) {
        if (current instanceof Vertex) {
***************
*** 1349,1353 ****
    }
  
- 
    private static void draw(Grid grid) {
      CoordinateSystem system = Project.getInstance().getActiveCoordinateSystem();
--- 1351,1354 ----
***************
*** 1430,1456 ****
      grid = world.getGrid();
      
      if (!selecting()) {
        disableClipplanes();
!       Collection<Geometric> geometrics = new HashSet();
        geometrics.addAll(Selection.primary());
        if (target != null) {
!         Collection<Geometric> hilite = new HashSet();
!         hilite.add(target);
!         hilite(hilite);
!       }
!       if (active.isInstance()) {
!         gl.glPushMatrix();
!         translateToCoordinatesystem((Instance) active);
!       }
! 
!       hilite(geometrics);
! 
!       if (active.isInstance()) {
!         gl.glPopMatrix();
        }
        enableClipplanes();
      }
      
      draw(world, world == active);
  
      {
--- 1431,1454 ----
      grid = world.getGrid();
      
+     Collection<Geometric> geometrics = new HashSet();
+     
      if (!selecting()) {
        disableClipplanes();
!       
        geometrics.addAll(Selection.primary());
        if (target != null) {
!         geometrics.add(target);
        }
+       hiliteSpaces(geometrics);
        enableClipplanes();
      }
      
      draw(world, world == active);
+     
+     if (!selecting()) {
+       disableClipplanes();
+       hiliteVertices(geometrics);
+       enableClipplanes();
+     }
  
      {