[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.176, 1.177

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14692/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	View.java 
Log Message:
Refactored 2d overlay drawing

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** View.java	26 Jan 2007 14:04:57 -0000	1.176
--- View.java	26 Jan 2007 14:30:03 -0000	1.177
***************
*** 627,650 ****
      }
  
-     if (glv.getTool() instanceof SpaceTool) {
-       gl.glMatrixMode(GL.GL_PROJECTION);
-       gl.glPushMatrix();
-       gl.glLoadIdentity();
-       if (hitdetection) {
-         int[] viewport = new int[] {0, 0, (int)width, (int)height};
-         glu.gluPickMatrix(x, viewport[3] - y, 5, 5, viewport, 0);
-       }
-       glu.gluOrtho2D(0, width, 0, height);
-       gl.glMatrixMode(GL.GL_MODELVIEW);
-       gl.glPushMatrix();
-       gl.glLoadIdentity();
-       labelSelection(hitdetection);
-       gl.glMatrixMode(GL.GL_PROJECTION);
-       gl.glPopMatrix();
-       gl.glMatrixMode(GL.GL_MODELVIEW);
-       gl.glPopMatrix();
-     }
  
-     //Drawing the space path
      gl.glMatrixMode(GL.GL_PROJECTION);
      gl.glDisable(GL.GL_DEPTH_TEST);
--- 627,631 ----
***************
*** 659,662 ****
--- 640,649 ----
      gl.glPushMatrix();
      gl.glLoadIdentity();
+     
+     if (glv.getTool() instanceof SpaceTool) {
+       labelSelection(hitdetection);
+     }
+ 
+     
      drawSpacePath(hitdetection);