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

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

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

Modified Files:
	View.java 
Log Message:
Removed domain

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** View.java	12 Dec 2005 14:28:48 -0000	1.28
--- View.java	12 Dec 2005 20:19:53 -0000	1.29
***************
*** 13,18 ****
  
  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.Camera;
--- 13,16 ----
***************
*** 673,682 ****
        //draw the front domain name
        
!       if (frontDomain instanceof FunctionalSpace) {
          gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.5 + fcb);
!       } else if (frontDomain instanceof ConstructionSpace) {
          gl.glColor3d(0.8 + fcb, 0.2 + fcb, 0.4 + fcb);
-       } else {
-         gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.2 + fcb);
        }
        
--- 671,680 ----
        //draw the front domain name
        
!       if (frontDomain == null) {
!         gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.2 + fcb);
!       } else if (frontDomain.isFunctionalSpace()) {
          gl.glColor3d(0.2 + fcb, 0.2 + fcb, 0.5 + fcb);
!       } else if (frontDomain.isConstructionSpace()) {
          gl.glColor3d(0.8 + fcb, 0.2 + fcb, 0.4 + fcb);
        }
        
***************
*** 688,697 ****
        }
        //draw the back domain name
!       if (backDomain instanceof FunctionalSpace) {
          gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.5 + bcb);
!       } else if (backDomain instanceof ConstructionSpace) {
          gl.glColor3d(0.8 + bcb, 0.2 + bcb, 0.4 + bcb);
-       } else {
-         gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.2 + bcb);
        }
        
--- 686,696 ----
        }
        //draw the back domain name
!       
!       if (backDomain == null) {
!         gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.2 + bcb);
!       } else if (backDomain.isFunctionalSpace()) {
          gl.glColor3d(0.2 + bcb, 0.2 + bcb, 0.5 + bcb);
!       } else if (backDomain.isConstructionSpace()) {
          gl.glColor3d(0.8 + bcb, 0.2 + bcb, 0.4 + bcb);
        }
        
***************
*** 1307,1314 ****
      Space back = surface.getBackDomain();
      Space front = surface.getFrontDomain();
!     if ((front instanceof FunctionalSpace) && (back instanceof FunctionalSpace)) {
        return false;
      }
!     if ((front instanceof ConstructionSpace) && (back instanceof ConstructionSpace)) {
        return false;
      }
--- 1306,1319 ----
      Space back = surface.getBackDomain();
      Space front = surface.getFrontDomain();
!     if (front == null) {
!       return true;
!     }
!     if (back == null) {
!       return true;
!     }
!     if ((front.isFunctionalSpace()) && (back.isFunctionalSpace())) {
        return false;
      }
!     if ((front.isConstructionSpace()) && (back.isConstructionSpace())) {
        return false;
      }
***************
*** 1327,1335 ****
      } else {
        // TODO check if the space space has a color
!       if (space instanceof ConstructionSpace) {
          // We are looking at  a constructionspace
          return frontCcolor;
        }
!       if (space instanceof FunctionalSpace) {
          // We are looking at a constructionspace
          return backColor;
--- 1332,1340 ----
      } else {
        // TODO check if the space space has a color
!       if (space.isConstructionSpace()) {
          // We are looking at  a constructionspace
          return frontCcolor;
        }
!       if (space.isFunctionalSpace()) {
          // We are looking at a constructionspace
          return backColor;