[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Material.java, 1.13, 1.14 Surface.java, 1.210, 1.211 Defaults.java, 1.2, 1.3 Project.java, 1.152, 1.153

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

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32608/src/net/sourceforge/bprocessor/model

Modified Files:
	Material.java Surface.java Defaults.java Project.java 
Log Message:
refactored material

Index: Defaults.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Defaults.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Defaults.java	15 Oct 2007 12:41:24 -0000	1.2
--- Defaults.java	17 Dec 2007 14:20:37 -0000	1.3
***************
*** 13,30 ****
  public class Defaults {
  
!   /** Front color for surfaces */ 
!   private static Material frontMaterial = new Material("Front", new float[] {0.90f, 0.90f, 0.90f});
!   /** NONE color for surfaces */
!   private static Material noneMaterial = new Material("None", new float[] {0.40f, 0.58f, 0.93f});
!   /** Back color for surfaces */
!   private static Material backMaterial = new Material("Back", new float[] {0.96f, 0.87f, 0.70f});
! 
!   /**
!    * Return front color
!    * @return The front color
!    */
!   public static float[] getFrontColor() {
!     return frontMaterial.getColor();
!   }
    
    
--- 13,22 ----
  public class Defaults {
  
!   private static Material constructionMaterial 
!     = new Material("Construction", new float[] {0.90f, 0.90f, 0.90f});
!   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.96f, 0.87f, 0.70f});
    
    
***************
*** 32,37 ****
     * @return the backMaterial
     */
!   public static Material getBackMaterial() {
!     return backMaterial;
    }
  
--- 24,29 ----
     * @return the backMaterial
     */
!   public static Material getFunctionalMaterial() {
!     return functionalMaterial;
    }
  
***************
*** 40,45 ****
     * @return the frontMaterial
     */
!   public static Material getFrontMaterial() {
!     return frontMaterial;
    }
  
--- 32,37 ----
     * @return the frontMaterial
     */
!   public static Material getConstructionMaterial() {
!     return constructionMaterial;
    }
  
***************
*** 48,70 ****
     * @return the noneMaterial
     */
!   public static Material getNoneMaterial() {
!     return noneMaterial;
!   }
! 
! 
!   /**
!    * Return back color
!    * @return The back color
!    */
!   public static float[] getBackColor() {
!     return backMaterial.getColor();
!   }
!   
!   /**
!    * Return none color
!    * @return The none color
!    */
!   public static float[] getNoneColor() {
!     return backMaterial.getColor();
    }
    
--- 40,45 ----
     * @return the noneMaterial
     */
!   public static Material getVoidMaterial() {
!     return voidMaterial;
    }
    

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** Surface.java	17 Dec 2007 13:09:16 -0000	1.210
--- Surface.java	17 Dec 2007 14:20:37 -0000	1.211
***************
*** 1871,1879 ****
      } else {
        if (getFrontDomain().isConstructionSpace()) {
!         res.add(new Attribute("Front Material", Defaults.getFrontMaterial()));
        } else if (getFrontDomain().isFunctionalSpace()) {
!         res.add(new Attribute("Front Material", Defaults.getBackMaterial()));
        } else {
!         res.add(new Attribute("Front Material", Defaults.getNoneMaterial()));
        }
      }
--- 1871,1879 ----
      } else {
        if (getFrontDomain().isConstructionSpace()) {
!         res.add(new Attribute("Front Material", Defaults.getConstructionMaterial()));
        } else if (getFrontDomain().isFunctionalSpace()) {
!         res.add(new Attribute("Front Material", Defaults.getFunctionalMaterial()));
        } else {
!         res.add(new Attribute("Front Material", Defaults.getVoidMaterial()));
        }
      }
***************
*** 1889,1897 ****
      } else {
        if (getBackDomain().isConstructionSpace()) {
!         res.add(new Attribute("Back Material", Defaults.getFrontMaterial()));
        } else if (getBackDomain().isFunctionalSpace()) {
!         res.add(new Attribute("Back Material", Defaults.getBackMaterial()));
        } else {
!         res.add(new Attribute("Back Material", Defaults.getNoneMaterial()));
        }
      }
--- 1889,1897 ----
      } else {
        if (getBackDomain().isConstructionSpace()) {
!         res.add(new Attribute("Back Material", Defaults.getConstructionMaterial()));
        } else if (getBackDomain().isFunctionalSpace()) {
!         res.add(new Attribute("Back Material", Defaults.getFunctionalMaterial()));
        } else {
!         res.add(new Attribute("Back Material", Defaults.getVoidMaterial()));
        }
      }

Index: Material.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Material.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Material.java	17 Dec 2007 13:55:06 -0000	1.13
--- Material.java	17 Dec 2007 14:20:37 -0000	1.14
***************
*** 59,66 ****
    public Material(String name, float[] color3fv) {
      this();
!     this.setName(name);
!     if (color3fv != null) {
!       this.setColor(color3fv);
!     }
    }
    
--- 59,64 ----
    public Material(String name, float[] color3fv) {
      this();
!     setName(name);
!     setColor(color3fv);
    }
    

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** Project.java	17 Dec 2007 13:09:16 -0000	1.152
--- Project.java	17 Dec 2007 14:20:37 -0000	1.153
***************
*** 185,191 ****
      materials = new HashMap<Long, Material>();
      nextMaterialId = 0;
!     add(Defaults.getBackMaterial());
!     add(Defaults.getFrontMaterial());
!     add(Defaults.getNoneMaterial());
      activeCoordinateSystem = new CoordinateSystem(new Vertex(1, 0, 0), new Vertex(0, 1, 0), 
          new Vertex(0, 0, 1), new Vertex(0, 0, 0));
--- 185,191 ----
      materials = new HashMap<Long, Material>();
      nextMaterialId = 0;
!     add(Defaults.getFunctionalMaterial());
!     add(Defaults.getConstructionMaterial());
!     add(Defaults.getVoidMaterial());
      activeCoordinateSystem = new CoordinateSystem(new Vertex(1, 0, 0), new Vertex(0, 1, 0), 
          new Vertex(0, 0, 1), new Vertex(0, 0, 0));