[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view AbstractView.java,1.40,1.41

[Nordholt <nor...@us...>]

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

Modified Files:
	AbstractView.java 
Log Message:
surfaces with functional spaces on both sides are transparent. The spaces labels are colored differently for functional spaces than construction

Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** AbstractView.java	2 Oct 2005 14:48:22 -0000	1.40
--- AbstractView.java	3 Oct 2005 18:44:50 -0000	1.41
***************
*** 12,15 ****
--- 12,16 ----
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.FunctionalSpace;
+ import net.sourceforge.bprocessor.model.ConstructionSpace;
  import net.sourceforge.bprocessor.model.Plane;
  import net.sourceforge.bprocessor.model.Edge;
***************
*** 449,453 ****
      gl.glVertex3d(frontAnchor.getX(), frontAnchor.getY(), frontAnchor.getZ());
      gl.glEnd();
!     gl.glColor3d(0.2, 0.2, 0.2);
      if (clickable) {
        pushName(gl, "front");
--- 450,460 ----
      gl.glVertex3d(frontAnchor.getX(), frontAnchor.getY(), frontAnchor.getZ());
      gl.glEnd();
!     if (frontDomain instanceof FunctionalSpace) {
!       gl.glColor3d(0.2, 0.2, 0.5);
!     } else if (frontDomain instanceof ConstructionSpace) {
!       gl.glColor3d(0.8, 0.2, 0.4);
!     } else {
!       gl.glColor3d(0.2, 0.2, 0.2);
!     }
      if (clickable) {
        pushName(gl, "front");
***************
*** 473,477 ****
      gl.glVertex3d(backAnchor.getX(), backAnchor.getY(), backAnchor.getZ());
      gl.glEnd();
!     gl.glColor3d(0.2, 0.2, 0.2);
      if (clickable) {
        pushName(gl, "back");
--- 480,490 ----
      gl.glVertex3d(backAnchor.getX(), backAnchor.getY(), backAnchor.getZ());
      gl.glEnd();
!     if (backDomain instanceof FunctionalSpace) {
!       gl.glColor3d(0.2, 0.2, 0.5);
!     } else if (backDomain instanceof ConstructionSpace) {
!       gl.glColor3d(0.8, 0.2, 0.4);
!     } else {
!       gl.glColor3d(0.2, 0.2, 0.2);
!     }
      if (clickable) {
        pushName(gl, "back");
***************
*** 635,639 ****
            Surface s = (Surface)it.next();
            if (!selection.contains(s)) {
!             drawSurface(s);  
            }
          }
--- 648,660 ----
            Surface s = (Surface)it.next();
            if (!selection.contains(s)) {
!             if ((s.getBackDomain() instanceof FunctionalSpace) &&
!                 (s.getFrontDomain() instanceof FunctionalSpace)) {
!               gl.glEnable(GL.GL_POLYGON_STIPPLE);
!               gl.glPolygonStipple(transparency);
!               drawSurface(s);
!               gl.glDisable(GL.GL_POLYGON_STIPPLE);              
!             } else {
!               drawSurface(s);
!             }
            }
          }
***************
*** 680,689 ****
     */
    private void drawSurface(Surface s) {
-     if (s.getIsInner() && 
-         s.getBackDomain() instanceof FunctionalSpace &&
-         s.getFrontDomain() instanceof FunctionalSpace) {
-       gl.glEnable(GL.GL_POLYGON_STIPPLE);
-       gl.glPolygonStipple(transparency);     
-     }
      GLUtesselator tess = glu.gluNewTess();
      GLUtesselatorCallback cb = new Callback();
--- 701,704 ----
***************
*** 722,726 ****
      glu.gluTessEndPolygon(tess);
      glu.gluDeleteTess(tess);
-     gl.glDisable(GL.GL_POLYGON_STIPPLE);
    }
    
--- 737,740 ----