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

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

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

Modified Files:
	View.java 
Log Message:
Renamed dodge to active

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** View.java	14 Feb 2007 14:27:24 -0000	1.184
--- View.java	14 Feb 2007 14:40:28 -0000	1.185
***************
*** 903,907 ****
      }
  
!     drawSpace(Project.getInstance().world(), true);
  
      //Draw edges
--- 903,907 ----
      }
  
!     drawSpace(Project.getInstance().world(), false);
  
      //Draw edges
***************
*** 1060,1068 ****
     * Draw space
     * @param space The Space
!    * @param dodge dodge the colors
     */
!   private void drawSpace(Space space, boolean dodge) {
      if (space == Project.getInstance().getActiveSpace()) {
!       dodge = false;
      }
      gl.glPushMatrix();
--- 1060,1068 ----
     * Draw space
     * @param space The Space
!    * @param active inside active space
     */
!   private void drawSpace(Space space, boolean active) {
      if (space == Project.getInstance().getActiveSpace()) {
!       active = true;
      }
      gl.glPushMatrix();
***************
*** 1077,1084 ****
  
        gl.glCullFace(GL.GL_BACK);
!       drawSurfaces(surfaces, FRONT, dodge);
  
        gl.glCullFace(GL.GL_FRONT);
!       drawSurfaces(surfaces, BACK, dodge);
  
        gl.glDisable(GL.GL_CULL_FACE);
--- 1077,1084 ----
  
        gl.glCullFace(GL.GL_BACK);
!       drawSurfaces(surfaces, FRONT, !active);
  
        gl.glCullFace(GL.GL_FRONT);
!       drawSurfaces(surfaces, BACK, !active);
  
        gl.glDisable(GL.GL_CULL_FACE);
***************
*** 1095,1099 ****
        gl.glPolygonOffset(1.0f, 1.0f);
        gl.glColor3fv(SURFACE_COLOR, 0);
!       drawSurfaces(surfaces, BOTH, dodge);
        gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
        break;
--- 1095,1099 ----
        gl.glPolygonOffset(1.0f, 1.0f);
        gl.glColor3fv(SURFACE_COLOR, 0);
!       drawSurfaces(surfaces, BOTH, !active);
        gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
        break;
***************
*** 1101,1105 ****
      }
      if (doDrawEdges) {
!       drawGeneralEdges(space.getEdges(), dodge);
      }
      Collection elements = space.getElements();
--- 1101,1105 ----
      }
      if (doDrawEdges) {
!       drawGeneralEdges(space.getEdges(), !active);
      }
      Collection elements = space.getElements();
***************
*** 1107,1111 ****
      while (iter.hasNext()) {
        Space current = (Space) iter.next();
!       drawSpace(current, dodge);
      }
      gl.glPopMatrix();
--- 1107,1111 ----
      while (iter.hasNext()) {
        Space current = (Space) iter.next();
!       drawSpace(current, active);
      }
      gl.glPopMatrix();