[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.220, 1.221 Defaults.java, 1.4, 1.5 Space.java, 1.235, 1.236 Container.java, 1.15, 1.16

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26811/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java Defaults.java Space.java Container.java 
Log Message:


Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.220
retrieving revision 1.221
diff -C2 -d -r1.220 -r1.221
*** Surface.java	7 Apr 2008 11:20:31 -0000	1.220
--- Surface.java	23 Oct 2008 05:35:36 -0000	1.221
***************
*** 1340,1344 ****
        return backMaterial;
      } else {
!       return frontDomain.material();
      }
    }
--- 1340,1344 ----
        return backMaterial;
      } else {
!       return backDomain.material();
      }
    }
***************
*** 1368,1372 ****
        return frontMaterial;
      } else {
!       return backDomain.material();
      }
    }
--- 1368,1372 ----
        return frontMaterial;
      } else {
!       return frontDomain.material();
      }
    }

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.235
retrieving revision 1.236
diff -C2 -d -r1.235 -r1.236
*** Space.java	8 Oct 2008 10:26:39 -0000	1.235
--- Space.java	23 Oct 2008 05:35:36 -0000	1.236
***************
*** 82,86 ****
    
    /** The material */
!   private Material material;
    
    
--- 82,86 ----
    
    /** The material */
!   protected Material material;
    
    

Index: Container.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Container.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Container.java	6 Feb 2008 14:41:52 -0000	1.15
--- Container.java	23 Oct 2008 05:35:36 -0000	1.16
***************
*** 1484,1487 ****
--- 1484,1488 ----
      copy.transparent = transparent;
      copy.type = type;
+     copy.material = material;
      return copy;
    }

Index: Defaults.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Defaults.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Defaults.java	7 Apr 2008 11:20:31 -0000	1.4
--- Defaults.java	23 Oct 2008 05:35:36 -0000	1.5
***************
*** 12,22 ****
   */
  public class Defaults {
! 
!   private static Material constructionMaterial 
!     = new Material("Construction", new float[] {0.96f, 0.87f, 0.70f});
    private static Material voidMaterial 
      = new Material("Void", new float[] {255f / 280, 228f / 280, 225f / 280});
!   private static Material functionalMaterial 
!     = new Material("Functional", new float[] {0.90f, 0.90f, 0.90f});
    
    
--- 12,22 ----
   */
  public class Defaults {
!   
!   private static Material functionalMaterial 
!     = new Material("Functional", new float[] {0.96f, 0.87f, 0.70f});
    private static Material voidMaterial 
      = new Material("Void", new float[] {255f / 280, 228f / 280, 225f / 280});
!   private static Material constructionMaterial 
!     = new Material("Construction", new float[] {0.90f, 0.90f, 0.90f});