[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Material.java, 1.10, 1.11

[rimestad <rim...@us...>]

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

Modified Files:
	Material.java 
Log Message:
changed alpha on material to opacity

Index: Material.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Material.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Material.java	15 Oct 2007 12:41:24 -0000	1.10
--- Material.java	23 Nov 2007 10:35:35 -0000	1.11
***************
*** 35,39 ****
    private float[] specularColor;
  
!   private double alpha;
  
    private double shininess;
--- 35,39 ----
    private float[] specularColor;
  
!   private double opacity;
  
    private double shininess;
***************
*** 49,53 ****
      setDiffuseColor(new float[]{0.8f, 0.8f, 0.8f});
      setSpecularColor(new float[]{1.0f, 1.0f, 1.0f});
!     setAlpha(1.0);
      setShininess(0.0);
      setIllumination(0.0);
--- 49,53 ----
      setDiffuseColor(new float[]{0.8f, 0.8f, 0.8f});
      setSpecularColor(new float[]{1.0f, 1.0f, 1.0f});
!     setOpacity(1.0);
      setShininess(0.0);
      setIllumination(0.0);
***************
*** 104,109 ****
     * @param alpha The Color
     */
!   public void setAlpha(double alpha) {
!     this.alpha = alpha;
    }
    
--- 104,109 ----
     * @param alpha The Color
     */
!   public void setOpacity(double alpha) {
!     this.opacity = alpha;
    }
    
***************
*** 188,193 ****
     * @return the alpha
     */
!   public double getAlpha() {
!     return alpha;
    }
  
--- 188,193 ----
     * @return the alpha
     */
!   public double getOpacity() {
!     return opacity;
    }
  
***************
*** 249,253 ****
      res.add(new Attribute("specularColor", 
          new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB), getSpecularColor(), 1.0f)));
!     res.add(new Attribute("Aplha", alpha));
      res.add(new Attribute("Shininess", shininess));
      res.add(new Attribute("Illumination", illumination));
--- 249,253 ----
      res.add(new Attribute("specularColor", 
          new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB), getSpecularColor(), 1.0f)));
!     res.add(new Attribute("Opacity", opacity));
      res.add(new Attribute("Shininess", shininess));
      res.add(new Attribute("Illumination", illumination));
***************
*** 278,283 ****
          Color c = (Color)a.getValue();
          setSpecularColor(c.getColorComponents(null));
!       } else if (a.getName().equalsIgnoreCase("alpha")) {
!         setAlpha((Double)a.getValue());
        } else if (a.getName().equalsIgnoreCase("illumination")) {
          setIllumination((Double)a.getValue());
--- 278,283 ----
          Color c = (Color)a.getValue();
          setSpecularColor(c.getColorComponents(null));
!       } else if (a.getName().equalsIgnoreCase("opacity")) {
!         setOpacity((Double)a.getValue());
        } else if (a.getName().equalsIgnoreCase("illumination")) {
          setIllumination((Double)a.getValue());