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

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

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

Modified Files:
	View.java 
Log Message:
Moved default colors to Defaults class in the GUI package

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** View.java	13 Jan 2006 10:24:54 -0000	1.45
--- View.java	15 Jan 2006 14:03:51 -0000	1.46
***************
*** 10,13 ****
--- 10,14 ----
  import net.sourceforge.bprocessor.gl.tool.SpaceTool;
  import net.sourceforge.bprocessor.gl.model.ClippingPlane;
+ import net.sourceforge.bprocessor.gui.Defaults;
  import net.sourceforge.bprocessor.gui.Toolbar;
  
***************
*** 865,873 ****
            
          gl.glCullFace(GL.GL_BACK);
!         gl.glColor3fv(frontColor);
          drawSurfaces(gld, FRONT);
          
          gl.glCullFace(GL.GL_FRONT);
!         gl.glColor3fv(backColor);
          drawSurfaces(gld, BACK);
          
--- 866,874 ----
            
          gl.glCullFace(GL.GL_BACK);
!         gl.glColor3fv(Defaults.getFrontColor());
          drawSurfaces(gld, FRONT);
          
          gl.glCullFace(GL.GL_FRONT);
!         gl.glColor3fv(Defaults.getBackColor());
          drawSurfaces(gld, BACK);
          
***************
*** 1371,1381 ****
        if (space.isConstructionSpace()) {
          // We are looking at  a construction space
!         return frontColor;
        }
        if (space.isFunctionalSpace()) {
          // We are looking at a functional space
!         return backColor;
        }
!       return noneColor;
      }
    }
--- 1372,1382 ----
        if (space.isConstructionSpace()) {
          // We are looking at  a construction space
!         return Defaults.getFrontColor();
        }
        if (space.isFunctionalSpace()) {
          // We are looking at a functional space
!         return Defaults.getBackColor();
        }
!       return Defaults.getNoneColor();
      }
    }