[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SpaceTool.java, 1.34, 1.35

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2383/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	SpaceTool.java 
Log Message:
refactoring of scripting

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** SpaceTool.java	12 Sep 2006 12:59:40 -0000	1.34
--- SpaceTool.java	13 Sep 2006 06:48:15 -0000	1.35
***************
*** 566,571 ****
        
        HashMap globals = Project.getInstance().getGlobals().environment();
!       HashMap functions = new HashMap();
!       functions.put("cos", new Builtin() {
          public Object evaluate(Environment env) {
            Double argument = (Double) env.get(0);
--- 566,570 ----
        
        HashMap globals = Project.getInstance().getGlobals().environment();
!       globals.put("cos", new Builtin() {
          public Object evaluate(Environment env) {
            Double argument = (Double) env.get(0);
***************
*** 573,589 ****
          }
        });
!       functions.put("vertex", new Builtin() {
          public Object evaluate(Environment env) {
!           Double z = (Double) env.get(0);
            Double y = (Double) env.get(1);
!           Double x = (Double) env.get(2);
            Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue());
            return result;
          }
        });
!       functions.put("edge", new Builtin() {
          public Object evaluate(Environment env) {
!           Vertex from = (Vertex) env.get(1);
!           Vertex to = (Vertex) env.get(0);
            Edge result = new Edge(from, to);
            return result;
--- 572,588 ----
          }
        });
!       globals.put("vertex", new Builtin() {
          public Object evaluate(Environment env) {
!           Double x = (Double) env.get(0);
            Double y = (Double) env.get(1);
!           Double z = (Double) env.get(2);
            Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue());
            return result;
          }
        });
!       globals.put("edge", new Builtin() {
          public Object evaluate(Environment env) {
!           Vertex from = (Vertex) env.get(0);
!           Vertex to = (Vertex) env.get(1);
            Edge result = new Edge(from, to);
            return result;
***************
*** 591,595 ****
        });
        
!       Environment env = new Environment(functions, globals, null);
        
        Object result = function.evaluate(env);
--- 590,594 ----
        });
        
!       Environment env = new Environment(globals, null);
        
        Object result = function.evaluate(env);