[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Transform.java, NONE, 1.1 Space.java, 1.59, 1.60

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

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

Modified Files:
	Space.java 
Added Files:
	Transform.java 
Log Message:
Improvement of scripting
Added a transform

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Space.java	11 Sep 2006 09:24:52 -0000	1.59
--- Space.java	15 Sep 2006 07:31:47 -0000	1.60
***************
*** 1137,1148 ****
      res.add(new Attribute("Description", getDescription()));
      if (getModellor() != null) {
!       List attributes = getModellor().getAttributes();
!       res.addAll(attributes);
      }
      if (getOwner().getModellor() != null) {
        Parametric parameters = getOwner().getModellor().get(this);
        if (parameters != null) {
!         List attributes = parameters.getAttributes();
!         res.addAll(attributes);
        }
      }
--- 1137,1148 ----
      res.add(new Attribute("Description", getDescription()));
      if (getModellor() != null) {
!       res.add(new Attribute("Modellor", getModellor()));
      }
      if (getOwner().getModellor() != null) {
+       Project.info("owner has modellor");
        Parametric parameters = getOwner().getModellor().get(this);
        if (parameters != null) {
!         Project.info("owner has parameters");
!         res.add(new Attribute(parameters.getGeneralName(), parameters));
        }
      }

--- NEW FILE: Transform.java ---
//---------------------------------------------------------------------------------
// $Id: Transform.java,v 1.1 2006/09/15 07:31:47 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * Transform
 */
public class Transform implements Parametric {
  /** translate x */
  private double tx;
  
  /** translate y */
  private double ty;
  
  /** translate z */
  private double tz;
  
  /** rotate x */
  private double rx;
  
  /** rotate y */
  private double ry;
  
  /** rotate z */
  private double rz;
  
  /** scale x */
  private double sx;
  
  /** scale y */
  private double sy;
  
  /** scale z */
  private double sz;
  
  /**
   * Constructor
   */
  public Transform() {
    super();
    tx = 0;
    ty = 0;
    tz = 0;
    rx = 0;
    ry = 0;
    rz = 0;
    sx = 1;
    sy = 1;
    sz = 1;
  }

  /**
   * @param value new value
   */
  public void tx(double value) {
    tx = value;
  }
  /**
   * 
   * @return tx
   */
  public double tx() {
    return tx;
  }
  
  /**
   * @param value new value
   */
  public void ty(double value) {
    ty = value;
  }
  /**
   * 
   * @return ty
   */
  public double ty() {
    return ty;
  }
  
  /**
   * @param value new value
   */
  public void tz(double value) {
    tz = value;
  }
  /**
   * 
   * @return tz
   */
  public double tz() {
    return tz;
  }
  
  /**
   * @param value new value
   */
  public void rx(double value) {
    rx = value;
  }
  /**
   * 
   * @return rx
   */
  public double rx() {
    return rx;
  }
  
  /**
   * @param value new value
   */
  public void ry(double value) {
    ry = value;
  }
  /**
   * 
   * @return ry
   */
  public double ry() {
    return ry;
  }
  
  /**
   * @param value new value
   */
  public void rz(double value) {
    rz = value;
  }
  /**
   * 
   * @return rz
   */
  public double rz() {
    return rz;
  }
  
  /**
   * @param value new value
   */
  public void sx(double value) {
    sx = value;
  }
  /**
   * 
   * @return sx
   */
  public double sx() {
    return sx;
  }
  
  /**
   * @param value new value
   */
  public void sy(double value) {
    sy = value;
  }
  /**
   * 
   * @return sy
   */
  public double sy() {
    return sy;
  }
  
  /**
   * @param value new value
   */
  public void sz(double value) {
    sz = value;
  }
  /**
   * 
   * @return sz
   */
  public double sz() {
    return sz;
  }
  
  
  /**
   * Set attributes
   * @param attributes List
   */
  public void setAttributes(List attributes) {
    Iterator iter = attributes.iterator();
    while (iter.hasNext()) {
      Attribute a = (Attribute)iter.next();
      if (a.getName().equals("Translate X")) {
        tx(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Translate Y")) {
        ty(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Translate Z")) {
        tz(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Rotate X")) {
        rx(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Rotate Y")) {
        ry(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Rotate Z")) {
        rz(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Scale X")) {
        sx(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Scale Y")) {
        sy(((Double)a.getValue()).doubleValue());
      } else if (a.getName().equals("Scale Z")) {
        sz(((Double)a.getValue()).doubleValue());
      }
    } 
  }

  /**
   * Get attributes
   * @return List
   */
  public List getAttributes() {
    ArrayList res = new ArrayList();
    res.add(new Attribute("Translate X", new Double(tx())));
    res.add(new Attribute("Translate Y", new Double(ty())));
    res.add(new Attribute("Translate Z", new Double(tz())));
    res.add(new Attribute("Rotate X", new Double(rx())));
    res.add(new Attribute("Rotate Y", new Double(ry())));
    res.add(new Attribute("Rotate Z", new Double(rz())));
    res.add(new Attribute("Scale X", new Double(sx())));
    res.add(new Attribute("Scale Y", new Double(sy())));
    res.add(new Attribute("Scale Z", new Double(sz())));
    return res;
  }

  /**
   * Get display name
   * @return name
   */
  public String getGeneralName() {
    return "Transform";
  }

}