The RepRap Project

Revision: 2638
          http://reprap.svn.sourceforge.net/reprap/?rev=2638&view=rev
Author:   wizard23
Date:     2009-03-07 06:34:35 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
MetaCADEvaluator now checks if the resulting CSGObjects have valid triangle meshes so AoI does not get exceptions in the render code

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java	2009-03-07 01:58:10 UTC (rev 2637)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java	2009-03-07 06:34:35 UTC (rev 2638)
@@ -64,7 +64,8 @@
       }
     }
     catch (Exception ex) {
-      //            this.debug("exception in evaluate: " + ex.toString());
+      System.out.println("exception in evaluate: " + ex.toString());
+               //   this.debug("exception in evaluate: " + ex.toString());
     }
   }
 

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-07 01:58:10 UTC (rev 2637)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-07 06:34:35 UTC (rev 2638)
@@ -25,263 +25,269 @@
 import artofillusion.object.Sphere;
 import artofillusion.texture.Texture;
 import artofillusion.texture.TextureMapping;
+import artofillusion.ui.MessageDialog;
 
 public class MetaCADEvaluatorEngine extends CSGEvaluatorEngine {
-	JEP jep = new JEP();
+  JEP jep = new JEP();
 
-	public MetaCADEvaluatorEngine(LayoutWindow window) {
-		super(window);
-	}
-	
-	public void setParameters(String text)
-	{
-		window.getScene().setMetadata(MetaCADEvaluatorEngine.class.getName()+"Parameters", text);
-	}
-	
-	public String getParameters()
-	{
-		Object o = window.getScene().getMetadata(MetaCADEvaluatorEngine.class.getName()+"Parameters");
-		
-		if (o!=null)
-			return o.toString();
-		
-		return "";
-	}
-	
-	public void readParameters() {
-		jep = new JEP();
-		jep.addStandardConstants();
-		jep.addStandardFunctions();
-		evaluateLines(getParameters());
-	}
-	
-	public void evaluate()
-	{
-	  readParameters();
-	  super.evaluate();
-	}
+  public MetaCADEvaluatorEngine(LayoutWindow window) {
+    super(window);
+  }
 
-	public ObjectInfo evaluateNode(ObjectInfo parent, UndoRecord undo) throws Exception {
-		if (evaluateLoop(parent, undo))
-			return parent;
-		
-		if (evaluateObject(parent, undo))
-			return parent;
-			
-		return super.evaluateNode(parent, undo);
-	}
-	
-	public Boolean evaluateLoop(ObjectInfo parent, UndoRecord undo) throws Exception {
-		String line = parent.name;
-		int booleanOp=this.stringToOp(line);
-		
-		if (booleanOp==-1)
-			return false;
-		
-		MetaCADParser coordExpr = null;
-		
-		String []subParam = line.split("\\)\\s*\\(");
-		if (subParam.length==2)
-		{
-			coordExpr=new MetaCADParser("dummy(" + subParam[1], ",");
-			line=subParam[0] + ")";
-		}
-		
-		MetaCADParser forExpr = new MetaCADParser(line, ";");
-		
-		// no loop but a limple boolean op let base class do that
-		if (forExpr.parseError || forExpr.parameters.length != 3)
-		{
-			return false;
-		}
-		else
-		{
-			CSGHelper helper = new CSGHelper(booleanOp);
-			
-			// evaluate first part of for loop i.e. i=0
-			evaluateAssignment(forExpr.parameters[0]);
-			
-			// security count to exit loop even if wee fuck up exit condition
-			int count = 0;
-			
-			// condition loop evaluate the condition i.e. i < 10
-			while (evaluateExpresion(forExpr.parameters[1]) != 0 && count < 100) {
-				ObjectInfo[] objects = parent.children;
-				
-				for (int i = 0; i < objects.length; i++)
-				{
-					helper.Add(evaluateNode(objects[i], undo).duplicate());
-				}
-				
-				// "increment" evaluate 3rd for parameter i.e. i=i+1
-				evaluateAssignment(forExpr.parameters[2]);
-				count++;
-			}
-			
-			if (helper.sum != null)
-			{
-				Texture tex = parent.object.getTexture();
-				TextureMapping map = parent.object.getTextureMapping();
-				
-				// use coordinate system paramaters from loop if user gave one
-				if (coordExpr != null && !coordExpr.parseError)
-				{
-					double x, y, z, rotx, roty, rotz;
-					
-					x = evaluateExpresion(coordExpr.parameters[0]);
-					y = evaluateExpresion(coordExpr.parameters[1]);
-					z = evaluateExpresion(coordExpr.parameters[2]);
+  public void setParameters(String text) {
+    window.getScene().setMetadata(
+        MetaCADEvaluatorEngine.class.getName() + "Parameters", text);
+  }
 
-					rotx = evaluateExpresion(coordExpr.parameters[3]);
-					roty = evaluateExpresion(coordExpr.parameters[4]);
-					rotz = evaluateExpresion(coordExpr.parameters[5]);
-					
-					parent.setCoords(new CoordinateSystem(new Vec3(x, y, z), rotx, roty, rotz));
-				}
-				
-				
-				parent.setObject(helper.sum);
-				parent.object.setTexture(tex, map);	
-				
-				parent.clearCachedMeshes();
-				this.window.updateImage();
-				this.window.updateMenus();
-			}
-		}
-		
-		return true;
-	}
-	
-	public Boolean evaluateObject(ObjectInfo parent, UndoRecord undo) throws Exception {
-		String line = parent.name;
-		
-		MetaCADParser objExpr = new MetaCADParser(line, ",");
-		
-		if (objExpr.parseError)
-			return false;
-		
-		if (objExpr.parameters.length >= 9)
-		{
-			double x, y, z, rotx, roty, rotz, a, b, c;
-			
-			x = evaluateExpresion(objExpr.parameters[0]);
-			y = evaluateExpresion(objExpr.parameters[1]);
-			z = evaluateExpresion(objExpr.parameters[2]);
+  public String getParameters() {
+    Object o = window.getScene().getMetadata(
+        MetaCADEvaluatorEngine.class.getName() + "Parameters");
 
-			rotx = evaluateExpresion(objExpr.parameters[3]);
-			roty = evaluateExpresion(objExpr.parameters[4]);
-			rotz = evaluateExpresion(objExpr.parameters[5]);
+    if (o != null)
+      return o.toString();
 
-			a = evaluateExpresion(objExpr.parameters[6]);
-			b = evaluateExpresion(objExpr.parameters[7]);
-			c = evaluateExpresion(objExpr.parameters[8]);
-			
+    return "";
+  }
 
-			Object3D obj3D=null;
-			
-			if (objExpr.name.startsWith("cube")) {
-				obj3D = new Cube(a, b, c);
-			}
-			if (objExpr.name.startsWith("sphere")) {
-				obj3D = new Sphere(a, b, c);
-			}
-			if (objExpr.name.startsWith("cylinder")) {
-				double ratio = 1;
-				
-				if (objExpr.parameters.length >= 10)
-				{
-					ratio = evaluateExpresion(objExpr.parameters[9]);
-					if (ratio > 1) ratio = 1;
-					if (ratio < 0) ratio = 0;
-				}	
-				obj3D = new Cylinder(a, b, c, ratio);
-			}
-			
-			if (obj3D!=null)
-			{
-				Texture tex = parent.object.getTexture();
-				TextureMapping map = parent.object.getTextureMapping();
-				
-				parent.setCoords(new CoordinateSystem(new Vec3(x, y, z), rotx, roty, rotz));
-				parent.setObject(obj3D);
-				parent.object.setTexture(tex, map);	
-				
-				parent.clearCachedMeshes();
-				this.window.updateImage();
-				this.window.updateMenus();
-			}
-			else
-			{
-				return false;
-			}
-		}
-		
-		return true;
-	}
+  public void readParameters() {
+    jep = new JEP();
+    jep.addStandardConstants();
+    jep.addStandardFunctions();
+    evaluateLines(getParameters());
+  }
 
-	// Evaluates an Expression like 3*x+sin(a) and returns the value of it or 0 if any error occured
-	double evaluateExpresion(String expr) throws Exception {
-		try {
-			jep.parseExpression(expr);
-			return jep.getValue();
-		} catch (Exception ex) {
-			System.out.println("Error while evaluating Expression: \"" + expr + "\" Syntax Error or unknown variable?");
-			throw(ex);
-			//return 0;
-		}
-	}
+  public void evaluate() {
+    readParameters();
+    super.evaluate();
+  }
 
-	// Evaluates Expressions like x=2*radius and assigns the value to the given
-	// variable
-	void evaluateAssignment(String curLine) throws Exception {
-		try
-		{		
-			int mark = curLine.indexOf("=");
-	
-			String name = curLine.substring(0, mark).trim();
-			String formula = curLine.substring(mark + 1);
-			jep.parseExpression(formula);
-			double value = jep.getValue();
-			//System.out.println(value);
-			jep.addVariable(name, value);
-		}
-		catch (Exception ex)
-		{
-			System.out.println("Invalid Assignment: \"" + curLine +"\" syntax error?");
-			throw(ex);
-		}
-	}
-	
-	void evaluateLines(String text)
-	{
-		try {
-			String lines[] = text.split("\n");
-			for (String curLine : lines)
-			{
-				curLine = curLine.trim();
-				if (curLine.length() == 0 || curLine.startsWith("#"))
-					continue;
-				evaluateAssignment(curLine);
-			}
-		} catch (Exception ex) {
-			System.out.println(ex);
-		}
-	}
+  public ObjectInfo evaluateNode(ObjectInfo parent, UndoRecord undo)
+      throws Exception {
+    if (evaluateLoop(parent, undo))
+      return parent;
 
-	void evaluateParametersFile(String fileName) {
-		try {
-			File inFile = new File(fileName);
-			BufferedReader fr = new BufferedReader(new FileReader(inFile));
-			String curLine;
+    if (evaluateObject(parent, undo))
+      return parent;
 
-			while (null != (curLine = fr.readLine())) {
-				curLine = curLine.trim();
-				if (curLine.length() == 0 || curLine.startsWith("#"))
-					continue;
-				evaluateAssignment(curLine);
-			}
-		} catch (Exception ex) {
-			System.out.println(ex);
-		}
-	}
+    return super.evaluateNode(parent, undo);
+  }
+
+  public Boolean evaluateLoop(ObjectInfo parent, UndoRecord undo)
+      throws Exception {
+    String line = parent.name;
+    int booleanOp = this.stringToOp(line);
+
+    if (booleanOp == -1)
+      return false;
+
+    MetaCADParser coordExpr = null;
+
+    String[] subParam = line.split("\\)\\s*\\(");
+    if (subParam.length == 2) {
+      coordExpr = new MetaCADParser("dummy(" + subParam[1], ",");
+      line = subParam[0] + ")";
+    }
+
+    MetaCADParser forExpr = new MetaCADParser(line, ";");
+
+    // no loop but a slimple boolean op let base class do that
+    if (forExpr.parseError || forExpr.parameters.length != 3) {
+      forExpr = new MetaCADParser("dummyDummy(dummyDummy=0; dummyDummy<1; dummyDummy=dummyDummy+1)", ";");
+    }
+
+    CSGHelper helper = new CSGHelper(booleanOp);
+
+    // evaluate first part of for loop i.e. i=0
+    evaluateAssignment(forExpr.parameters[0]);
+
+    // security count to exit loop even if wee fuck up exit condition
+    int count = 0;
+
+    // condition loop evaluate the condition i.e. i < 10
+    while (evaluateExpresion(forExpr.parameters[1]) != 0 && count < 100) {
+      ObjectInfo[] objects = parent.children;
+
+      for (int i = 0; i < objects.length; i++) {
+        helper.Add(evaluateNode(objects[i], undo).duplicate());
+      }
+
+      // "increment" evaluate 3rd for parameter i.e. i=i+1
+      evaluateAssignment(forExpr.parameters[2]);
+      count++;
+    }
+
+    if (helper.sum != null) {
+      Texture tex = parent.object.getTexture();
+      TextureMapping map = parent.object.getTextureMapping();
+
+      // use coordinate system paramaters from loop if user gave one
+      if (coordExpr != null && !coordExpr.parseError) {
+        double x, y, z, rotx, roty, rotz;
+
+        x = evaluateExpresion(coordExpr.parameters[0]);
+        y = evaluateExpresion(coordExpr.parameters[1]);
+        z = evaluateExpresion(coordExpr.parameters[2]);
+
+        rotx = evaluateExpresion(coordExpr.parameters[3]);
+        roty = evaluateExpresion(coordExpr.parameters[4]);
+        rotz = evaluateExpresion(coordExpr.parameters[5]);
+
+        parent.setCoords(new CoordinateSystem(new Vec3(x, y, z), rotx, roty,
+            rotz));
+      }
+
+      Object3D test = SanitizeObjectInfo(helper.sum);
+
+      parent.setObject(test);
+
+      parent.object.setTexture(tex, map);
+
+      parent.clearCachedMeshes();
+      this.window.updateImage();
+      this.window.updateMenus();
+
+    }
+
+    return true;
+  }
+
+  protected Object3D SanitizeObjectInfo(Object3D obj) throws Exception {
+    try {
+      obj.getBounds();
+    } catch (Exception ex) {
+      new MessageDialog(this.window, "Exception in Object3D.getBounds()? Bad CSG Object?");
+      throw ex;
+      // return new Cube(10,10,10);
+    }
+    return obj;
+  }
+
+  public Boolean evaluateObject(ObjectInfo parent, UndoRecord undo)
+      throws Exception {
+    String line = parent.name;
+
+    MetaCADParser objExpr = new MetaCADParser(line, ",");
+
+    if (objExpr.parseError)
+      return false;
+
+    if (objExpr.parameters.length >= 9) {
+      double x, y, z, rotx, roty, rotz, a, b, c;
+
+      x = evaluateExpresion(objExpr.parameters[0]);
+      y = evaluateExpresion(objExpr.parameters[1]);
+      z = evaluateExpresion(objExpr.parameters[2]);
+
+      rotx = evaluateExpresion(objExpr.parameters[3]);
+      roty = evaluateExpresion(objExpr.parameters[4]);
+      rotz = evaluateExpresion(objExpr.parameters[5]);
+
+      a = evaluateExpresion(objExpr.parameters[6]);
+      b = evaluateExpresion(objExpr.parameters[7]);
+      c = evaluateExpresion(objExpr.parameters[8]);
+
+      Object3D obj3D = null;
+
+      if (objExpr.name.startsWith("cube")) {
+        obj3D = new Cube(a, b, c);
+      }
+      if (objExpr.name.startsWith("sphere")) {
+        obj3D = new Sphere(a, b, c);
+      }
+      if (objExpr.name.startsWith("cylinder")) {
+        double ratio = 1;
+
+        if (objExpr.parameters.length >= 10) {
+          ratio = evaluateExpresion(objExpr.parameters[9]);
+          if (ratio > 1)
+            ratio = 1;
+          if (ratio < 0)
+            ratio = 0;
+        }
+        obj3D = new Cylinder(a, b, c, ratio);
+      }
+
+      if (obj3D != null) {
+        Texture tex = parent.object.getTexture();
+        TextureMapping map = parent.object.getTextureMapping();
+
+        parent.setCoords(new CoordinateSystem(new Vec3(x, y, z), rotx, roty,
+            rotz));
+        parent.setObject(obj3D);
+        parent.object.setTexture(tex, map);
+
+        parent.clearCachedMeshes();
+        this.window.updateImage();
+        this.window.updateMenus();
+      } else {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  // Evaluates an Expression like 3*x+sin(a) and returns the value of it or 0 if
+  // any error occured
+  double evaluateExpresion(String expr) throws Exception {
+    try {
+      jep.parseExpression(expr);
+      return jep.getValue();
+    } catch (Exception ex) {
+      System.out.println("Error while evaluating Expression: \"" + expr
+          + "\" Syntax Error or unknown variable?");
+      throw (ex);
+      // return 0;
+    }
+  }
+
+  // Evaluates Expressions like x=2*radius and assigns the value to the given
+  // variable
+  void evaluateAssignment(String curLine) throws Exception {
+    try {
+      int mark = curLine.indexOf("=");
+
+      String name = curLine.substring(0, mark).trim();
+      String formula = curLine.substring(mark + 1);
+      jep.parseExpression(formula);
+      double value = jep.getValue();
+      // System.out.println(value);
+      jep.addVariable(name, value);
+    } catch (Exception ex) {
+      System.out.println("Invalid Assignment: \"" + curLine
+          + "\" syntax error?");
+      throw (ex);
+    }
+  }
+
+  void evaluateLines(String text) {
+    try {
+      String lines[] = text.split("\n");
+      for (String curLine : lines) {
+        curLine = curLine.trim();
+        if (curLine.length() == 0 || curLine.startsWith("#"))
+          continue;
+        evaluateAssignment(curLine);
+      }
+    } catch (Exception ex) {
+      System.out.println(ex);
+    }
+  }
+
+  void evaluateParametersFile(String fileName) {
+    try {
+      File inFile = new File(fileName);
+      BufferedReader fr = new BufferedReader(new FileReader(inFile));
+      String curLine;
+
+      while (null != (curLine = fr.readLine())) {
+        curLine = curLine.trim();
+        if (curLine.length() == 0 || curLine.startsWith("#"))
+          continue;
+        evaluateAssignment(curLine);
+      }
+    } catch (Exception ex) {
+      System.out.println(ex);
+    }
+  }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2665
          http://reprap.svn.sourceforge.net/reprap/?rev=2665&view=rev
Author:   kintel
Date:     2009-03-11 01:53:39 +0000 (Wed, 11 Mar 2009)

Log Message:
-----------
Refactored coordsys handling, coordsys is now a separate expression

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-11 01:52:39 UTC (rev 2664)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-11 01:53:39 UTC (rev 2665)
@@ -1,8 +1,6 @@
 package org.reprap.artofillusion;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
+import java.util.Enumeration;
 
 import org.cheffo.jeplite.JEP;
 
@@ -10,7 +8,6 @@
 import artofillusion.UndoRecord;
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Vec3;
-import artofillusion.object.CSGObject;
 import artofillusion.object.Cube;
 import artofillusion.object.Curve;
 import artofillusion.object.Cylinder;
@@ -53,6 +50,7 @@
     return evaluateLines(getParameters());
   }
 
+
   public void evaluate() {
     // only evaluate selected objects if the parameters could be evaluated
     if (readParameters())
@@ -77,31 +75,30 @@
     if (booleanOp == -1)
       return false;
 
-    MetaCADParser coordExpr = null;
+    MetaCADParser coordExpr = new MetaCADParser(line);
 
-    String[] subParam = line.split("\\)\\s*\\(");
-    if (subParam.length == 2) {
-      coordExpr = new MetaCADParser("dummy(" + subParam[1], ",");
-      line = subParam[0] + ")";
-    }
+    if (!coordExpr.parse()) return false;
 
-    MetaCADParser forExpr = new MetaCADParser(line, ";");
-
-    // no loop but a simple boolean operation let base class do that
-    if (forExpr.parseError || forExpr.parameters.length != 3) {
-      forExpr = new MetaCADParser("dummyDummy(dummyDummy=0; dummyDummy<1; dummyDummy=dummyDummy+1)", ";");
+    CoordinateSystem coordsys = evaluateCoordSys(coordExpr.getParameters("cs"));
+    
+    String[] parameters = coordExpr.getParameters(this.opToString(booleanOp));
+    if (parameters == null || parameters.length != 3) {
+      // no loop but a simple boolean operation let base class do that
+      MetaCADParser forExpr = new MetaCADParser("dummyDummy(dummyDummy=0; dummyDummy<1; dummyDummy=dummyDummy+1)");
+      forExpr.parse();
+      parameters = forExpr.getParameters("dummyDummy");
     }
 
     CSGHelper helper = new CSGHelper(booleanOp);
 
     // evaluate first part of for loop i.e. i=0
-    evaluateAssignment(forExpr.parameters[0]);
+    evaluateAssignment(parameters[0]);
 
     // security count to exit loop even if we fuck up exit condition
     int count = 0;
 
     // condition loop evaluate the condition i.e. i < 10
-    while (evaluateExpression(forExpr.parameters[1]) != 0 && count < 100) {
+    while (evaluateExpression(parameters[1]) != 0 && count < 100) {
       ObjectInfo[] objects = parent.children;
 
       for (int i = 0; i < objects.length; i++) {
@@ -109,7 +106,7 @@
       }
 
       // "increment" evaluate 3rd for parameter i.e. i=i+1
-      evaluateAssignment(forExpr.parameters[2]);
+      evaluateAssignment(parameters[2]);
       count++;
     }
 
@@ -117,22 +114,8 @@
       Texture tex = parent.object.getTexture();
       TextureMapping map = parent.object.getTextureMapping();
 
-      // use coordinate system paramaters from loop if user gave one
-      if (coordExpr != null && !coordExpr.parseError) {
-        double x, y, z, rotx, roty, rotz;
+      if (coordsys != null) parent.setCoords(coordsys);
 
-        x = evaluateExpression(coordExpr.parameters[0]);
-        y = evaluateExpression(coordExpr.parameters[1]);
-        z = evaluateExpression(coordExpr.parameters[2]);
-
-        rotx = evaluateExpression(coordExpr.parameters[3]);
-        roty = evaluateExpression(coordExpr.parameters[4]);
-        rotz = evaluateExpression(coordExpr.parameters[5]);
-
-        parent.setCoords(new CoordinateSystem(new Vec3(x, y, z), rotx, roty,
-            rotz));
-      }
-
       Object3D test = sanitizeObject3D(helper.sum);
 
       parent.setObject(test);
@@ -172,136 +155,126 @@
     
     String line = parent.name;
 
-    MetaCADParser objExpr = new MetaCADParser(line, ",");
-
-    if (objExpr.parseError) {
+    MetaCADParser objExpr = new MetaCADParser(line);
+    if (!objExpr.parse()) {
       // FIXME: Notify user? 
       return false;
     }
 
     Object3D obj3D = null;
     CoordinateSystem coordsys = null;
-    
-    if (objExpr.name.startsWith("poly"))
-    {
-      if (objExpr.parameters.length == 4 && objExpr.parameters[0].startsWith("star"))
-      {
-        
-        double inner  = evaluateExpression(objExpr.parameters[2]); //innerValueField.getValue();
-        double outer = evaluateExpression(objExpr.parameters[3]); //outerValueField.getValue();
-        int n = (int)evaluateExpression(objExpr.parameters[1]); //(int) Math.round( nValueField.getValue() );
-  
-        Vec3[] v = new Vec3[2*n];
-        float[] smoothness = new float[2*n];
-        int index = 0;
-        for (int i = 0; i < n; i++)
-        {
-          v[index] = new Vec3( Math.cos( Math.PI * index / (double) n ),
-            Math.sin( Math.PI * index / (double) n ), 0 );
-          v[index].scale( inner );
-          v[index+1] = new Vec3( Math.cos( Math.PI * (index + 1) / (double) n ),
-            Math.sin( Math.PI * (index + 1) / (double) n ), 0 );
-          v[index+1].scale( outer );
-          smoothness[index]=0;
-          smoothness[index+1]=0;
-          index += 2;
-        }
-  
-        obj3D = new Curve( v, smoothness, Mesh.NO_SMOOTHING, true).convertToTriangleMesh(0);
-      }
-    }
 
-    if (objExpr.name.startsWith("extrude")) {
-      // Three first parameters define the extrusion vector
-      Vec3 dir = Vec3.vz();
-      if (objExpr.parameters.length >= 3) {
-        dir = new Vec3(evaluateExpression(objExpr.parameters[0]),
-            evaluateExpression(objExpr.parameters[1]),
-            evaluateExpression(objExpr.parameters[2]));
-      }
-      // 4. parameter is num segments
-      int numsegments = 1;
-      if (objExpr.parameters.length >= 4) {
-        numsegments = (int)evaluateExpression(objExpr.parameters[3]);
-        if (numsegments < 2) numsegments = 1;
-      }
-      // 5. parameter is twist degrees
-      double twist = 0.0;
-      if (objExpr.parameters.length >= 5) {
-        twist = evaluateExpression(objExpr.parameters[4]);
-      }
+    Enumeration<String> iter = objExpr.getNames();
+    while (iter.hasMoreElements()) {
+      String name = iter.nextElement();
+      String[] parameters = objExpr.getParameters(name);
 
-      // First child is the base mesh
-      // FIXME: Find all extrudable child objects instead
-      // FIXME: Recursively evaluate children
-      ObjectInfo[] children = parent.getChildren();
-      for (int i=0;i<children.length;i++) {
-        evaluateNode(children[i], undo);
+      if (name.equals("cs")) {
+        coordsys = evaluateCoordSys(parameters);
       }
-      ObjectInfo profile = parent.getChildren()[0];
-      Object3D profileobj = profile.getObject();
-      if (profileobj.canConvertToTriangleMesh() != Object3D.CANT_CONVERT) {
-        profileobj = profileobj.convertToTriangleMesh(0.1);
-      }
+      else if (name.startsWith("poly")) {
+        if (parameters.length == 4 && parameters[0].startsWith("star")) {
+          double inner  = evaluateExpression(parameters[2]); //innerValueField.getValue();
+          double outer = evaluateExpression(parameters[3]); //outerValueField.getValue();
+          int n = (int)evaluateExpression(parameters[1]); //(int) Math.round( nValueField.getValue() );
 
-      if (profileobj instanceof TriangleMesh) {
-        // Build extrusion curve from vector and segments
-        Vec3 v[] = new Vec3[numsegments+1];
-        float smooth[] = new float[v.length];
-        for (int i = 0; i < v.length; i++) {
-          v[i] = new Vec3(dir);
-          v[i].scale(1.0*i/numsegments);
-          smooth[i] = 1.0f;
-        }
-        Curve path = new Curve(v, smooth, Mesh.NO_SMOOTHING, false);
-        CoordinateSystem pathCoords = new CoordinateSystem();
+          Vec3[] v = new Vec3[2*n];
+          float[] smoothness = new float[2*n];
+          int index = 0;
+          for (int i = 0; i < n; i++)
+          {
+            v[index] = new Vec3( Math.cos( Math.PI * index / (double) n ),
+                Math.sin( Math.PI * index / (double) n ), 0 );
+            v[index].scale( inner );
+            v[index+1] = new Vec3( Math.cos( Math.PI * (index + 1) / (double) n ),
+                Math.sin( Math.PI * (index + 1) / (double) n ), 0 );
+            v[index+1].scale( outer );
+            smoothness[index]=0;
+            smoothness[index+1]=0;
+            index += 2;
+          }
 
-        obj3D = ExtrudeTool.extrudeMesh((TriangleMesh)profileobj, path, profile.getCoords(), pathCoords, twist*Math.PI/180.0, true);
+          obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true).convertToTriangleMesh(0);
+        }
       }
-      for (int i=0;i<children.length;i++) children[i].setVisible(false);
-    }
-    else {
-      // First part of expression is always the coordinate system (transform)
-      if (objExpr.parameters.length >= 6) {
-        double x, y, z, rotx, roty, rotz;
+      else if (name.startsWith("extrude")) {
+        // Three first parameters define the extrusion vector
+        Vec3 dir = Vec3.vz();
+        if (parameters.length >= 3) {
+          dir = new Vec3(evaluateExpression(parameters[0]),
+              evaluateExpression(parameters[1]),
+              evaluateExpression(parameters[2]));
+        }
+        // 4. parameter is num segments
+        int numsegments = 1;
+        if (parameters.length >= 4) {
+          numsegments = (int)evaluateExpression(parameters[3]);
+          if (numsegments < 2) numsegments = 1;
+        }
+        // 5. parameter is twist degrees
+        double twist = 0.0;
+        if (parameters.length >= 5) {
+          twist = evaluateExpression(parameters[4]);
+        }
 
-        x = evaluateExpression(objExpr.parameters[0]);
-        y = evaluateExpression(objExpr.parameters[1]);
-        z = evaluateExpression(objExpr.parameters[2]);
+        // First child is the base mesh
+        // FIXME: Find all extrudable child objects instead
+        // FIXME: Recursively evaluate children
+        ObjectInfo[] children = parent.getChildren();
+        for (int i=0;i<children.length;i++) {
+          evaluateNode(children[i], undo);
+        }
+        ObjectInfo profile = parent.getChildren()[0];
+        Object3D profileobj = profile.getObject();
+        if (profileobj.canConvertToTriangleMesh() != Object3D.CANT_CONVERT) {
+          profileobj = profileobj.convertToTriangleMesh(0.1);
+        }
 
-        rotx = evaluateExpression(objExpr.parameters[3]);
-        roty = evaluateExpression(objExpr.parameters[4]);
-        rotz = evaluateExpression(objExpr.parameters[5]);
-        coordsys = new CoordinateSystem(new Vec3(x, y, z), rotx, roty, rotz);
+        if (profileobj instanceof TriangleMesh) {
+          // Build extrusion curve from vector and segments
+          Vec3 v[] = new Vec3[numsegments+1];
+          float smooth[] = new float[v.length];
+          for (int i = 0; i < v.length; i++) {
+            v[i] = new Vec3(dir);
+            v[i].scale(1.0*i/numsegments);
+            smooth[i] = 1.0f;
+          }
+          Curve path = new Curve(v, smooth, Mesh.NO_SMOOTHING, false);
+          CoordinateSystem pathCoords = new CoordinateSystem();
+
+          obj3D = ExtrudeTool.extrudeMesh((TriangleMesh)profileobj, path, profile.getCoords(), pathCoords, twist*Math.PI/180.0, true);
+        }
+        for (int i=0;i<children.length;i++) children[i].setVisible(false);
       }
+      else {
+        // Typically, the three next parameters are common object properties
+        if (parameters.length >= 3) {
+          double a, b, c;
 
-      // Typically, the three next parameters are common object properties
-      if (objExpr.parameters.length >= 9) {
-        double a, b, c;
+          a = evaluateExpression(parameters[0]);
+          b = evaluateExpression(parameters[1]);
+          c = evaluateExpression(parameters[2]);
 
-        a = evaluateExpression(objExpr.parameters[6]);
-        b = evaluateExpression(objExpr.parameters[7]);
-        c = evaluateExpression(objExpr.parameters[8]);
-
-        if (objExpr.name.startsWith("cube")) {
-          obj3D = new Cube(a, b, c);
-        }
-        if (objExpr.name.startsWith("sphere")) {
-          obj3D = new Sphere(a, b, c);
-        }
-        if (objExpr.name.startsWith("cylinder")) {
-          double ratio = 1;
-          // Cylinder takes an optional fourth parameter
-          if (objExpr.parameters.length >= 10) {
-            ratio = evaluateExpression(objExpr.parameters[9]);
-            if (ratio > 1) ratio = 1;
-            if (ratio < 0) ratio = 0;
+          if (name.startsWith("cube")) {
+            obj3D = new Cube(a, b, c);
           }
-          obj3D = new Cylinder(a, b, c, ratio);
+          if (name.startsWith("sphere")) {
+            obj3D = new Sphere(a, b, c);
+          }
+          if (name.startsWith("cylinder")) {
+            double ratio = 1;
+            // Cylinder takes an optional fourth parameter
+            if (parameters.length >= 4) {
+              ratio = evaluateExpression(parameters[3]);
+              if (ratio > 1) ratio = 1;
+              if (ratio < 0) ratio = 0;
+            }
+            obj3D = new Cylinder(a, b, c, ratio);
+          }
         }
       }
     }
-    
+
     if (obj3D != null) {
       Texture tex = parent.object.getTexture();
       TextureMapping map = parent.object.getTextureMapping();
@@ -317,10 +290,9 @@
     } else {
       return false;
     }
-
     return true;
   }
-
+  
   // Evaluates an Expression like 3*x+sin(a) and returns the value of it or 0 if
   // any error occurred
   double evaluateExpression(String expr) throws Exception {
@@ -369,6 +341,24 @@
     }
   }
 
+  CoordinateSystem evaluateCoordSys(String[] parameters) throws Exception {
+    CoordinateSystem coordsys = null;
+    if (parameters != null) {
+      coordsys = new CoordinateSystem();
+      if (parameters.length >= 3) {
+        coordsys.setOrigin(new Vec3(evaluateExpression(parameters[0]),
+            evaluateExpression(parameters[1]),
+            evaluateExpression(parameters[2])));
+      }
+      if (parameters.length >= 6) {
+        coordsys.setOrientation(evaluateExpression(parameters[3]),
+             evaluateExpression(parameters[4]),
+             evaluateExpression(parameters[5]));
+      }
+    }
+    return coordsys;
+  }
+  
   void showMessage(String text)  {
     new MessageDialog(this.window, text);
   }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java	2009-03-11 01:52:39 UTC (rev 2664)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java	2009-03-11 01:53:39 UTC (rev 2665)
@@ -1,27 +1,60 @@
 package org.reprap.artofillusion;
 
+import java.util.Enumeration;
+import java.util.Hashtable;
+
 /**
  * 
- * Splits lines on the form "function(arg1,arg2)" into
- * name = function
- * parameters = [arg1, arg2]
+ * Splits lines on the form "function1(arg1,arg2)function2(arg1;arg2)..." into
+ * a mapping from name:parameters[arg1, arg2]
  */
 public class MetaCADParser {
-	public Boolean parseError;
-	public String name;
-	public String[] parameters;
 
-	public MetaCADParser(String myExpr, String split) {
-		int posOpenBracket = myExpr.indexOf("(");
-		int posCloseBracket = myExpr.lastIndexOf(")");
+  String expr;
+  Hashtable<String,String[]> expressions = new Hashtable<String,String[]>();
+  
+  public MetaCADParser(String expr) {
+    this.expr = expr;
+  }
 
-		if (posOpenBracket > 0 && posCloseBracket >= 0) {
-			name = myExpr.substring(0, posOpenBracket).trim();
-			String pars = myExpr.substring(posOpenBracket + 1, posCloseBracket).trim();
-			parameters = pars.split(split);
-			parseError = false;
-		} else {
-			parseError = true;
-		}
-	}
+  public Boolean parse() {
+    Boolean found = false;    
+    int pos = 0;
+    int numopens = 0;
+    while (true) {
+      int posOpenBracket = this.expr.indexOf("(", pos);
+      if (posOpenBracket > 0) {
+        String name = this.expr.substring(pos, posOpenBracket).trim();
+        numopens = 1;
+        pos = posOpenBracket;
+        while (numopens > 0) {
+          pos++;
+          if (pos == this.expr.length()) break;
+          if (this.expr.charAt(pos) == '(') numopens++;
+          else if (this.expr.charAt(pos) == ')') numopens--;
+        }
+        if (numopens > 0) {
+          System.out.println("MetaCADParser: Unbalanced expression " + this.expr);
+          return false;
+        }
+        String[] parameters = this.expr.substring(posOpenBracket + 1, pos).trim().split("[,;]");
+        this.expressions.put(name, parameters);     
+        pos++;
+        found = true;
+      }
+      else {
+        return found;
+      }
+      if (pos == this.expr.length()) break;
+    }
+    return found;
+  }
+
+  public Enumeration<String> getNames() {
+    return this.expressions.keys();
+  }
+
+  public String[] getParameters(String key) {
+    return this.expressions.get(key); 
+  }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2712
          http://reprap.svn.sourceforge.net/reprap/?rev=2712&view=rev
Author:   wizard23
Date:     2009-03-29 00:18:37 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
metacadplugin: fixed relative coordinateszstem of extruded parts, showing grid and axes when plugin opens

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorTool.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-28 23:03:44 UTC (rev 2711)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-29 00:18:37 UTC (rev 2712)
@@ -348,10 +348,16 @@
           // Since the result is centered in the origin, offset the extruded object to 
           // move it back to its original position
           // FIXME: Combine this with the user-specified coordinate system
-          coordsys = new CoordinateSystem(new Vec3(), Vec3.vz(), Vec3.vy());
+          
+          CoordinateSystem coordsys2=new CoordinateSystem(new Vec3(), Vec3.vz(), Vec3.vy());
           Vec3 offset = profile.getCoords().fromLocal().times(((Mesh)profileobj).getVertices()[0].r).
-          minus(coordsys.fromLocal().times(((Mesh)obj3D).getVertices()[0].r));
-          coordsys.setOrigin(coordsys.getOrigin().plus(offset));
+          minus(coordsys2.fromLocal().times(((Mesh)obj3D).getVertices()[0].r));
+          if (coordsys != null)
+            coordsys2.setOrigin(coordsys2.getOrigin().plus(coordsys.getOrigin()));
+          else
+            coordsys = new CoordinateSystem(new Vec3(), Vec3.vz(), Vec3.vy());
+            
+          coordsys.setOrigin(coordsys2.getOrigin().plus(offset));
         }
         for (int i=0;i<children.length;i++) children[i].setVisible(false);
       }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorTool.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorTool.java	2009-03-28 23:03:44 UTC (rev 2711)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorTool.java	2009-03-29 00:18:37 UTC (rev 2712)
@@ -12,6 +12,7 @@
 
 import artofillusion.LayoutWindow;
 import artofillusion.ModellingTool;
+import artofillusion.ViewerCanvas;
 import artofillusion.keystroke.KeystrokeManager;
 import artofillusion.keystroke.KeystrokeRecord;
 import artofillusion.ui.Translate;
@@ -61,6 +62,14 @@
    */
   public void commandSelected(LayoutWindow window)
   {
+    for (int i = 0; i < window.getAllViews().length; i++)
+    {
+      window.getAllViews()[i].setGrid(1, 0, true, false);
+      window.getAllViews()[i].setShowAxes(true);
+    }
+    window.repaint();
+    
+    
     // Light check for whether the dialog is already visible and to then close it.
     // FIXME: Should be done better, but then we need to keep track of the dialog per window.
     if (this.dialog != null && this.dialog.isVisible() && this.dialog.getParent() == window) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2744
          http://reprap.svn.sourceforge.net/reprap/?rev=2744&view=rev
Author:   kintel
Date:     2009-03-31 19:24:51 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
Bugfixes: Devaluate and evaluate sometimes didn't show/hide the objects correctly

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java	2009-03-30 08:57:33 UTC (rev 2743)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGEvaluatorEngine.java	2009-03-31 19:24:51 UTC (rev 2744)
@@ -240,9 +240,14 @@
       this.window.getScene().objectModified(parent.getObject());
 
       ObjectInfo[] children = parent.getChildren();
-      for (int i=0;i<children.length;i++) {
-        devaluateNode(children[i], undo);
+      if (children.length > 0) {
+        for (int i=0;i<children.length;i++) {
+          devaluateNode(children[i], undo);
+        }
       }
+      else {
+        parent.setVisible(true);
+      }
     }
     else {
       if (undo != null)

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-30 08:57:33 UTC (rev 2743)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-03-31 19:24:51 UTC (rev 2744)
@@ -443,6 +443,7 @@
       else parent.setCoords(new CoordinateSystem());
       parent.setObject(obj3D);
       parent.object.setTexture(tex, map);
+      parent.setVisible(true);
 
       parent.clearCachedMeshes();
       this.window.updateImage();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2812
          http://reprap.svn.sourceforge.net/reprap/?rev=2812&view=rev
Author:   wizard23
Date:     2009-05-02 21:46:27 +0000 (Sat, 02 May 2009)

Log Message:
-----------


Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-02 21:43:21 UTC (rev 2811)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-02 21:46:27 UTC (rev 2812)
@@ -1,14 +1,10 @@
 package org.reprap.artofillusion;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import artofillusion.object.ObjectInfo;
 
-interface TreeObject
-{
-  ObjectInfo evaluate(); 
-}
-
 class MyObject implements TreeObject {
   ObjectInfo obj;
 
@@ -18,11 +14,16 @@
 }
 
 public class ParsedTree implements TreeObject {
-
-  String name;
-  List<String> parameters;
-  List<TreeObject> children;
+  public String name;
+  public List<String> parameters;
+  public List<TreeObject> children;
   
+  public ParsedTree()
+  {
+	  parameters =  new ArrayList<String>();
+	  children = new ArrayList<TreeObject>();
+  }
+  
   public ObjectInfo evaluate() {
     return null;
   }

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java	2009-05-02 21:46:27 UTC (rev 2812)
@@ -0,0 +1,7 @@
+package org.reprap.artofillusion;
+import artofillusion.object.ObjectInfo;
+
+public interface TreeObject
+{
+  ObjectInfo evaluate(); 
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2814
          http://reprap.svn.sourceforge.net/reprap/?rev=2814&view=rev
Author:   kintel
Date:     2009-05-02 22:56:39 +0000 (Sat, 02 May 2009)

Log Message:
-----------
Removed TreeObject, added MetaCADContext

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java

Removed Paths:
-------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	2009-05-02 22:56:39 UTC (rev 2814)
@@ -0,0 +1,25 @@
+package org.reprap.artofillusion;
+
+import org.cheffo.jeplite.JEP;
+
+public class MetaCADContext {
+
+  public JEP jep = new JEP();
+
+  // Evaluates an Expression like 3*x+sin(a) and returns the value of it or 0 if
+  // any error occurred
+  double evaluateExpression(String expr) throws Exception {
+    try {
+      this.jep.parseExpression(expr);
+      return this.jep.getValue();
+    } catch (Exception ex) {
+      // FIXME: Message?
+//      showMessage("Error while evaluating Expression: \"" + expr
+//          + "\" Syntax Error or unknown variable?");
+      throw (ex);
+      // return 0;
+    }
+  }
+  
+}
+

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-02 22:19:13 UTC (rev 2813)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-02 22:56:39 UTC (rev 2814)
@@ -1,31 +1,44 @@
 package org.reprap.artofillusion;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 
 import artofillusion.object.ObjectInfo;
 
-class MyObject implements TreeObject {
-  ObjectInfo obj;
-
-  public ObjectInfo evaluate() {
-    return this.obj;
-  }       
-}
-
-public class ParsedTree implements TreeObject {
+public class ParsedTree {
   public String name;
   public List<String> parameters;
-  public List<TreeObject> children;
+  public List<ParsedTree> children;
+  ObjectInfo aoiobj;
   
-  public ParsedTree()
-  {
-	  parameters =  new ArrayList<String>();
-	  children = new ArrayList<TreeObject>();
+  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+    ObjectInfo result = null;    
+
+    List<ObjectInfo> resultchildren = new LinkedList<ObjectInfo>();
+    Iterator<ParsedTree> iter = this.children.iterator();
+    while (iter.hasNext()) {
+      ParsedTree treeobject = iter.next();
+      resultchildren.add(treeobject.evaluate(ctx));
+    }
+    
+    Method meth;
+    try {
+      meth = ParsedTree.class.getMethod(this.name, List.class);
+      result = (ObjectInfo)meth.invoke(this, resultchildren);
+    } catch (Exception e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+    }
+
+    return result;
   }
-  
-  public ObjectInfo evaluate() {
-    return null;
+
+  public ParsedTree() {
+    this.parameters =  new ArrayList<String>();
+    this.children = new ArrayList<ParsedTree>();
   }
-  
+    
 }

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java	2009-05-02 22:19:13 UTC (rev 2813)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TreeObject.java	2009-05-02 22:56:39 UTC (rev 2814)
@@ -1,7 +0,0 @@
-package org.reprap.artofillusion;
-import artofillusion.object.ObjectInfo;
-
-public interface TreeObject
-{
-  ObjectInfo evaluate(); 
-}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2816
          http://reprap.svn.sourceforge.net/reprap/?rev=2816&view=rev
Author:   kintel
Date:     2009-05-02 23:45:01 +0000 (Sat, 02 May 2009)

Log Message:
-----------
initial obj implementation

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-02 23:45:01 UTC (rev 2816)
@@ -0,0 +1,10 @@
+package org.reprap.artofillusion;
+
+import artofillusion.object.ObjectInfo;
+
+public class BooleanObj extends ParsedTree {
+
+  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+    return null;
+  }
+}

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-02 23:45:01 UTC (rev 2816)
@@ -0,0 +1,31 @@
+package org.reprap.artofillusion;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class CSObj extends ParsedTree {
+
+  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+
+    assert(this.children.size() == 1);
+    ObjectInfo chinfo = this.children.get(0).evaluate(ctx);
+    
+    CoordinateSystem coordsys = new CoordinateSystem();
+    if (this.parameters.size() >= 3) {
+      coordsys.setOrigin(new Vec3(ctx.evaluateExpression(this.parameters.get(0)),
+                                  ctx.evaluateExpression(this.parameters.get(1)),
+                                  ctx.evaluateExpression(this.parameters.get(2))));
+    }
+    if (this.parameters.size() >= 6) {
+      coordsys.setOrientation(ctx.evaluateExpression(this.parameters.get(3)),
+                              ctx.evaluateExpression(this.parameters.get(4)),
+                              ctx.evaluateExpression(this.parameters.get(5)));
+    }
+    
+    coordsys.transformCoordinates(chinfo.coords.fromLocal());
+    return new ObjectInfo(chinfo.getObject(), coordsys, this.aoiobj.name);
+  }
+
+}

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-02 23:45:01 UTC (rev 2816)
@@ -0,0 +1,24 @@
+package org.reprap.artofillusion;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class SphereObj extends ParsedTree {
+
+  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+    double mainparam = 1.0f;
+    if (this.parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(this.parameters.get(0));
+    }
+    Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
+    if (this.parameters.size() >= 3) {
+      dims.set(mainparam,
+               ctx.evaluateExpression(this.parameters.get(1)),
+               ctx.evaluateExpression(this.parameters.get(2)));
+    }
+    Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
+    return new ObjectInfo(obj3D, new CoordinateSystem(), this.aoiobj.name);
+  }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2820
          http://reprap.svn.sourceforge.net/reprap/?rev=2820&view=rev
Author:   kintel
Date:     2009-05-03 00:53:07 +0000 (Sun, 03 May 2009)

Log Message:
-----------
cleanup and first working sphere

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 00:17:50 UTC (rev 2819)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 00:53:07 UTC (rev 2820)
@@ -1,10 +1,16 @@
 package org.reprap.artofillusion;
 
+import java.util.List;
+
 import artofillusion.object.ObjectInfo;
 
 public class BooleanObj extends ParsedTree {
 
-  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    List<ObjectInfo> children = evaluateChildren(ctx);
+    
+    
+    
     return null;
   }
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-03 00:17:50 UTC (rev 2819)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-03 00:53:07 UTC (rev 2820)
@@ -7,10 +7,10 @@
 
 public class CSObj extends ParsedTree {
 
-  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
 
     assert(this.children.size() == 1);
-    ObjectInfo chinfo = this.children.get(0).evaluate(ctx);
+    ObjectInfo chinfo = this.children.get(0).evaluateObject(ctx);
     
     CoordinateSystem coordsys = new CoordinateSystem();
     if (this.parameters.size() >= 3) {
@@ -25,7 +25,8 @@
     }
     
     coordsys.transformCoordinates(chinfo.coords.fromLocal());
-    return new ObjectInfo(chinfo.getObject(), coordsys, this.aoiobj.name);
+    ObjectInfo result = new ObjectInfo(chinfo.getObject(), coordsys, this.aoiobj.name);
+    return result;
   }
 
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-03 00:17:50 UTC (rev 2819)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-03 00:53:07 UTC (rev 2820)
@@ -3,10 +3,12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.cheffo.jeplite.JEP;
+import org.reprap.artofillusion.parser.ParseException;
 
 import artofillusion.LayoutWindow;
 import artofillusion.Scene;
@@ -36,7 +38,7 @@
   public static final int CUBE      = 13;
   public static final int CYLINDER  = 14;
   
-  JEP jep = new JEP();
+  MetaCADContext context = new MetaCADContext();
 
   public MetaCADEvaluatorEngine(LayoutWindow window) {
     super(window);
@@ -101,15 +103,79 @@
   }
 
   public boolean readParameters() {
-    this.jep = new JEP();
-    this.jep.addStandardConstants();
-    this.jep.addStandardFunctions();
+    this.context.jep = new JEP();
+    this.context.jep.addStandardConstants();
+    this.context.jep.addStandardFunctions();
     return evaluateLines(getParameters());
   }
 
+  
+  /**
+   * 
+   * Recursively extracts an AoI object tree and creates our own ParsedTree representation.
+   * 
+   */
+  public ParsedTree extractTree(ObjectInfo parent) {
+  
+    try {
+      // Try converting the object before parsing
+      convertObject(parent);
+
+      // Parse this ObjectInfo
+      ParsedTree root = org.reprap.artofillusion.parser.MetaCADParser.parseTree(parent.name + ";");
+      root.aoiobj = parent;
+
+      // If the parser returned a subtree, find the leaf node
+      // (we guarantee that there are at most one child of each intermediate node)
+      ParsedTree parenttree = root;
+      while (!parenttree.children.isEmpty()) parenttree = (ParsedTree)parenttree.children.get(0);
+
+      // Build hierarchy recursively
+      ObjectInfo[] objects = parent.children;
+      for (int i=0;i<objects.length;i++) {
+        parenttree.children.add(extractTree(objects[i]));
+      }
+      return root;
+    } catch (ParseException e) {
+      // FIXME: Auto-generated catch block
+      e.printStackTrace();
+    }
+    // FIXME: Something went wrong. Deal with it.
+    return null;
+  }
+
+  /**
+   * Evaluates selected objects
+   */
   public void evaluate() {
-    // only evaluate selected objects if the parameters could be evaluated
-    if (readParameters()) super.evaluate();
+    // Only evaluate selected objects if the parameters could be evaluated
+    if (readParameters()) {
+      // Extract object tree from AoI into our ParsedTree data structure,
+      // one tree per selected node in AoI
+      List<ParsedTree> trees = new LinkedList<ParsedTree>();
+      ObjectInfo[] objects = getSelection();
+      if (objects != null) {
+        for (int i=0;i<objects.length;i++) {
+          trees.add(extractTree(objects[i]));
+        }
+      }
+
+      // Evaluate the parsed trees
+      Iterator<ParsedTree> iter = trees.iterator();
+      while (iter.hasNext()) {
+        ParsedTree tree = iter.next();
+        try {
+          ObjectInfo newinfo = tree.evaluate(this.context);
+        } catch (Exception e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
+        }
+      }
+      
+      this.window.rebuildItemList();
+      this.window.updateImage();
+      this.window.setModified();
+    }
   }
 
   public ObjectInfo evaluateNode(ObjectInfo parent, UndoRecord undo) throws Exception
@@ -518,8 +584,8 @@
   // any error occurred
   double evaluateExpression(String expr) throws Exception {
     try {
-      this.jep.parseExpression(expr);
-      return this.jep.getValue();
+      this.context.jep.parseExpression(expr);
+      return this.context.jep.getValue();
     } catch (Exception ex) {
       showMessage("Error while evaluating Expression: \"" + expr
           + "\" Syntax Error or unknown variable?");
@@ -536,10 +602,10 @@
 
       String name = curLine.substring(0, mark).trim();
       String formula = curLine.substring(mark + 1);
-      this.jep.parseExpression(formula);
-      double value = this.jep.getValue();
+      this.context.jep.parseExpression(formula);
+      double value = this.context.jep.getValue();
       // System.out.println(value);
-      this.jep.addVariable(name, value);
+      this.context.jep.addVariable(name, value);
     } catch (Exception ex) {
       showMessage("Invalid Assignment: \"" + curLine + "\" syntax error?");
       throw (ex);
@@ -562,7 +628,7 @@
     }
   }
 
-  CoordinateSystem evaluateCoordSys(String[] parameters) throws Exception {
+public CoordinateSystem evaluateCoordSys(String[] parameters) throws Exception {
     CoordinateSystem coordsys = null;
     if (parameters != null) {
       coordsys = new CoordinateSystem();
@@ -742,7 +808,7 @@
       v[i].scale(1.0*i/numsegments);
       smooth[i] = 1.0f;
     }
-    Curve path = new Curve(v, smooth, Mesh.NO_SMOOTHING, false);
+    Curve path = new Curve(v, smooth, Mesh.APPROXIMATING, false);
     CoordinateSystem pathCS = new CoordinateSystem();
 
     // FIXME: Support specifying extrusion curves

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-03 00:17:50 UTC (rev 2819)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-03 00:53:07 UTC (rev 2820)
@@ -6,6 +6,8 @@
 import java.util.List;
 
 import artofillusion.object.ObjectInfo;
+import artofillusion.texture.Texture;
+import artofillusion.texture.TextureMapping;
 
 public abstract class ParsedTree {
   public String name;
@@ -13,22 +15,42 @@
   public List<ParsedTree> children;
   ObjectInfo aoiobj;
   
-  public abstract ObjectInfo evaluate(MetaCADContext ctx) throws Exception;
+  public ParsedTree() {
+    this.parameters =  new ArrayList<String>();
+    this.children = new ArrayList<ParsedTree>();
+  }
 
+  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+    ObjectInfo result = evaluateObject(ctx);
+    updateAOI(result);
+    return result;
+  }
+
+  public abstract ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception;
+
   public List<ObjectInfo> evaluateChildren(MetaCADContext ctx) throws Exception {
     List<ObjectInfo> resultchildren = new LinkedList<ObjectInfo>();
     Iterator<ParsedTree> iter = this.children.iterator();
     while (iter.hasNext()) {
       ParsedTree treeobject = iter.next();
-      resultchildren.add(treeobject.evaluate(ctx));
+      resultchildren.add(treeobject.evaluateObject(ctx));
     }
     
     return resultchildren;
   }
 
-  public ParsedTree() {
-    this.parameters =  new ArrayList<String>();
-    this.children = new ArrayList<ParsedTree>();
+  public void updateAOI(ObjectInfo newinfo) {
+    if (this.aoiobj != null) {
+      Texture tex = this.aoiobj.object.getTexture();
+      TextureMapping map = this.aoiobj.object.getTextureMapping();
+
+      this.aoiobj.setObject(newinfo.object);
+      this.aoiobj.setCoords(newinfo.coords);
+      this.aoiobj.object.setTexture(tex, map);
+      this.aoiobj.setVisible(true);
+
+      this.aoiobj.clearCachedMeshes();
+    }
   }
-    
+
 }

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-03 00:53:07 UTC (rev 2820)
@@ -0,0 +1,132 @@
+package org.reprap.artofillusion;
+
+import java.util.Arrays;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Curve;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class PolygonObj extends ParsedTree {
+
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    
+      Vec3[] v=null;
+      
+      if (this.parameters.size() == 4 && this.parameters.get(0).startsWith("star")) {
+        int n = 6;
+        double inner = 3;
+        double outer = 5;
+        if (this.parameters.size() >= 2) n = (int)ctx.evaluateExpression(this.parameters.get(1));
+        if (this.parameters.size() >= 4) {
+          inner  = ctx.evaluateExpression(this.parameters.get(2));
+          outer = ctx.evaluateExpression(this.parameters.get(3));
+        }
+
+        v = createStar(n, inner, outer);
+      }
+      if (this.parameters.size() >= 3 && this.parameters.get(0).startsWith("reg")) {
+        int n = 6;
+        double radiusx = 4;
+        double radiusy = 4;
+        if (this.parameters.size() >= 2) n = (int)ctx.evaluateExpression(this.parameters.get(1));
+        if (this.parameters.size() >= 3) {
+          radiusy = radiusx = ctx.evaluateExpression(this.parameters.get(2));
+        }
+        if (this.parameters.size() >= 4) {
+          radiusy  = ctx.evaluateExpression(this.parameters.get(3));
+        }
+
+        v = createRegular(n, radiusx, radiusy);
+      }
+      
+      if (this.parameters.size() >= 4 && this.parameters.get(0).startsWith("roll")) {
+        int n = 30;
+        double big = 5;
+        double small = 1;
+        double small2 = 0.8;
+        if (this.parameters.size() >= 2) n = (int)ctx.evaluateExpression(this.parameters.get(1));
+        if (this.parameters.size() >= 4) {
+          big  = ctx.evaluateExpression(this.parameters.get(2));
+          small2 = small = ctx.evaluateExpression(this.parameters.get(3));
+        }
+        if (this.parameters.size() == 5) {
+          small2 = ctx.evaluateExpression(this.parameters.get(4));
+        }            
+        
+        v = createRoll(n, big, small, small2);
+      }
+
+      if (v != null) {
+        Object3D obj3D = createPolygon(v);
+        ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), this.aoiobj.name);
+        updateAOI(result);
+        
+        return result;
+      }
+      return null;
+  }
+  
+
+  Vec3[] createRoll(int n, double big, double small, double small2) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      double biga=(2*Math.PI*i)/n;
+      double len = big*biga;
+      double smalla=len/small;
+      double x,y;
+      
+      x = (big+small)*Math.cos(biga) + (small2)*Math.cos(smalla);
+      y = (big+small)*Math.sin(biga) + (small2)*Math.sin(smalla);
+      
+      v[index] = new Vec3(x, y, 0 );
+      
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createRegular(int n, double radiusx, double radiusy) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      v[index] = new Vec3( radiusx*Math.cos( 2*Math.PI * index / (double) n ),
+          radiusy*Math.sin(2*Math.PI * index / (double) n ), 0 );
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createStar(int n, double inner, double outer) {
+    Vec3[] v;
+    v = new Vec3[2*n];
+    int index = 0;
+    for (int i = 0; i < n; i++) {
+      v[index] = new Vec3(Math.cos(Math.PI * index / (double) n),
+                          Math.sin(Math.PI * index / (double) n), 0);
+      v[index].scale(inner);
+      v[index+1] = new Vec3(Math.cos(Math.PI * (index + 1) / (double) n),
+                            Math.sin(Math.PI * (index + 1) / (double) n), 0);
+      v[index+1].scale(outer);
+      index += 2;
+    }
+    return v;
+  }
+
+  Object3D createPolygon(Vec3[] v) {
+    Object3D obj3D;
+    float smoothness[] = new float[v.length];
+    Arrays.fill(smoothness, 0.0f);
+    obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true).convertToTriangleMesh(0);
+    return obj3D;
+  }
+
+  
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-03 00:17:50 UTC (rev 2819)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-03 00:53:07 UTC (rev 2820)
@@ -7,7 +7,7 @@
 
 public class SphereObj extends ParsedTree {
 
-  public ObjectInfo evaluate(MetaCADContext ctx) throws Exception {
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
     double mainparam = 1.0f;
     if (this.parameters.size() >= 1) {
       mainparam = ctx.evaluateExpression(this.parameters.get(0));
@@ -19,6 +19,7 @@
                ctx.evaluateExpression(this.parameters.get(2)));
     }
     Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
-    return new ObjectInfo(obj3D, new CoordinateSystem(), this.aoiobj.name);
+    ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
+    return result;
   }
 }

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java	2009-05-03 00:53:07 UTC (rev 2820)
@@ -0,0 +1,12 @@
+package org.reprap.artofillusion;
+
+import java.util.List;
+
+import artofillusion.object.ObjectInfo;
+
+public class UnionObj extends BooleanObj {
+
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    return null;
+  }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2823
          http://reprap.svn.sourceforge.net/reprap/?rev=2823&view=rev
Author:   kintel
Date:     2009-05-03 01:34:29 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Implemented cube and cylinder

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	2009-05-03 01:34:29 UTC (rev 2823)
@@ -0,0 +1,27 @@
+package org.reprap.artofillusion;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Cube;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class CubeObj extends ParsedTree {
+
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    double mainparam = 1.0f;
+    if (this.parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(this.parameters.get(0));
+    }
+    Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
+    if (this.parameters.size() >= 3) {
+      dims.set(mainparam,
+               ctx.evaluateExpression(this.parameters.get(1)),
+               ctx.evaluateExpression(this.parameters.get(2)));
+    }
+    Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
+    obj3D = new Cube(dims.x, dims.y, dims.z);
+    ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
+    return result;
+  }
+}

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	2009-05-03 01:34:29 UTC (rev 2823)
@@ -0,0 +1,36 @@
+package org.reprap.artofillusion;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.object.Cylinder;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class CylinderObj extends ParsedTree {
+
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    double mainparam = 1.0f;
+    if (this.parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(this.parameters.get(0));
+    }
+    // First (main) parameter is height
+    double height = mainparam;
+    double rx = mainparam;
+    double ry = mainparam;
+    double ratio = 1;
+
+    // Second parameter is radius
+    if (this.parameters.size() >= 2) rx = ry = ctx.evaluateExpression(this.parameters.get(1));
+    // Third parameter define separate y radius
+    if (this.parameters.size() >= 3) ry = ctx.evaluateExpression(this.parameters.get(2));
+    // Fourth parameter define top/bottom radius ratio
+    // Cylinder takes an optional fourth parameter
+    if (this.parameters.size() >= 4) {
+      ratio = ctx.evaluateExpression(this.parameters.get(3));
+      if (ratio > 1) ratio = 1.0;
+      if (ratio < 0) ratio = 0.0;
+    }
+    Object3D obj3D = new Cylinder(height, rx, ry, ratio);
+    ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
+    return result;
+  }
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 01:34:14 UTC (rev 2822)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 01:34:29 UTC (rev 2823)
@@ -5,10 +5,18 @@
 	{
 		name = name.toLowerCase();
 		
-		if (name.startsWith("sphere"))
-		{
-			return new SphereObj();
-		}
+                if (name.startsWith("sphere"))
+                {
+                        return new SphereObj();
+                }
+                if (name.startsWith("cube"))
+                {
+                        return new CubeObj();
+                }
+                if (name.startsWith("cylinder"))
+                {
+                        return new CylinderObj();
+                }
 		else if (name.startsWith("cs"))
 		{
 			return new CSObj();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2826
          http://reprap.svn.sourceforge.net/reprap/?rev=2826&view=rev
Author:   kintel
Date:     2009-05-03 02:32:53 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Implemented difference and intersection

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 02:32:36 UTC (rev 2825)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 02:32:53 UTC (rev 2826)
@@ -1,16 +1,6 @@
 package org.reprap.artofillusion;
 
-import java.util.List;
 
-import artofillusion.object.ObjectInfo;
+public abstract class BooleanObj extends ParsedTree {
 
-public class BooleanObj extends ParsedTree {
-
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
-    List<ObjectInfo> children = evaluateChildren(ctx);
-    
-    
-    
-    return null;
-  }
 }

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java	2009-05-03 02:32:53 UTC (rev 2826)
@@ -0,0 +1,18 @@
+package org.reprap.artofillusion;
+
+import java.util.List;
+
+import artofillusion.object.CSGObject;
+import artofillusion.object.ObjectInfo;
+
+public class DifferenceObj extends BooleanObj {
+
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    
+    CSGHelper helper = new CSGHelper(CSGObject.DIFFERENCE12);
+    List<ObjectInfo> children = evaluateChildren(ctx);
+    helper.addAll(children.iterator());
+    
+    return helper.GetObjectInfo();
+  }
+}

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java	2009-05-03 02:32:53 UTC (rev 2826)
@@ -0,0 +1,18 @@
+package org.reprap.artofillusion;
+
+import java.util.List;
+
+import artofillusion.object.CSGObject;
+import artofillusion.object.ObjectInfo;
+
+public class IntersectionObj extends BooleanObj {
+
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    
+    CSGHelper helper = new CSGHelper(CSGObject.INTERSECTION);
+    List<ObjectInfo> children = evaluateChildren(ctx);
+    helper.addAll(children.iterator());
+    
+    return helper.GetObjectInfo();
+  }
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 02:32:36 UTC (rev 2825)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 02:32:53 UTC (rev 2826)
@@ -9,11 +9,11 @@
                 {
                         return new SphereObj();
                 }
-                if (name.startsWith("cube"))
+                else if (name.startsWith("cube"))
                 {
                         return new CubeObj();
                 }
-                if (name.startsWith("cylinder"))
+                else if (name.startsWith("cylinder"))
                 {
                         return new CylinderObj();
                 }
@@ -21,6 +21,18 @@
 		{
 			return new CSObj();
 		}
+                else if (name.startsWith("union"))
+                {
+                        return new UnionObj();
+                }
+                else if (name.startsWith("difference"))
+                {
+                        return new DifferenceObj();
+                }
+                else if (name.startsWith("intersection"))
+                {
+                        return new IntersectionObj();
+                }
 		
 		throw new Exception("unknown Object type: " + name);
 	}	

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java	2009-05-03 02:32:36 UTC (rev 2825)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java	2009-05-03 02:32:53 UTC (rev 2826)
@@ -2,11 +2,17 @@
 
 import java.util.List;
 
+import artofillusion.object.CSGObject;
 import artofillusion.object.ObjectInfo;
 
 public class UnionObj extends BooleanObj {
 
   public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
-    return null;
+    
+    CSGHelper helper = new CSGHelper(CSGObject.UNION);
+    List<ObjectInfo> children = evaluateChildren(ctx);
+    helper.addAll(children.iterator());
+    
+    return helper.GetObjectInfo();
   }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2830
          http://reprap.svn.sourceforge.net/reprap/?rev=2830&view=rev
Author:   kintel
Date:     2009-05-03 03:05:52 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Refactored boolean objects into BooleanObj

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java

Removed Paths:
-------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 03:03:28 UTC (rev 2829)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 03:05:52 UTC (rev 2830)
@@ -1,6 +1,24 @@
 package org.reprap.artofillusion;
 
+import java.util.List;
 
-public abstract class BooleanObj extends ParsedTree {
+import artofillusion.object.ObjectInfo;
 
+
+public class BooleanObj extends ParsedTree {
+  int type;
+
+  public BooleanObj(int type) {
+    this.type = type;
+  }
+  
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+    
+    CSGHelper helper = new CSGHelper(this.type);
+    List<ObjectInfo> children = evaluateChildren(ctx);
+    helper.addAll(children.iterator());
+    
+    return helper.GetObjectInfo();
+  }
+
 }

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java	2009-05-03 03:03:28 UTC (rev 2829)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/DifferenceObj.java	2009-05-03 03:05:52 UTC (rev 2830)
@@ -1,18 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.List;
-
-import artofillusion.object.CSGObject;
-import artofillusion.object.ObjectInfo;
-
-public class DifferenceObj extends BooleanObj {
-
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
-    
-    CSGHelper helper = new CSGHelper(CSGObject.DIFFERENCE12);
-    List<ObjectInfo> children = evaluateChildren(ctx);
-    helper.addAll(children.iterator());
-    
-    return helper.GetObjectInfo();
-  }
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java	2009-05-03 03:03:28 UTC (rev 2829)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/IntersectionObj.java	2009-05-03 03:05:52 UTC (rev 2830)
@@ -1,18 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.List;
-
-import artofillusion.object.CSGObject;
-import artofillusion.object.ObjectInfo;
-
-public class IntersectionObj extends BooleanObj {
-
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
-    
-    CSGHelper helper = new CSGHelper(CSGObject.INTERSECTION);
-    List<ObjectInfo> children = evaluateChildren(ctx);
-    helper.addAll(children.iterator());
-    
-    return helper.GetObjectInfo();
-  }
-}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 03:03:28 UTC (rev 2829)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 03:05:52 UTC (rev 2830)
@@ -1,5 +1,9 @@
 package org.reprap.artofillusion;
 
+import org.reprap.artofillusion.parser.ParseException;
+
+import artofillusion.object.CSGObject;
+
 public class ObjFactory {
 	public static ParsedTree create(String name) throws Exception
 	{
@@ -23,17 +27,29 @@
 		}
                 else if (name.startsWith("union"))
                 {
-                        return new UnionObj();
+                        return new BooleanObj(CSGObject.UNION);
                 }
                 else if (name.startsWith("difference"))
                 {
-                        return new DifferenceObj();
+                  return new BooleanObj(CSGObject.DIFFERENCE12);
                 }
                 else if (name.startsWith("intersection"))
                 {
-                        return new IntersectionObj();
+                  return new BooleanObj(CSGObject.INTERSECTION);
                 }
+                else if (name.startsWith("star"))
+                {
+                        return new PolygonObj(PolygonObj.STAR);
+                }
+                else if (name.startsWith("reg"))
+                {
+                        return new PolygonObj(PolygonObj.REG);
+                }
+                else if (name.startsWith("roll"))
+                {
+                        return new PolygonObj(PolygonObj.ROLL);
+                }
 		
-		throw new Exception("unknown Object type: " + name);
+		throw new ParseException("unknown Object type: " + name);
 	}	
 }

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java	2009-05-03 03:03:28 UTC (rev 2829)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/UnionObj.java	2009-05-03 03:05:52 UTC (rev 2830)
@@ -1,18 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.List;
-
-import artofillusion.object.CSGObject;
-import artofillusion.object.ObjectInfo;
-
-public class UnionObj extends BooleanObj {
-
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
-    
-    CSGHelper helper = new CSGHelper(CSGObject.UNION);
-    List<ObjectInfo> children = evaluateChildren(ctx);
-    helper.addAll(children.iterator());
-    
-    return helper.GetObjectInfo();
-  }
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2831
          http://reprap.svn.sourceforge.net/reprap/?rev=2831&view=rev
Author:   kintel
Date:     2009-05-03 03:24:57 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Implemented polygons

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-03 03:05:52 UTC (rev 2830)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-03 03:24:57 UTC (rev 2831)
@@ -25,7 +25,7 @@
     }
     
     coordsys.transformCoordinates(chinfo.coords.fromLocal());
-    ObjectInfo result = new ObjectInfo(chinfo.getObject(), coordsys, this.aoiobj.name);
+    ObjectInfo result = new ObjectInfo(chinfo.getObject(), coordsys, "dummy");
     return result;
   }
 

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-03 03:05:52 UTC (rev 2830)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-03 03:24:57 UTC (rev 2831)
@@ -9,67 +9,82 @@
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 
-public class PolygonObj extends ParsedTree {
-
+public class PolygonObj extends ParsedTree
+{
+  public static final int STAR = 0;
+  public static final int REG = 1;
+  public static final int ROLL = 2;
+  int type;
+  
+  public PolygonObj(int type) {
+    this.type = type;
+  }
+  
   public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
     
       Vec3[] v=null;
-      
-      if (this.parameters.size() == 4 && this.parameters.get(0).startsWith("star")) {
+      switch (this.type) {
+      case STAR: {
         int n = 6;
         double inner = 3;
         double outer = 5;
-        if (this.parameters.size() >= 2) n = (int)ctx.evaluateExpression(this.parameters.get(1));
-        if (this.parameters.size() >= 4) {
-          inner  = ctx.evaluateExpression(this.parameters.get(2));
-          outer = ctx.evaluateExpression(this.parameters.get(3));
+        if (this.parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(this.parameters.get(0));
         }
+        if (this.parameters.size() >= 3) {
+          inner  = ctx.evaluateExpression(this.parameters.get(1));
+          outer = ctx.evaluateExpression(this.parameters.get(2));
+        }
 
         v = createStar(n, inner, outer);
+        break;
       }
-      if (this.parameters.size() >= 3 && this.parameters.get(0).startsWith("reg")) {
+      case REG: {
         int n = 6;
         double radiusx = 4;
         double radiusy = 4;
-        if (this.parameters.size() >= 2) n = (int)ctx.evaluateExpression(this.parameters.get(1));
+        if (this.parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(this.parameters.get(0));
+        }
+        if (this.parameters.size() >= 2) {
+          radiusy = radiusx = ctx.evaluateExpression(this.parameters.get(1));
+        }
         if (this.parameters.size() >= 3) {
-          radiusy = radiusx = ctx.evaluateExpression(this.parameters.get(2));
+          radiusy  = ctx.evaluateExpression(this.parameters.get(2));
         }
-        if (this.parameters.size() >= 4) {
-          radiusy  = ctx.evaluateExpression(this.parameters.get(3));
-        }
 
         v = createRegular(n, radiusx, radiusy);
+        break;
       }
-      
-      if (this.parameters.size() >= 4 && this.parameters.get(0).startsWith("roll")) {
+      case ROLL: {
         int n = 30;
         double big = 5;
         double small = 1;
         double small2 = 0.8;
-        if (this.parameters.size() >= 2) n = (int)ctx.evaluateExpression(this.parameters.get(1));
-        if (this.parameters.size() >= 4) {
-          big  = ctx.evaluateExpression(this.parameters.get(2));
-          small2 = small = ctx.evaluateExpression(this.parameters.get(3));
+        if (this.parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(this.parameters.get(0));
         }
-        if (this.parameters.size() == 5) {
-          small2 = ctx.evaluateExpression(this.parameters.get(4));
+        if (this.parameters.size() >= 3) {
+          big  = ctx.evaluateExpression(this.parameters.get(1));
+          small2 = small = ctx.evaluateExpression(this.parameters.get(2));
+        }
+        if (this.parameters.size() == 4) {
+          small2 = ctx.evaluateExpression(this.parameters.get(3));
         }            
-        
+          
         v = createRoll(n, big, small, small2);
+        break;
       }
+      }
 
       if (v != null) {
         Object3D obj3D = createPolygon(v);
-        ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), this.aoiobj.name);
-        updateAOI(result);
-        
+        ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
         return result;
       }
       return null;
   }
   
-
   Vec3[] createRoll(int n, double big, double small, double small2) {
     Vec3[] v;
     v = new Vec3[n];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2836
          http://reprap.svn.sourceforge.net/reprap/?rev=2836&view=rev
Author:   wizard23
Date:     2009-05-03 04:18:05 +0000 (Sun, 03 May 2009)

Log Message:
-----------


Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	2009-05-03 04:14:52 UTC (rev 2835)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	2009-05-03 04:18:05 UTC (rev 2836)
@@ -21,5 +21,22 @@
     }
   }
   
+  // Evaluates Expressions like x=2*radius and assigns the value to the given
+  // variable
+  void evaluateAssignment(String curLine) throws Exception {
+    try {
+      int mark = curLine.indexOf("=");
+
+      String name = curLine.substring(0, mark).trim();
+      String formula = curLine.substring(mark + 1);
+      this.jep.parseExpression(formula);
+      double value = this.jep.getValue();
+      // System.out.println(value);
+      this.jep.addVariable(name, value);
+    } catch (Exception ex) {
+      throw (ex);
+    }
+  }
+  
 }
 

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 04:14:52 UTC (rev 2835)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 04:18:05 UTC (rev 2836)
@@ -49,6 +49,10 @@
                 {
                         return new PolygonObj(PolygonObj.ROLL);
                 }
+                else if (name.startsWith("for"))
+                {
+                        return new ForObj();
+                }
 		
 		throw new ParseException("unknown Object type: " + name);
 	}	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2837
          http://reprap.svn.sourceforge.net/reprap/?rev=2837&view=rev
Author:   kintel
Date:     2009-05-03 04:37:32 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Implemented extrude

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGHelper.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGHelper.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGHelper.java	2009-05-03 04:18:05 UTC (rev 2836)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSGHelper.java	2009-05-03 04:37:32 UTC (rev 2837)
@@ -25,6 +25,12 @@
     this.buffer = null;
   }
   
+  static public ObjectInfo combine(Iterator<ObjectInfo> iter, int op) {
+    CSGHelper helper = new CSGHelper(op);
+    helper.addAll(iter);
+    return helper.GetObjectInfo();
+  }
+  
   public void addAll(Iterator<ObjectInfo> iter) {
     while (iter.hasNext()) {
       Add(iter.next());

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	2009-05-03 04:37:32 UTC (rev 2837)
@@ -0,0 +1,115 @@
+package org.reprap.artofillusion;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.CSGObject;
+import artofillusion.object.Curve;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.object.TriangleMesh;
+import artofillusion.tools.ExtrudeTool;
+
+public class ExtrudeObj extends ParsedTree
+{
+  
+  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  
+    List<ObjectInfo> children = evaluateChildren(ctx);
+
+    // Three first parameters define the extrusion vector
+    Vec3 dir = Vec3.vz();
+    if (this.parameters.size() >= 3) {
+      dir = new Vec3(ctx.evaluateExpression(this.parameters.get(0)),
+                     ctx.evaluateExpression(this.parameters.get(1)),
+                     ctx.evaluateExpression(this.parameters.get(2)));
+    }
+    // 4. parameter is num segments
+    int numsegments = 1;
+    if (this.parameters.size() >= 4) {
+      numsegments = (int)ctx.evaluateExpression(this.parameters.get(3));
+      if (numsegments < 2) numsegments = 1;
+    }
+    // 5. parameter is twist degrees
+    double twist = 0.0;
+    if (this.parameters.size() >= 5) {
+      twist = ctx.evaluateExpression(this.parameters.get(4));
+    }
+    
+    return extrude(children, dir, numsegments, twist);
+  }
+  
+  /**
+   * 
+   * Extrudes the given profiles using the given parameters and returns the result object.
+   * 
+   * @param objects
+   * @param dir
+   * @param numsegments
+   * @param twist
+   * @return an ObjectInfo. The coordsys in the object info is just there to move
+   * the object back to it's original position since the extrusion operation always 
+   * centers the result in the origin.
+   */
+  public ObjectInfo extrude(List<ObjectInfo> objects, Vec3 dir, int numsegments, double twist)
+  {
+    // Build extrusion curve from vector and segments
+    Vec3 v[] = new Vec3[numsegments+1];
+    float smooth[] = new float[v.length];
+    for (int i = 0; i < v.length; i++) {
+      v[i] = new Vec3(dir);
+      v[i].scale(1.0*i/numsegments);
+      smooth[i] = 1.0f;
+    }
+    Curve path = new Curve(v, smooth, Mesh.APPROXIMATING, false);
+    CoordinateSystem pathCS = new CoordinateSystem();
+
+    // FIXME: Support specifying extrusion curves
+    // Extrude each extrudable child object
+    List<ObjectInfo> resultobjects = new LinkedList<ObjectInfo>();
+    Iterator<ObjectInfo> iter = objects.iterator();
+    while(iter.hasNext()) {
+      ObjectInfo profile = iter.next();
+      Object3D profileobj = profile.getObject();
+      if (!(profileobj instanceof TriangleMesh) &&
+          profileobj.canConvertToTriangleMesh() != Object3D.CANT_CONVERT) {
+        profileobj = profileobj.convertToTriangleMesh(0.1);
+      }
+
+      if (profileobj instanceof TriangleMesh) {
+        Object3D obj3D = ExtrudeTool.extrudeMesh((TriangleMesh)profileobj, path, profile.getCoords(), pathCS, twist*Math.PI/180.0, true);
+      
+        // Since the result is centered in the origin, offset the extruded object to 
+        // move it back to its original position
+        // FIXME: Combine this with the user-specified coordinate system
+        CoordinateSystem coordsys = new CoordinateSystem(new Vec3(), Vec3.vz(), Vec3.vy());
+        Vec3 offset = profile.getCoords().fromLocal().times(((Mesh)profileobj).getVertices()[0].r).
+          minus(coordsys.fromLocal().times(((Mesh)obj3D).getVertices()[0].r));
+        coordsys.setOrigin(offset);
+        ObjectInfo objinfo = new ObjectInfo(obj3D, coordsys, "tmp");
+        resultobjects.add(objinfo);
+      }
+      profile.setVisible(false);
+    }
+    if (!resultobjects.isEmpty()) {
+      try {
+        // FIXME: Undo support?
+        // FIXME: We don't really need to union. Join/group should suffice
+        return CSGHelper.combine(resultobjects.iterator(), CSGObject.UNION);
+      }
+      catch (Exception e) {
+      }
+    }
+    // FIXME: Print error
+    return null;
+  }
+
+  
+  
+  
+  
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 04:18:05 UTC (rev 2836)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 04:37:32 UTC (rev 2837)
@@ -49,6 +49,10 @@
                 {
                         return new PolygonObj(PolygonObj.ROLL);
                 }
+                else if (name.startsWith("extrude"))
+                {
+                        return new ExtrudeObj();
+                }
                 else if (name.startsWith("for"))
                 {
                         return new ForObj();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2841
          http://reprap.svn.sourceforge.net/reprap/?rev=2841&view=rev
Author:   kintel
Date:     2009-05-03 05:17:25 +0000 (Sun, 03 May 2009)

Log Message:
-----------
make evaluateObject() return a list of ObjectInfo

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -1,5 +1,6 @@
 package org.reprap.artofillusion;
 
+import java.util.LinkedList;
 import java.util.List;
 
 import artofillusion.object.ObjectInfo;
@@ -12,13 +13,17 @@
     this.type = type;
   }
   
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
     
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+    
     CSGHelper helper = new CSGHelper(this.type);
     List<ObjectInfo> children = evaluateChildren(ctx);
     helper.addAll(children.iterator());
     
-    return helper.GetObjectInfo();
+    result.add(helper.GetObjectInfo());
+    return result;
+    
   }
 
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -1,16 +1,18 @@
 package org.reprap.artofillusion;
 
+import java.util.Iterator;
+import java.util.List;
+
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Vec3;
-import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 
 public class CSObj extends ParsedTree {
 
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
 
     assert(this.children.size() == 1);
-    ObjectInfo chinfo = this.children.get(0).evaluateObject(ctx);
+    List<ObjectInfo> chlist = evaluateChildren(ctx);
     
     CoordinateSystem coordsys = new CoordinateSystem();
     if (this.parameters.size() >= 3) {
@@ -24,9 +26,15 @@
                               ctx.evaluateExpression(this.parameters.get(5)));
     }
     
-    coordsys.transformCoordinates(chinfo.coords.fromLocal());
-    ObjectInfo result = new ObjectInfo(chinfo.getObject(), coordsys, "dummy");
-    return result;
+    Iterator<ObjectInfo> iter = chlist.iterator();
+    while (iter.hasNext()) {
+      ObjectInfo info = iter.next();
+      CoordinateSystem tmp = coordsys.duplicate();
+      coordsys.transformCoordinates(info.coords.fromLocal());
+      info.setCoords(coordsys);
+      coordsys = tmp;
+    }
+    return chlist;
   }
 
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -1,5 +1,8 @@
 package org.reprap.artofillusion;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Vec3;
 import artofillusion.object.Cube;
@@ -8,7 +11,9 @@
 
 public class CubeObj extends ParsedTree {
 
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
     double mainparam = 1.0f;
     if (this.parameters.size() >= 1) {
       mainparam = ctx.evaluateExpression(this.parameters.get(0));
@@ -21,7 +26,7 @@
     }
     Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
     obj3D = new Cube(dims.x, dims.y, dims.z);
-    ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
+    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
     return result;
   }
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -1,5 +1,8 @@
 package org.reprap.artofillusion;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import artofillusion.math.CoordinateSystem;
 import artofillusion.object.Cylinder;
 import artofillusion.object.Object3D;
@@ -7,7 +10,10 @@
 
 public class CylinderObj extends ParsedTree {
 
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
     double mainparam = 1.0f;
     if (this.parameters.size() >= 1) {
       mainparam = ctx.evaluateExpression(this.parameters.get(0));
@@ -30,7 +36,7 @@
       if (ratio < 0) ratio = 0.0;
     }
     Object3D obj3D = new Cylinder(height, rx, ry, ratio);
-    ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
+    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
     return result;
   }
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -17,8 +17,10 @@
 public class ExtrudeObj extends ParsedTree
 {
   
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
   
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
     List<ObjectInfo> children = evaluateChildren(ctx);
 
     // Three first parameters define the extrusion vector
@@ -40,7 +42,8 @@
       twist = ctx.evaluateExpression(this.parameters.get(4));
     }
     
-    return extrude(children, dir, numsegments, twist);
+    result.add(extrude(children, dir, numsegments, twist));
+    return result;
   }
   
   /**

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -3,8 +3,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec3;
 import artofillusion.object.ObjectInfo;
 
 public class ForObj extends ParsedTree {

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -1,6 +1,8 @@
 package org.reprap.artofillusion;
 
 import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
 
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Vec3;
@@ -20,9 +22,11 @@
     this.type = type;
   }
   
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
     
-      Vec3[] v=null;
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    Vec3[] v=null;
       switch (this.type) {
       case STAR: {
         int n = 6;
@@ -79,7 +83,7 @@
 
       if (v != null) {
         Object3D obj3D = createPolygon(v);
-        ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
+        result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
         return result;
       }
       return null;

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-03 05:08:36 UTC (rev 2840)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-03 05:17:25 UTC (rev 2841)
@@ -1,5 +1,8 @@
 package org.reprap.artofillusion;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Vec3;
 import artofillusion.object.Object3D;
@@ -7,7 +10,10 @@
 
 public class SphereObj extends ParsedTree {
 
-  public ObjectInfo evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+ 
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
     double mainparam = 1.0f;
     if (this.parameters.size() >= 1) {
       mainparam = ctx.evaluateExpression(this.parameters.get(0));
@@ -19,7 +25,9 @@
                ctx.evaluateExpression(this.parameters.get(2)));
     }
     Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
-    ObjectInfo result = new ObjectInfo(obj3D, new CoordinateSystem(), "dummy");
+
+    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
+    
     return result;
   }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2843
          http://reprap.svn.sourceforge.net/reprap/?rev=2843&view=rev
Author:   kintel
Date:     2009-05-03 05:41:08 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Added non-working inset

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java	2009-05-03 05:41:08 UTC (rev 2843)
@@ -0,0 +1,201 @@
+package org.reprap.artofillusion;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec2;
+import artofillusion.math.Vec3;
+import artofillusion.object.Curve;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class InsetObj extends ParsedTree
+{
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+
+    double inset = 1.0;
+    if (this.parameters.size() > 0) {
+      inset = ctx.evaluateExpression(this.parameters.get(0));
+    }
+    
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    List<ObjectInfo> children = evaluateChildren(ctx);
+
+    Iterator<ObjectInfo> iter = children.iterator();
+    while (iter.hasNext()) {
+      ObjectInfo chinfo = iter.next();
+      Object3D obj3D = chinfo.object;
+      if (obj3D instanceof Curve) {
+        Curve curve = (Curve)obj3D;
+        Vec3[] newvec = insetPoly(curve.getVertexPositions(), inset);
+        obj3D = PolygonObj.createPolygon(newvec);
+        result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
+      }
+    }
+    return result;
+  }
+  
+  Vec3[] createRoll(int n, double big, double small, double small2) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      double biga=(2*Math.PI*i)/n;
+      double len = big*biga;
+      double smalla=len/small;
+      double x,y;
+      
+      x = (big+small)*Math.cos(biga) + (small2)*Math.cos(smalla);
+      y = (big+small)*Math.sin(biga) + (small2)*Math.sin(smalla);
+      
+      v[index] = new Vec3(x, y, 0 );
+      
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createRegular(int n, double radiusx, double radiusy) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      v[index] = new Vec3( radiusx*Math.cos( 2*Math.PI * index / (double) n ),
+          radiusy*Math.sin(2*Math.PI * index / (double) n ), 0 );
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createStar(int n, double inner, double outer) {
+    Vec3[] v;
+    v = new Vec3[2*n];
+    int index = 0;
+    for (int i = 0; i < n; i++) {
+      v[index] = new Vec3(Math.cos(Math.PI * index / (double) n),
+                          Math.sin(Math.PI * index / (double) n), 0);
+      v[index].scale(inner);
+      v[index+1] = new Vec3(Math.cos(Math.PI * (index + 1) / (double) n),
+                            Math.sin(Math.PI * (index + 1) / (double) n), 0);
+      v[index+1].scale(outer);
+      index += 2;
+    }
+    return v;
+  }
+
+  Object3D createPolygon(Vec3[] v) {
+    Object3D obj3D;
+    float smoothness[] = new float[v.length];
+    Arrays.fill(smoothness, 0.0f);
+    obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true).convertToTriangleMesh(0);
+    return obj3D;
+  }
+
+///////////////////////////////////////////
+//math helpers
+ 
+  // solves system of 2 linear equations in 2 unknown 
+  class LinearSolve2
+  {
+    public boolean error;
+    public double x1, x2;
+  
+    // matrix looks like this 
+    // a b
+    // c d
+    public double det(double a,double b, double c, double d)
+    {
+      return a*d-b*c;  
+    }
+    // the equations look like thsi looks like this
+    // x1*a + x2*b = r1
+    // x1*c + x2*d = r2
+    public LinearSolve2(double a,double b, double c, double d, double r1, double r2)
+    {
+      double q;
+      
+      q=det(a,b,c,d);
+      if (Math.abs(q) < 0.00000001)
+      {
+        this.error = true;
+      }
+      else
+      {
+        this.error = false;
+        this.x1=det(r1,b,r2,d)/q;
+        this.x2=det(a,r1,c,r2)/q;
+      }
+    }
+  }
+  
+  class MetaCADLine {
+    protected Vec2 start,end, dir;
+    protected Vec2 normal;
+    
+    public MetaCADLine(Vec3 s,Vec3 e)
+    {
+      this.start = new Vec2(s.x,s.y);
+      this.end = new Vec2(e.x, e.y);
+      this.dir = this.end.minus(this.start);
+      this.normal = new Vec2(this.dir);
+      this.normal.normalize();
+      this.normal.set(-this.normal.y, this.normal.x);
+    }
+    
+    public void parallelMove(double d)
+    {
+      this.start.add(this.normal.times(d));
+    }
+    
+    public Vec3 intersect3(MetaCADLine l)
+    {
+      LinearSolve2 solve = new LinearSolve2(l.dir.x, -this.dir.x, l.dir.y, -this.dir.y, this.start.x-l.start.x, this.start.y-l.start.y);
+      if (solve.error)
+      {
+        return null;
+      }
+      else
+      {
+        Vec2 point = this.start.plus(this.dir.times(solve.x2)); 
+        return new Vec3(point.x,point.y, 0);
+      }
+    }
+  }
+
+  Vec3[] insetPoly(Vec3[] poly, double inset)
+  {
+    //List<MetaCADLine> lines = new ArrayList<MetaCADLine>();
+    List<Vec3> points = new ArrayList<Vec3>();
+    
+    for (int i = 0; i < poly.length; i++)
+    {
+        int iprev = (i+poly.length-1)%poly.length;
+        int inext = (i+1)%poly.length;
+        
+        MetaCADLine prev = new MetaCADLine(poly[iprev], poly[i]);
+        MetaCADLine next = new MetaCADLine(poly[i], poly[inext]);
+        
+        prev.parallelMove(inset);
+        next.parallelMove(inset);
+        
+        Vec3 intersect=prev.intersect3(next);
+        if (intersect ==  null)
+        {
+          intersect = new Vec3(0,0,0);
+        }
+        points.add(intersect);
+    }
+     
+    return points.toArray(new Vec3[1]);
+  }
+  
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 05:17:39 UTC (rev 2842)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 05:41:08 UTC (rev 2843)
@@ -57,7 +57,11 @@
                 {
                         return new ForObj();
                 }
+                else if (name.startsWith("inset"))
+                {
+                        return new InsetObj();
+                }
 		
-		throw new ParseException("unknown Object type: " + name);
+		throw new ParseException("ObjFactory: Unknown Object type: " + name);
 	}	
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-03 05:17:39 UTC (rev 2842)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-03 05:41:08 UTC (rev 2843)
@@ -139,7 +139,7 @@
     return v;
   }
 
-  Object3D createPolygon(Vec3[] v) {
+  static public Object3D createPolygon(Vec3[] v) {
     Object3D obj3D;
     float smoothness[] = new float[v.length];
     Arrays.fill(smoothness, 0.0f);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2845
          http://reprap.svn.sourceforge.net/reprap/?rev=2845&view=rev
Author:   kintel
Date:     2009-05-03 20:38:12 +0000 (Sun, 03 May 2009)

Log Message:
-----------
Added mesh operator

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java	2009-05-03 20:38:12 UTC (rev 2845)
@@ -0,0 +1,40 @@
+package org.reprap.artofillusion;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.object.Curve;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.object.TriangleMesh;
+
+public class MeshObj extends ParsedTree
+{
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+    
+    double tolerance = 0.2;
+    if (this.parameters.size() > 0) {
+      tolerance = ctx.evaluateExpression(this.parameters.get(0));
+    }
+
+    List<ObjectInfo> results = new LinkedList<ObjectInfo>();
+
+    List<ObjectInfo> children = evaluateChildren(ctx);
+
+    Iterator<ObjectInfo> iter = children.iterator();
+    while(iter.hasNext()) {
+      ObjectInfo chinfo = iter.next();
+      Object3D obj3D = chinfo.getObject();
+      if (obj3D instanceof Curve) {
+        TriangleMesh mesh = obj3D.convertToTriangleMesh(tolerance);
+        ObjectInfo newinfo = new ObjectInfo(mesh, new CoordinateSystem(), "dummy");
+        newinfo.setTexture(ctx.scene.getDefaultTexture(), ctx.scene.getDefaultTexture().getDefaultMapping(mesh));
+        results.add(newinfo);
+      }
+    }
+    return results;
+  }
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 16:59:43 UTC (rev 2844)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-03 20:38:12 UTC (rev 2845)
@@ -5,63 +5,52 @@
 import artofillusion.object.CSGObject;
 
 public class ObjFactory {
-	public static ParsedTree create(String name) throws Exception
-	{
-		name = name.toLowerCase();
-		
-                if (name.startsWith("sphere"))
-                {
-                        return new SphereObj();
-                }
-                else if (name.startsWith("cube"))
-                {
-                        return new CubeObj();
-                }
-                else if (name.startsWith("cylinder"))
-                {
-                        return new CylinderObj();
-                }
-		else if (name.startsWith("cs"))
-		{
-			return new CSObj();
-		}
-                else if (name.startsWith("union"))
-                {
-                        return new BooleanObj(CSGObject.UNION);
-                }
-                else if (name.startsWith("difference"))
-                {
-                  return new BooleanObj(CSGObject.DIFFERENCE12);
-                }
-                else if (name.startsWith("intersection"))
-                {
-                  return new BooleanObj(CSGObject.INTERSECTION);
-                }
-                else if (name.startsWith("star"))
-                {
-                        return new PolygonObj(PolygonObj.STAR);
-                }
-                else if (name.startsWith("reg"))
-                {
-                        return new PolygonObj(PolygonObj.REG);
-                }
-                else if (name.startsWith("roll"))
-                {
-                        return new PolygonObj(PolygonObj.ROLL);
-                }
-                else if (name.startsWith("extrude"))
-                {
-                        return new ExtrudeObj();
-                }
-                else if (name.startsWith("for"))
-                {
-                        return new ForObj();
-                }
-                else if (name.startsWith("inset"))
-                {
-                        return new InsetObj();
-                }
-		
-		throw new ParseException("ObjFactory: Unknown Object type: " + name);
-	}	
+  public static ParsedTree create(String name) throws Exception {
+    name = name.toLowerCase();
+
+    if (name.startsWith("sphere")) {
+      return new SphereObj();
+    }
+    else if (name.startsWith("cube")) {
+      return new CubeObj();
+    }
+    else if (name.startsWith("cylinder")) {
+      return new CylinderObj();
+    }
+    else if (name.startsWith("cs")) {
+      return new CSObj();
+    }
+    else if (name.startsWith("union")) {
+      return new BooleanObj(CSGObject.UNION);
+    }
+    else if (name.startsWith("difference")) {
+      return new BooleanObj(CSGObject.DIFFERENCE12);
+    }
+    else if (name.startsWith("intersection")) {
+      return new BooleanObj(CSGObject.INTERSECTION);
+    }
+    else if (name.startsWith("star")) {
+      return new PolygonObj(PolygonObj.STAR);
+    }
+    else if (name.startsWith("reg")) {
+      return new PolygonObj(PolygonObj.REG);
+    }
+    else if (name.startsWith("roll")) {
+      return new PolygonObj(PolygonObj.ROLL);
+    }
+    else if (name.startsWith("extrude")) {
+      return new ExtrudeObj();
+    }
+    else if (name.startsWith("for")) {
+      return new ForObj();
+    }
+    else if (name.startsWith("inset")) {
+      return new InsetObj();
+    }
+    else if (name.startsWith("mesh")) {
+      return new MeshObj();
+    }
+
+    throw new ParseException("ObjFactory: Unknown Object type: " + name);
+  }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2856
          http://reprap.svn.sourceforge.net/reprap/?rev=2856&view=rev
Author:   wizard23
Date:     2009-05-03 23:05:46 +0000 (Sun, 03 May 2009)

Log Message:
-----------
nowjoining object groups

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	2009-05-03 23:05:46 UTC (rev 2856)
@@ -0,0 +1,127 @@
+package org.reprap.artofillusion;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import artofillusion.MeshViewer;
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Mat4;
+import artofillusion.math.Vec3;
+import artofillusion.object.MeshVertex;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.object.TriangleMesh;
+import artofillusion.object.TriangleMesh.Edge;
+import artofillusion.object.TriangleMesh.Face;
+import artofillusion.object.TriangleMesh.Vertex;
+
+public class ObjectHelper {
+  
+  public static TriangleMesh applyCS(ObjectInfo obj, double tol)
+  {
+    TriangleMesh mesh;
+    
+    if (obj.object.getClass() != TriangleMesh.class)
+      mesh = obj.object.convertToTriangleMesh(tol);
+    else
+      mesh = (TriangleMesh)obj.object;
+    
+    MeshVertex[] v = mesh.getVertices();
+    Mat4 trans = obj.coords.fromLocal();
+    for (int i=0; i < v.length; i++)
+    {
+      trans.transform(v[i].r);
+    }
+    
+    return mesh;
+  }
+  
+  public static ObjectInfo join(List <ObjectInfo> objects, double tol)
+  {
+    int n = objects.size();
+    TriangleMesh[] meshes = new TriangleMesh[n];
+    
+    // get number of vertices/faces in joined mesh
+    int vtot = 0;
+    int ftot = 0;
+    int etot = 0;
+    int[] numV = new int[n];
+    
+    for (int i = 0; i < n; i++)
+    {
+      TriangleMesh mesh = ObjectHelper.applyCS(objects.get(i), tol);
+      meshes[i] = mesh;
+      
+      MeshVertex[] v = mesh.getVertices();
+      Face[] f = mesh.getFaces();
+      Edge[] e = mesh.getEdges();
+      
+      numV[i] = v.length;  // number of vertices in each object
+      vtot += v.length;   // total number of vertices in resulting mesh
+      ftot += f.length;  // total number of faces in resulting mesh
+      etot += e.length;
+    }
+    
+    //
+    Vec3[] va = new Vec3[vtot];   // create an array to hold the new mesh vertex coordinates
+    float[] vs = new float[vtot];  // create an array to hold the new mesh vertex Smoothness values
+    float[] es = new float[etot];  // create an array to hold the new mesh edge Smoothness values
+    int[][] fc = new int[ftot][3];  // create an array to hold the new mesh face data
+    
+    int count=0;
+    int ecount=0;
+    int fcount=0;
+    int disp=0;
+    
+    // cycle through the selected objects
+    for (int i = 0; i < n; i++)
+    {
+      // get vertex information and put into array for new mesh 
+      MeshVertex[] v = meshes[i].getVertices();
+      
+      for (int j = 0; j < v.length; j++)
+      {
+              va[count] = v[j].r;
+              vs[count] = ((Vertex)v[j]).smoothness;
+              count++;
+      }
+      
+      // get edge smoothness values and put into array for new mesh
+      Edge[] e = meshes[i].getEdges();
+      for (int k = 0; k < e.length; k++)
+      {
+              es[ecount]=e[k].smoothness;
+              ecount++;
+      }
+       // get face information and put into array for new mesh 
+      Face[] f=meshes[i].getFaces();
+      for (int j = 0; j < f.length; j++)
+      {
+              fc[fcount][0]=f[j].v1+disp;
+              fc[fcount][1]=f[j].v2+disp;
+              fc[fcount][2]=f[j].v3+disp;
+              fcount++;
+      }
+      disp = disp + numV[i];
+    }
+    
+    TriangleMesh newMesh=new TriangleMesh(va,fc);
+    newMesh.setSmoothingMethod(TriangleMesh.NO_SMOOTHING);
+    
+    // put original smoothness values back
+    MeshVertex[] newVerts = newMesh.getVertices();
+    for (int i = 0; i < newVerts.length; i++)
+    {
+            ((Vertex)newVerts[i]).smoothness=vs[i];
+    }
+    
+    Edge[] newEdges=newMesh.getEdges();
+    for (int i = 0; i < newEdges.length; i++)
+    {
+            newEdges[i].smoothness=es[i];
+    }
+    
+    return new ObjectInfo(newMesh, new CoordinateSystem(), "dummy");
+  }
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-03 22:06:43 UTC (rev 2855)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-03 23:05:46 UTC (rev 2856)
@@ -23,7 +23,7 @@
   public List<ObjectInfo> evaluate(MetaCADContext ctx) throws Exception {
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
     result.addAll(evaluateObject(ctx));
-    updateAOI(result.get(0));
+    updateAOI(ObjectHelper.join(result, 0.1));
     return result;
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2863
          http://reprap.svn.sourceforge.net/reprap/?rev=2863&view=rev
Author:   wizard23
Date:     2009-05-03 23:45:14 +0000 (Sun, 03 May 2009)

Log Message:
-----------


Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-03 23:39:26 UTC (rev 2862)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-03 23:45:14 UTC (rev 2863)
@@ -415,6 +415,8 @@
   }
   
   void showMessage(String text)  {
+    if (text==null)
+      text ="null";
     new MessageDialog(this.window, text);
   }
 

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	2009-05-03 23:39:26 UTC (rev 2862)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	2009-05-03 23:45:14 UTC (rev 2863)
@@ -8,6 +8,7 @@
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Mat4;
 import artofillusion.math.Vec3;
+import artofillusion.object.Cube;
 import artofillusion.object.MeshVertex;
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
@@ -17,6 +18,12 @@
 import artofillusion.object.TriangleMesh.Vertex;
 
 public class ObjectHelper {
+  public static ObjectInfo getErrorObject()
+  {
+    Cube errorObj = new Cube(10,10,10);  
+    
+    return new ObjectInfo(errorObj, new CoordinateSystem(), "dummy");
+  }
   
   public static TriangleMesh applyCS(ObjectInfo obj, double tol)
   {

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-03 23:39:26 UTC (rev 2862)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-03 23:45:14 UTC (rev 2863)
@@ -23,7 +23,12 @@
   public List<ObjectInfo> evaluate(MetaCADContext ctx) throws Exception {
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
     result.addAll(evaluateObject(ctx));
-    updateAOI(ObjectHelper.join(result, 0.1));
+    if(result.size() == 0)
+      updateAOI(ObjectHelper.getErrorObject());
+    else if (result.size() == 1)
+      updateAOI(result.get(0));
+    else
+      updateAOI(ObjectHelper.join(result, 0.1));
     return result;
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2915
          http://reprap.svn.sourceforge.net/reprap/?rev=2915&view=rev
Author:   kintel
Date:     2009-05-09 06:35:57 +0000 (Sat, 09 May 2009)

Log Message:
-----------
Let ObjFactory throw ObjFactoryException

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-09 06:35:10 UTC (rev 2914)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-09 06:35:57 UTC (rev 2915)
@@ -1,11 +1,9 @@
 package org.reprap.artofillusion;
 
-import org.reprap.artofillusion.parser.ParseException;
-
 import artofillusion.object.CSGObject;
 
 public class ObjFactory {
-  public static ParsedTree create(String name) throws Exception {
+  public static ParsedTree create(String name) throws ObjFactoryException {
     name = name.toLowerCase();
 
     if (name.startsWith("sphere")) {
@@ -51,6 +49,6 @@
       return new MeshObj();
     }
 
-    throw new ParseException("ObjFactory: Unknown Object type: " + name);
+    throw new ObjFactoryException("ObjFactory: Unknown Object type: " + name);
   }
 }

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java	2009-05-09 06:35:57 UTC (rev 2915)
@@ -0,0 +1,12 @@
+package org.reprap.artofillusion;
+
+import org.reprap.artofillusion.parser.ParseException;
+
+public class ObjFactoryException extends ParseException {
+
+  private static final long serialVersionUID = -5731809677962819119L;
+
+  public ObjFactoryException(String message) {
+    super(message);
+  }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2924
          http://reprap.svn.sourceforge.net/reprap/?rev=2924&view=rev
Author:   kintel
Date:     2009-05-09 22:04:13 +0000 (Sat, 09 May 2009)

Log Message:
-----------
Split out MetaCADObject from ParsedTree

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -6,20 +6,21 @@
 import artofillusion.object.ObjectInfo;
 
 
-public class BooleanObj extends ParsedTree {
+public class BooleanObj extends MetaCADObject {
   int type;
 
   public BooleanObj(int type) {
     this.type = type;
   }
   
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
     
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
     
     CSGHelper helper = new CSGHelper(this.type);
-    List<ObjectInfo> children = evaluateChildren(ctx);
-    helper.addAll(children.iterator());
+    helper.addAll(ParsedTree.evaluate(ctx, children).iterator());
     
     if (helper.GetObjectInfo() !=  null)
       result.add(helper.GetObjectInfo());

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -7,23 +7,25 @@
 import artofillusion.math.Vec3;
 import artofillusion.object.ObjectInfo;
 
-public class CSObj extends ParsedTree {
+public class CSObj extends MetaCADObject {
 
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                                  List<String> parameters, 
+                                                  List<ParsedTree> children) throws Exception {
 
-    assert(this.children.size() == 1);
-    List<ObjectInfo> chlist = evaluateChildren(ctx);
+    assert(children.size() == 1);
+    List<ObjectInfo> chlist = ParsedTree.evaluate(ctx, children);
     
     CoordinateSystem coordsys = new CoordinateSystem();
-    if (this.parameters.size() >= 3) {
-      coordsys.setOrigin(new Vec3(ctx.evaluateExpression(this.parameters.get(0)),
-                                  ctx.evaluateExpression(this.parameters.get(1)),
-                                  ctx.evaluateExpression(this.parameters.get(2))));
+    if (parameters.size() >= 3) {
+      coordsys.setOrigin(new Vec3(ctx.evaluateExpression(parameters.get(0)),
+                                  ctx.evaluateExpression(parameters.get(1)),
+                                  ctx.evaluateExpression(parameters.get(2))));
     }
-    if (this.parameters.size() >= 6) {
-      coordsys.setOrientation(ctx.evaluateExpression(this.parameters.get(3)),
-                              ctx.evaluateExpression(this.parameters.get(4)),
-                              ctx.evaluateExpression(this.parameters.get(5)));
+    if (parameters.size() >= 6) {
+      coordsys.setOrientation(ctx.evaluateExpression(parameters.get(3)),
+                              ctx.evaluateExpression(parameters.get(4)),
+                              ctx.evaluateExpression(parameters.get(5)));
     }
     
     Iterator<ObjectInfo> iter = chlist.iterator();

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -9,20 +9,23 @@
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 
-public class CubeObj extends ParsedTree {
+public class CubeObj extends MetaCADObject {
 
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
 
     double mainparam = 1.0f;
-    if (this.parameters.size() >= 1) {
-      mainparam = ctx.evaluateExpression(this.parameters.get(0));
+    if (parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(parameters.get(0));
     }
     Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
-    if (this.parameters.size() >= 3) {
+    if (parameters.size() >= 3) {
       dims.set(mainparam,
-               ctx.evaluateExpression(this.parameters.get(1)),
-               ctx.evaluateExpression(this.parameters.get(2)));
+               ctx.evaluateExpression(parameters.get(1)),
+               ctx.evaluateExpression(parameters.get(2)));
     }
     Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
     obj3D = new Cube(dims.x, dims.y, dims.z);

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -8,15 +8,17 @@
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 
-public class CylinderObj extends ParsedTree {
+public class CylinderObj extends MetaCADObject {
 
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
   
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
 
     double mainparam = 1.0f;
-    if (this.parameters.size() >= 1) {
-      mainparam = ctx.evaluateExpression(this.parameters.get(0));
+    if (parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(parameters.get(0));
     }
     // First (main) parameter is height
     double height = mainparam;
@@ -25,13 +27,13 @@
     double ratio = 1;
 
     // Second parameter is radius
-    if (this.parameters.size() >= 2) rx = ry = ctx.evaluateExpression(this.parameters.get(1));
+    if (parameters.size() >= 2) rx = ry = ctx.evaluateExpression(parameters.get(1));
     // Third parameter define separate y radius
-    if (this.parameters.size() >= 3) ry = ctx.evaluateExpression(this.parameters.get(2));
+    if (parameters.size() >= 3) ry = ctx.evaluateExpression(parameters.get(2));
     // Fourth parameter define top/bottom radius ratio
     // Cylinder takes an optional fourth parameter
-    if (this.parameters.size() >= 4) {
-      ratio = ctx.evaluateExpression(this.parameters.get(3));
+    if (parameters.size() >= 4) {
+      ratio = ctx.evaluateExpression(parameters.get(3));
       if (ratio > 1) ratio = 1.0;
       if (ratio < 0) ratio = 0.0;
     }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -14,35 +14,35 @@
 import artofillusion.object.TriangleMesh;
 import artofillusion.tools.ExtrudeTool;
 
-public class ExtrudeObj extends ParsedTree
+public class ExtrudeObj extends MetaCADObject
 {
   
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
   
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
 
-    List<ObjectInfo> children = evaluateChildren(ctx);
-
     // Three first parameters define the extrusion vector
     Vec3 dir = Vec3.vz();
-    if (this.parameters.size() >= 3) {
-      dir = new Vec3(ctx.evaluateExpression(this.parameters.get(0)),
-                     ctx.evaluateExpression(this.parameters.get(1)),
-                     ctx.evaluateExpression(this.parameters.get(2)));
+    if (parameters.size() >= 3) {
+      dir = new Vec3(ctx.evaluateExpression(parameters.get(0)),
+                     ctx.evaluateExpression(parameters.get(1)),
+                     ctx.evaluateExpression(parameters.get(2)));
     }
     // 4. parameter is num segments
     int numsegments = 1;
-    if (this.parameters.size() >= 4) {
-      numsegments = (int)ctx.evaluateExpression(this.parameters.get(3));
+    if (parameters.size() >= 4) {
+      numsegments = (int)ctx.evaluateExpression(parameters.get(3));
       if (numsegments < 2) numsegments = 1;
     }
     // 5. parameter is twist degrees
     double twist = 0.0;
-    if (this.parameters.size() >= 5) {
-      twist = ctx.evaluateExpression(this.parameters.get(4));
+    if (parameters.size() >= 5) {
+      twist = ctx.evaluateExpression(parameters.get(4));
     }
     
-    result.add(extrude(children, dir, numsegments, twist));
+    result.add(extrude(ParsedTree.evaluate(ctx, children), dir, numsegments, twist));
     return result;
   }
   

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -5,20 +5,24 @@
 
 import artofillusion.object.ObjectInfo;
 
-public class ForObj extends ParsedTree {
-  public List<ObjectInfo>  evaluateObject(MetaCADContext ctx) throws Exception {
+public class ForObj extends MetaCADObject {
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
     
     // evaluate first part of for loop i.e. i=0
-    ctx.evaluateAssignment(this.parameters.get(0));
+    ctx.evaluateAssignment(parameters.get(0));
 
     // security count to exit loop even if we fuck up exit condition
     int count = 0;
     // condition loop evaluate the condition i.e. i < 10
-    while (ctx.evaluateExpression(this.parameters.get(1)) != 0 && count < 100) {
-      result.addAll(evaluateChildren(ctx));
+    while (ctx.evaluateExpression(parameters.get(1)) != 0 && count < 100) {
+      result.addAll(ParsedTree.evaluate(ctx, children));
       // "increment" evaluate 3rd for parameter i.e. i=i+1
-      ctx.evaluateAssignment(this.parameters.get(2));
+      ctx.evaluateAssignment(parameters.get(2));
       count++;
     }
     return result;

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -14,21 +14,22 @@
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 
-public class InsetObj extends ParsedTree
+public class InsetObj extends MetaCADObject
 {
   
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
 
     double inset = 1.0;
-    if (this.parameters.size() > 0) {
-      inset = ctx.evaluateExpression(this.parameters.get(0));
+    if (parameters.size() > 0) {
+      inset = ctx.evaluateExpression(parameters.get(0));
     }
     
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
 
-    List<ObjectInfo> children = evaluateChildren(ctx);
+    Iterator<ObjectInfo> iter = ParsedTree.evaluate(ctx, children).iterator();
 
-    Iterator<ObjectInfo> iter = children.iterator();
     while (iter.hasNext()) {
       ObjectInfo chinfo = iter.next();
       Object3D obj3D = chinfo.object;

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -4,31 +4,31 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import artofillusion.math.CoordinateSystem;
 import artofillusion.object.Curve;
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 import artofillusion.object.TriangleMesh;
 
-public class MeshObj extends ParsedTree
+public class MeshObj extends MetaCADObject
 {
   
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
     
     double tolerance = 0.2;
-    if (this.parameters.size() > 0) {
-      tolerance = ctx.evaluateExpression(this.parameters.get(0));
+    if (parameters.size() > 0) {
+      tolerance = ctx.evaluateExpression(parameters.get(0));
     }
 
     List<ObjectInfo> results = new LinkedList<ObjectInfo>();
 
-    List<ObjectInfo> children = evaluateChildren(ctx);
-
-    Iterator<ObjectInfo> iter = children.iterator();
+    Iterator<ObjectInfo> iter = ParsedTree.evaluate(ctx, children).iterator();
     while(iter.hasNext()) {
       ObjectInfo chinfo = iter.next();
       Object3D obj3D = chinfo.getObject();
       if (obj3D instanceof Curve) {
+        assert(obj3D.canConvertToTriangleMesh() != Object3D.CANT_CONVERT);
         TriangleMesh mesh = obj3D.convertToTriangleMesh(tolerance);
         ObjectInfo newinfo = new ObjectInfo(mesh, chinfo.getCoords(), "dummy");
         newinfo.setTexture(ctx.scene.getDefaultTexture(), ctx.scene.getDefaultTexture().getDefaultMapping(mesh));

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -144,7 +144,9 @@
     }
     catch (ObjFactoryException e) {
       // Handle non-MetaCAD object here
-      root = new NativeObj(parent);
+      root = new ParsedTree();
+      root.name = "native";
+      root.aoiobj = parent;
     }
     
     // If the parser returned a subtree, find the leaf node

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -0,0 +1,13 @@
+package org.reprap.artofillusion;
+
+import java.util.List;
+
+import artofillusion.object.ObjectInfo;
+
+public abstract class MetaCADObject {
+
+  public abstract List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception;
+
+}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -1,21 +1,17 @@
 package org.reprap.artofillusion;
 
-import java.util.LinkedList;
 import java.util.List;
 
 import artofillusion.object.ObjectInfo;
 
 
-public class NativeObj extends ParsedTree {
+public class NativeObj extends MetaCADObject {
 
-  public NativeObj(ObjectInfo aoiobj) {
-    this.aoiobj = aoiobj;
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    return null;
   }
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-    result.add(this.aoiobj); 
-    return result;
-  }
 
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -3,10 +3,13 @@
 import artofillusion.object.CSGObject;
 
 public class ObjFactory {
-  public static ParsedTree create(String name) throws ObjFactoryException {
+  public static MetaCADObject create(String name) throws ObjFactoryException {
     name = name.toLowerCase();
 
-    if (name.startsWith("sphere")) {
+    if (name == "native") {
+      return new NativeObj();
+    }
+    else if (name.startsWith("sphere")) {
       return new SphereObj();
     }
     else if (name.startsWith("cube")) {

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -9,8 +9,9 @@
 import artofillusion.texture.Texture;
 import artofillusion.texture.TextureMapping;
 
-public abstract class ParsedTree {
+public class ParsedTree {
   public String name;
+  public MetaCADObject cadobj;
   public List<String> parameters;
   public List<ParsedTree> children;
   ObjectInfo aoiobj;
@@ -21,22 +22,30 @@
   }
 
   public List<ObjectInfo> evaluate(MetaCADContext ctx) throws Exception {
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-    result.addAll(evaluateObject(ctx));
-    if(result.size() == 0)
+    
+    this.cadobj = ObjFactory.create(this.name);
+    
+    List<ObjectInfo> result = this.cadobj.evaluateObject(ctx, this.parameters, this.children);
+    if (result == null) {
+      result = new LinkedList<ObjectInfo>();
+      result.add(this.aoiobj);
+    }
+    else if (result.size() == 0) {
       updateAOI(ObjectHelper.getErrorObject());
-    else if (result.size() == 1)
+    }
+    else if (result.size() == 1) {
       updateAOI(result.get(0));
-    else
+    }
+    else {
       updateAOI(ObjectHelper.join(result, 0.1));
+    }
     return result;
   }
 
-  public abstract List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception;
-
-  public List<ObjectInfo> evaluateChildren(MetaCADContext ctx) throws Exception {
+  public static List<ObjectInfo> evaluate(MetaCADContext ctx, List<ParsedTree> children) throws Exception {
+    if (children.size() == 0) return null;
     List<ObjectInfo> resultchildren = new LinkedList<ObjectInfo>();
-    Iterator<ParsedTree> iter = this.children.iterator();
+    Iterator<ParsedTree> iter = children.iterator();
     while (iter.hasNext()) {
       ParsedTree treeobject = iter.next();
       resultchildren.addAll(treeobject.evaluate(ctx));
@@ -48,7 +57,7 @@
     return resultchildren;
   }
 
-  public void updateAOI(ObjectInfo newinfo) {
+  void updateAOI(ObjectInfo newinfo) {
     if (this.aoiobj != null) {
       Texture tex = this.aoiobj.object.getTexture();
       TextureMapping map = this.aoiobj.object.getTextureMapping();

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -11,7 +11,7 @@
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 
-public class PolygonObj extends ParsedTree
+public class PolygonObj extends MetaCADObject
 {
   public static final int STAR = 0;
   public static final int REG = 1;
@@ -22,7 +22,9 @@
     this.type = type;
   }
   
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
     
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
 
@@ -32,12 +34,12 @@
         int n = 6;
         double inner = 3;
         double outer = 5;
-        if (this.parameters.size() >= 1) {
-          n = (int)ctx.evaluateExpression(this.parameters.get(0));
+        if (parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(parameters.get(0));
         }
-        if (this.parameters.size() >= 3) {
-          inner  = ctx.evaluateExpression(this.parameters.get(1));
-          outer = ctx.evaluateExpression(this.parameters.get(2));
+        if (parameters.size() >= 3) {
+          inner  = ctx.evaluateExpression(parameters.get(1));
+          outer = ctx.evaluateExpression(parameters.get(2));
         }
 
         v = createStar(n, inner, outer);
@@ -47,14 +49,14 @@
         int n = 6;
         double radiusx = 4;
         double radiusy = 4;
-        if (this.parameters.size() >= 1) {
-          n = (int)ctx.evaluateExpression(this.parameters.get(0));
+        if (parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(parameters.get(0));
         }
-        if (this.parameters.size() >= 2) {
-          radiusy = radiusx = ctx.evaluateExpression(this.parameters.get(1));
+        if (parameters.size() >= 2) {
+          radiusy = radiusx = ctx.evaluateExpression(parameters.get(1));
         }
-        if (this.parameters.size() >= 3) {
-          radiusy  = ctx.evaluateExpression(this.parameters.get(2));
+        if (parameters.size() >= 3) {
+          radiusy  = ctx.evaluateExpression(parameters.get(2));
         }
 
         v = createRegular(n, radiusx, radiusy);
@@ -65,15 +67,15 @@
         double big = 5;
         double small = 1;
         double small2 = 0.8;
-        if (this.parameters.size() >= 1) {
-          n = (int)ctx.evaluateExpression(this.parameters.get(0));
+        if (parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(parameters.get(0));
         }
-        if (this.parameters.size() >= 3) {
-          big  = ctx.evaluateExpression(this.parameters.get(1));
-          small2 = small = ctx.evaluateExpression(this.parameters.get(2));
+        if (parameters.size() >= 3) {
+          big  = ctx.evaluateExpression(parameters.get(1));
+          small2 = small = ctx.evaluateExpression(parameters.get(2));
         }
-        if (this.parameters.size() == 4) {
-          small2 = ctx.evaluateExpression(this.parameters.get(3));
+        if (parameters.size() == 4) {
+          small2 = ctx.evaluateExpression(parameters.get(3));
         }            
           
         v = createRoll(n, big, small, small2);

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-09 21:59:15 UTC (rev 2923)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-09 22:04:13 UTC (rev 2924)
@@ -8,21 +8,23 @@
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 
-public class SphereObj extends ParsedTree {
+public class SphereObj extends MetaCADObject {
 
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx) throws Exception {
- 
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
 
     double mainparam = 1.0f;
-    if (this.parameters.size() >= 1) {
-      mainparam = ctx.evaluateExpression(this.parameters.get(0));
+    if (parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(parameters.get(0));
     }
     Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
-    if (this.parameters.size() >= 3) {
+    if (parameters.size() >= 3) {
       dims.set(mainparam,
-               ctx.evaluateExpression(this.parameters.get(1)),
-               ctx.evaluateExpression(this.parameters.get(2)));
+               ctx.evaluateExpression(parameters.get(1)),
+               ctx.evaluateExpression(parameters.get(2)));
     }
     Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2926
          http://reprap.svn.sourceforge.net/reprap/?rev=2926&view=rev
Author:   wizard23
Date:     2009-05-10 00:02:23 +0000 (Sun, 10 May 2009)

Log Message:
-----------
macros work now

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/language/MacroPrototype.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java	2009-05-10 00:02:23 UTC (rev 2926)
@@ -0,0 +1,54 @@
+package org.reprap.artofillusion;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.cheffo.jeplite.ASTVarNode;
+import org.reprap.artofillusion.language.MacroPrototype;
+
+import artofillusion.object.ObjectInfo;
+
+public class MacroObj extends MetaCADObject {
+  protected MacroPrototype prototype;   
+  
+  public MacroObj(MacroPrototype prototype)
+  {
+    this.prototype = prototype;
+  }
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    if (parameters.size() >= prototype.variables.size())
+    {
+      int n = prototype.variables.size();      
+      ASTVarNode[] backup = new ASTVarNode[n];
+      double[] values = new double[n];
+      // backup variables
+      for (int i = 0;  i < n; i++)
+      {
+        backup[i] = ctx.jep.getVarNode(prototype.variables.get(i)); 
+        values[i] = ctx.evaluateExpression(parameters.get(i));
+      }
+      // replace variables
+      for (int i = 0;  i < n; i++)
+      {
+        ctx.jep.setVarNode(prototype.variables.get(i), null);
+        ctx.jep.addVariable(prototype.variables.get(i), values[i]);
+      }
+      // evaluate
+      List<ObjectInfo> result = ParsedTree.evaluate(ctx, prototype.children);
+      // restore previous variables
+      for (int i = 0;  i < n; i++)
+      {
+        ctx.jep.setVarNode(prototype.variables.get(i), backup[i]);
+      }
+      return result;
+    }
+    else
+    {
+      throw new Exception("Not enough parameters  given to Macro Call: " + prototype.name);
+    }
+  }
+
+}
\ No newline at end of file

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	2009-05-09 22:26:27 UTC (rev 2925)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	2009-05-10 00:02:23 UTC (rev 2926)
@@ -27,10 +27,8 @@
       return this.jep.getValue();
     } catch (Exception ex) {
       // FIXME: Message?
-//      showMessage("Error while evaluating Expression: \"" + expr
-//          + "\" Syntax Error or unknown variable?");
-      throw (ex);
-      // return 0;
+      throw (new Exception("Error while evaluating Expression: \"" + expr
+                           + "\" Syntax Error or unknown variable?", ex));
     }
   } 
   

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-09 22:26:27 UTC (rev 2925)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-10 00:02:23 UTC (rev 2926)
@@ -193,7 +193,7 @@
       }
       catch (Exception e) {
         e.printStackTrace();
-        showMessage(e.getMessage());
+        showMessage(e.toString());
       }
     }
   }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-09 22:26:27 UTC (rev 2925)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-10 00:02:23 UTC (rev 2926)
@@ -1,9 +1,11 @@
 package org.reprap.artofillusion;
 
+import org.reprap.artofillusion.language.MacroPrototype;
+
 import artofillusion.object.CSGObject;
 
 public class ObjFactory {
-  public static MetaCADObject create(String name) throws ObjFactoryException {
+  public static MetaCADObject create(String name, MetaCADContext ctx) throws ObjFactoryException {
     name = name.toLowerCase();
 
     if (name == "native") {
@@ -51,6 +53,13 @@
     else if (name.startsWith("mesh")) {
       return new MeshObj();
     }
+    else {
+      MacroPrototype macroPrototype = ctx.macros.get(name.toLowerCase());
+      if (macroPrototype != null)
+      {
+        return new MacroObj(macroPrototype);
+      }
+    }
 
     throw new ObjFactoryException("ObjFactory: Unknown Object type: " + name);
   }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-09 22:26:27 UTC (rev 2925)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-10 00:02:23 UTC (rev 2926)
@@ -23,7 +23,7 @@
 
   public List<ObjectInfo> evaluate(MetaCADContext ctx) throws Exception {
     
-    this.cadobj = ObjFactory.create(this.name);
+    this.cadobj = ObjFactory.create(this.name, ctx);
     
     List<ObjectInfo> result = this.cadobj.evaluateObject(ctx, this.parameters, this.children);
     if (result == null) {

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/language/MacroPrototype.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/language/MacroPrototype.java	2009-05-09 22:26:27 UTC (rev 2925)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/language/MacroPrototype.java	2009-05-10 00:02:23 UTC (rev 2926)
@@ -7,13 +7,13 @@
 
 public class MacroPrototype implements ParsedStatement {
   public String name;
-  public List<String> parameters;
+  public List<String> variables;
   public List<ParsedTree> children;
   
   public MacroPrototype(String n, List<String> p, List<ParsedTree> c)
   {
     name = n;
-    parameters = p;
+    variables = p;
     children =  c;
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2938
          http://reprap.svn.sourceforge.net/reprap/?rev=2938&view=rev
Author:   wizard23
Date:     2009-05-10 02:42:08 +0000 (Sun, 10 May 2009)

Log Message:
-----------
create macro button shouldwork now

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TextChangedListener.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java	2009-05-10 02:39:09 UTC (rev 2937)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java	2009-05-10 02:42:08 UTC (rev 2938)
@@ -11,6 +11,8 @@
 import java.awt.Insets;
 import java.awt.Rectangle;
 
+import javax.swing.SwingUtilities;
+
 import artofillusion.LayoutWindow;
 import artofillusion.ui.Translate;
 import buoy.event.CommandEvent;
@@ -30,7 +32,7 @@
 /**
  * CSGEvaluator dialog
  */
-class MetaCADEvaluatorDialog extends BDialog
+class MetaCADEvaluatorDialog extends BDialog implements TextChangedListener
 {
   protected  MetaCADEvaluatorEngine engine;
   protected LayoutWindow window;
@@ -50,6 +52,8 @@
       Translate.text("MetaCADEvaluator:Operations"), null, null, null, null, null, null
   };
   
+  protected BTextArea paramtab;
+  
   public MetaCADEvaluatorDialog(LayoutWindow window)
   {
     super(window, Translate.text("MetaCADEvaluator:name"), false); // Modeless
@@ -83,13 +87,15 @@
     }
     
     // Parameters tab
-    BTextArea paramtab=new BTextArea(this.engine.getParameters(), 10, 20) {
+    paramtab=new BTextArea(this.engine.getParameters(), 10, 20) {
       @Override
       protected void textChanged() {
         super.textChanged();
         MetaCADEvaluatorDialog.this.engine.setParameters(this.getText());
       }
     };
+    engine.addParameterChangedListener(this);
+    
     BScrollPane scrollpane = new BScrollPane(paramtab);
     tabcontainer.add(scrollpane, "Parameters");
 
@@ -153,4 +159,19 @@
   {
     dispose();
   }
+
+  public void textChanged(Object source) {
+    final String newText = engine.getParameters();
+    if (!newText.equals(paramtab.getText()))
+    {
+      SwingUtilities.invokeLater(new Runnable()
+      {
+        public void run()
+        {
+          paramtab.setText(newText);
+        }
+      });
+      
+    }
+  }
 }
\ No newline at end of file

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-10 02:39:09 UTC (rev 2937)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-10 02:42:08 UTC (rev 2938)
@@ -88,6 +88,12 @@
   public void setParameters(String text) {
     this.window.getScene().setMetadata(
         MetaCADEvaluatorEngine.class.getName() + "Parameters", text);
+    Iterator<TextChangedListener> iter = parameterListeners.iterator();
+   
+    while (iter.hasNext())
+    {
+      iter.next().textChanged(this);
+    }
   }
 
   public String getParameters() {
@@ -725,9 +731,6 @@
     this.window.setModified();
   }
 
-  private void createMacro(String macroname, List<ObjectInfo> objects) {
-  }
-
   public void test()
   
   {
@@ -738,5 +741,54 @@
     // only evaluate selected objects if the parameters could be evaluated
     if (readParameters()) super.execute(operation, minimum_children);
   }
-
-}
\ No newline at end of file
+  
+  private void createMacro(String macroname, List<ObjectInfo> asList) {
+    StringBuilder sb = new StringBuilder();
+    
+    sb.append(getParameters());
+    sb.append("\n");
+    
+    sb.append(macroname);
+    sb.append(" {\n");
+    Iterator<ObjectInfo> iter = asList.iterator();
+    while (iter.hasNext())
+    {
+      ObjectInfo objInfo = iter.next();
+      objectInfoToString(objInfo, sb, 1);
+    }
+    sb.append("}");
+    
+    this.setParameters(sb.toString());
+  }
+  
+  private void objectInfoToString(ObjectInfo objInfo, StringBuilder sb, int indent)
+  {
+    int i;
+    
+    for (i = 0; i < indent; i++)
+      sb.append(' ');
+    
+    sb.append(objInfo.name);
+    
+    if (objInfo.children.length > 0)
+    {
+      sb.append(" {\n");
+      for (i = 0; i < objInfo.children.length; i++)
+        objectInfoToString(objInfo.children[i], sb, indent+1);
+      
+      for (i = 0; i < indent; i++)
+        sb.append(' ');
+      sb.append("}\n");
+    }
+    else
+    {
+      sb.append(";\n");
+    }
+  }
+  
+  protected List<TextChangedListener> parameterListeners=new LinkedList<TextChangedListener>();
+  public void addParameterChangedListener(TextChangedListener listener)
+  {
+    parameterListeners.add(listener);
+  }
+}

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TextChangedListener.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TextChangedListener.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/TextChangedListener.java	2009-05-10 02:42:08 UTC (rev 2938)
@@ -0,0 +1,6 @@
+package org.reprap.artofillusion;
+
+public interface TextChangedListener {
+  public void textChanged(Object source);
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2939
          http://reprap.svn.sourceforge.net/reprap/?rev=2939&view=rev
Author:   kintel
Date:     2009-05-10 02:54:52 +0000 (Sun, 10 May 2009)

Log Message:
-----------
minor reorganization and cleanup

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CubeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CylinderObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ExtrudeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ForObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/LatheObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MacroObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MeshObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MetaCADObject.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/NativeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactoryException.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/PolygonObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/SphereObj.java

Removed Paths:
-------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/JoinCurvesObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/LatheObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,31 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.object.ObjectInfo;
-
-
-public class BooleanObj extends MetaCADObject {
-  int type;
-
-  public BooleanObj(int type) {
-    this.type = type;
-  }
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-    
-    CSGHelper helper = new CSGHelper(this.type);
-    helper.addAll(ParsedTree.evaluate(ctx, children).iterator());
-    
-    if (helper.GetObjectInfo() !=  null)
-      result.add(helper.GetObjectInfo());
-    return result;
-    
-  }
-
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,39 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.Iterator;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec3;
-import artofillusion.object.ObjectInfo;
-
-public class CSObj extends MetaCADObject {
-
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-
-    assert(children.size() == 1);
-    List<ObjectInfo> chlist = ParsedTree.evaluate(ctx, children);
-    
-    CoordinateSystem coordsys = new CoordinateSystem();
-    if (parameters.size() >= 3) {
-      coordsys.setOrigin(new Vec3(ctx.evaluateExpression(parameters.get(0)),
-                                  ctx.evaluateExpression(parameters.get(1)),
-                                  ctx.evaluateExpression(parameters.get(2))));
-    }
-    if (parameters.size() >= 6) {
-      coordsys.setOrientation(ctx.evaluateExpression(parameters.get(3)),
-                              ctx.evaluateExpression(parameters.get(4)),
-                              ctx.evaluateExpression(parameters.get(5)));
-    }
-    
-    Iterator<ObjectInfo> iter = chlist.iterator();
-    while (iter.hasNext()) {
-      ObjectInfo info = iter.next();
-      info.coords.transformCoordinates(coordsys.fromLocal());
-    }
-    return chlist;
-  }
-
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,35 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec3;
-import artofillusion.object.Cube;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-
-public class CubeObj extends MetaCADObject {
-
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-
-    double mainparam = 1.0f;
-    if (parameters.size() >= 1) {
-      mainparam = ctx.evaluateExpression(parameters.get(0));
-    }
-    Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
-    if (parameters.size() >= 3) {
-      dims.set(mainparam,
-               ctx.evaluateExpression(parameters.get(1)),
-               ctx.evaluateExpression(parameters.get(2)));
-    }
-    Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
-    obj3D = new Cube(dims.x, dims.y, dims.z);
-    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
-    return result;
-  }
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,44 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.object.Cylinder;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-
-public class CylinderObj extends MetaCADObject {
-
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-  
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-
-    double mainparam = 1.0f;
-    if (parameters.size() >= 1) {
-      mainparam = ctx.evaluateExpression(parameters.get(0));
-    }
-    // First (main) parameter is height
-    double height = mainparam;
-    double rx = mainparam;
-    double ry = mainparam;
-    double ratio = 1;
-
-    // Second parameter is radius
-    if (parameters.size() >= 2) rx = ry = ctx.evaluateExpression(parameters.get(1));
-    // Third parameter define separate y radius
-    if (parameters.size() >= 3) ry = ctx.evaluateExpression(parameters.get(2));
-    // Fourth parameter define top/bottom radius ratio
-    // Cylinder takes an optional fourth parameter
-    if (parameters.size() >= 4) {
-      ratio = ctx.evaluateExpression(parameters.get(3));
-      if (ratio > 1) ratio = 1.0;
-      if (ratio < 0) ratio = 0.0;
-    }
-    Object3D obj3D = new Cylinder(height, rx, ry, ratio);
-    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
-    return result;
-  }
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,109 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec3;
-import artofillusion.object.Curve;
-import artofillusion.object.Mesh;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-import artofillusion.object.TriangleMesh;
-import artofillusion.tools.ExtrudeTool;
-
-public class ExtrudeObj extends MetaCADObject
-{
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-  
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-
-    // Three first parameters define the extrusion vector
-    Vec3 dir = Vec3.vz();
-    if (parameters.size() >= 3) {
-      dir = new Vec3(ctx.evaluateExpression(parameters.get(0)),
-                     ctx.evaluateExpression(parameters.get(1)),
-                     ctx.evaluateExpression(parameters.get(2)));
-    }
-    // 4. parameter is num segments
-    int numsegments = 1;
-    if (parameters.size() >= 4) {
-      numsegments = (int)ctx.evaluateExpression(parameters.get(3));
-      if (numsegments < 2) numsegments = 1;
-    }
-    // 5. parameter is twist degrees
-    double twist = 0.0;
-    if (parameters.size() >= 5) {
-      twist = ctx.evaluateExpression(parameters.get(4));
-    }
-    
-    result.addAll(extrude(ParsedTree.evaluate(ctx, children), dir, numsegments, twist));
-    return result;
-  }
-  
-  /**
-   * 
-   * Extrudes the given profiles using the given parameters and returns the result object.
-   * 
-   * @param objects
-   * @param dir
-   * @param numsegments
-   * @param twist
-   * @return a list of ObjectInfos. The coordsys in the object infos are just there to move
-   * the objects back to their original positions since the extrusion operation always 
-   * centers the result in the origin.
-   */
-  public List<ObjectInfo> extrude(List<ObjectInfo> objects, Vec3 dir, int numsegments, double twist)
-  {
-    // Build extrusion curve from vector and segments
-    Vec3 v[] = new Vec3[numsegments+1];
-    float smooth[] = new float[v.length];
-    for (int i = 0; i < v.length; i++) {
-      v[i] = new Vec3(dir);
-      v[i].scale(1.0*i/numsegments);
-      smooth[i] = 1.0f;
-    }
-    Curve path = new Curve(v, smooth, Mesh.APPROXIMATING, false);
-    CoordinateSystem pathCS = new CoordinateSystem();
-
-    // FIXME: Support specifying extrusion curves
-    // Extrude each extrudable child object
-    List<ObjectInfo> resultobjects = new LinkedList<ObjectInfo>();
-    Iterator<ObjectInfo> iter = objects.iterator();
-    while (iter.hasNext()) {
-      ObjectInfo profile = iter.next();
-      Object3D profileobj = profile.getObject();
-
-      Object3D obj3D = null;
-      if (profileobj instanceof TriangleMesh) {
-        obj3D = ExtrudeTool.extrudeMesh((TriangleMesh)profileobj, path, profile.getCoords(), pathCS, twist*Math.PI/180.0, true);
-      }
-      else if (profileobj instanceof Curve) {
-        obj3D = ExtrudeTool.extrudeCurve((Curve)profileobj, path, profile.getCoords(), pathCS, twist*Math.PI/180.0, true);
-      }
-      if (obj3D != null) {
-        // Since the result is centered in the origin, offset the extruded object to 
-        // move it back to its original position
-        // FIXME: Combine this with the user-specified coordinate system
-        CoordinateSystem coordsys = new CoordinateSystem(new Vec3(), Vec3.vz(), Vec3.vy());
-        Vec3 offset = profile.getCoords().fromLocal().times(((Mesh)profileobj).getVertices()[0].r).
-          minus(coordsys.fromLocal().times(((Mesh)obj3D).getVertices()[0].r));
-        coordsys.setOrigin(offset);
-        ObjectInfo objinfo = new ObjectInfo(obj3D, coordsys, "tmp");
-        resultobjects.add(objinfo);
-      }
-      profile.setVisible(false);
-    }
-    // FIXME: Undo support?
-    return resultobjects;
-}
-
-  
-  
-  
-  
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,31 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.object.ObjectInfo;
-
-public class ForObj extends MetaCADObject {
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-    
-    // evaluate first part of for loop i.e. i=0
-    ctx.evaluateAssignment(parameters.get(0));
-
-    // security count to exit loop even if we fuck up exit condition
-    int count = 0;
-    // condition loop evaluate the condition i.e. i < 10
-    while (ctx.evaluateExpression(parameters.get(1)) != 0 && count < 100) {
-      result.addAll(ParsedTree.evaluate(ctx, children));
-      // "increment" evaluate 3rd for parameter i.e. i=i+1
-      ctx.evaluateAssignment(parameters.get(2));
-      count++;
-    }
-    return result;
-  }
-
-}
\ No newline at end of file

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,202 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec2;
-import artofillusion.math.Vec3;
-import artofillusion.object.Curve;
-import artofillusion.object.Mesh;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-
-public class InsetObj extends MetaCADObject
-{
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-
-    double inset = 1.0;
-    if (parameters.size() > 0) {
-      inset = ctx.evaluateExpression(parameters.get(0));
-    }
-    
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-
-    Iterator<ObjectInfo> iter = ParsedTree.evaluate(ctx, children).iterator();
-
-    while (iter.hasNext()) {
-      ObjectInfo chinfo = iter.next();
-      Object3D obj3D = chinfo.object;
-      if (obj3D instanceof Curve) {
-        Curve curve = (Curve)obj3D;
-        Vec3[] newvec = insetPoly(curve.getVertexPositions(), inset);
-        obj3D = PolygonObj.createPolygon(newvec);
-        result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
-      }
-    }
-    return result;
-  }
-  
-  Vec3[] createRoll(int n, double big, double small, double small2) {
-    Vec3[] v;
-    v = new Vec3[n];
-    int index = 0;
-    for (int i = 0; i < n; i++)
-    {
-      double biga=(2*Math.PI*i)/n;
-      double len = big*biga;
-      double smalla=len/small;
-      double x,y;
-      
-      x = (big+small)*Math.cos(biga) + (small2)*Math.cos(smalla);
-      y = (big+small)*Math.sin(biga) + (small2)*Math.sin(smalla);
-      
-      v[index] = new Vec3(x, y, 0 );
-      
-      index++;
-    }
-    return v;
-  }
-
-  Vec3[] createRegular(int n, double radiusx, double radiusy) {
-    Vec3[] v;
-    v = new Vec3[n];
-    int index = 0;
-    for (int i = 0; i < n; i++)
-    {
-      v[index] = new Vec3( radiusx*Math.cos( 2*Math.PI * index / (double) n ),
-          radiusy*Math.sin(2*Math.PI * index / (double) n ), 0 );
-      index++;
-    }
-    return v;
-  }
-
-  Vec3[] createStar(int n, double inner, double outer) {
-    Vec3[] v;
-    v = new Vec3[2*n];
-    int index = 0;
-    for (int i = 0; i < n; i++) {
-      v[index] = new Vec3(Math.cos(Math.PI * index / (double) n),
-                          Math.sin(Math.PI * index / (double) n), 0);
-      v[index].scale(inner);
-      v[index+1] = new Vec3(Math.cos(Math.PI * (index + 1) / (double) n),
-                            Math.sin(Math.PI * (index + 1) / (double) n), 0);
-      v[index+1].scale(outer);
-      index += 2;
-    }
-    return v;
-  }
-
-  Object3D createPolygon(Vec3[] v) {
-    Object3D obj3D;
-    float smoothness[] = new float[v.length];
-    Arrays.fill(smoothness, 0.0f);
-    obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true).convertToTriangleMesh(0);
-    return obj3D;
-  }
-
-///////////////////////////////////////////
-//math helpers
- 
-  // solves system of 2 linear equations in 2 unknown 
-  class LinearSolve2
-  {
-    public boolean error;
-    public double x1, x2;
-  
-    // matrix looks like this 
-    // a b
-    // c d
-    public double det(double a,double b, double c, double d)
-    {
-      return a*d-b*c;  
-    }
-    // the equations look like thsi looks like this
-    // x1*a + x2*b = r1
-    // x1*c + x2*d = r2
-    public LinearSolve2(double a,double b, double c, double d, double r1, double r2)
-    {
-      double q;
-      
-      q=det(a,b,c,d);
-      if (Math.abs(q) < 0.00000001)
-      {
-        this.error = true;
-      }
-      else
-      {
-        this.error = false;
-        this.x1=det(r1,b,r2,d)/q;
-        this.x2=det(a,r1,c,r2)/q;
-      }
-    }
-  }
-  
-  class MetaCADLine {
-    protected Vec2 start,end, dir;
-    protected Vec2 normal;
-    
-    public MetaCADLine(Vec3 s,Vec3 e)
-    {
-      this.start = new Vec2(s.x,s.y);
-      this.end = new Vec2(e.x, e.y);
-      this.dir = this.end.minus(this.start);
-      this.normal = new Vec2(this.dir);
-      this.normal.normalize();
-      this.normal.set(-this.normal.y, this.normal.x);
-    }
-    
-    public void parallelMove(double d)
-    {
-      this.start.add(this.normal.times(d));
-    }
-    
-    public Vec3 intersect3(MetaCADLine l)
-    {
-      LinearSolve2 solve = new LinearSolve2(l.dir.x, -this.dir.x, l.dir.y, -this.dir.y, this.start.x-l.start.x, this.start.y-l.start.y);
-      if (solve.error)
-      {
-        return null;
-      }
-      else
-      {
-        Vec2 point = this.start.plus(this.dir.times(solve.x2)); 
-        return new Vec3(point.x,point.y, 0);
-      }
-    }
-  }
-
-  Vec3[] insetPoly(Vec3[] poly, double inset)
-  {
-    //List<MetaCADLine> lines = new ArrayList<MetaCADLine>();
-    List<Vec3> points = new ArrayList<Vec3>();
-    
-    for (int i = 0; i < poly.length; i++)
-    {
-        int iprev = (i+poly.length-1)%poly.length;
-        int inext = (i+1)%poly.length;
-        
-        MetaCADLine prev = new MetaCADLine(poly[iprev], poly[i]);
-        MetaCADLine next = new MetaCADLine(poly[i], poly[inext]);
-        
-        prev.parallelMove(inset);
-        next.parallelMove(inset);
-        
-        Vec3 intersect=prev.intersect3(next);
-        if (intersect ==  null)
-        {
-          intersect = new Vec3(0,0,0);
-        }
-        points.add(intersect);
-    }
-     
-    return points.toArray(new Vec3[1]);
-  }
-  
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/JoinCurvesObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/JoinCurvesObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/JoinCurvesObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,158 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Mat4;
-import artofillusion.math.Vec3;
-import artofillusion.object.Curve;
-import artofillusion.object.MeshVertex;
-import artofillusion.object.ObjectInfo;
-
-public class JoinCurvesObj extends MetaCADObject
-{
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-    
-    List<ObjectInfo> ch = ParsedTree.evaluate(ctx, children);
-    
-    // FIXME: Check that # children >= 2
-    // FIXME: Check that all children are curves
-    
-    Vec3[][] ends = new Vec3[ch.size()][2];
-
-    float tol = 0.1f;
-    int smoothtype = 0;
-    float smoothness = 1.0f;
-    Boolean joinends = true;
-    
-    // get total number of curve points and start/end vertices of each curve
-    int num = 0;
-    int idx = 0;
-    ObjectInfo[] curves = new ObjectInfo[ch.size()];
-    curves = ch.toArray(curves);
-    for (idx=0;idx<curves.length;idx++) {
-      Mat4 mat = curves[idx].coords.fromLocal();
-      MeshVertex[] verts = ((Curve)curves[idx].object).getVertices();
-      num = num + verts.length;
-      ends[idx][0] = mat.times(verts[0].r);
-      ends[idx][1] = mat.times(verts[verts.length-1].r);
-    }
-
-    int end0found = 0;
-    int end1found = 0;
-    int i;
-    // find ends
-    for (i=0;i<curves.length;i++) {
-      end0found = 0;
-      end1found = 0;
-      for (int j=0;j<curves.length;j++) {
-        if (j == i) continue;
-        for (int k=0;k<2;k++)	{
-          if (ends[i][0].distance(ends[j][k]) < tol) end0found = 1;
-          if (ends[i][1].distance(ends[j][k]) < tol) end1found = 1;
-        }
-      }
-      if (end0found + end1found < 2) break;
-    }
-    if (end0found + end1found == 0) {
-      // FIXME: Throw exception
-//      new MessageDialog(window, "One or more of the curves are not within selected Proximity - either increase Proximity or move curves");
-      return result;
-    }
-
-    //
-    Boolean loop;
-    int firstCurve;
-    if (i == curves.length) {
-      loop = true;
-      firstCurve = 0; // if no ends found, then must be a loop so choose any starting curve
-    }
-    else {
-      loop = false;
-      firstCurve = i;  // otherwise curve i is at one end
-    }
-
-    // assemble the joined curve
-    int[] curvesUsed = new int[curves.length];
-    int curvesUsedIdx = 0;
-    curvesUsed[curvesUsedIdx] = firstCurve;
-    curvesUsedIdx++;
-    Vec3[] curvePoints;
-    int numCurvePoints = num - curves.length;
-    if (!loop) numCurvePoints++;
-    curvePoints = new Vec3[numCurvePoints];
-
-    // add first curve
-    int counter = 0;
-    Mat4 mat = curves[firstCurve].coords.fromLocal();
-    MeshVertex[] verts = ((Curve)curves[firstCurve].object).getVertices();
-    if (end1found == 1) {
-      for (int v=0;v<verts.length;v++) {
-        curvePoints[v+counter]=mat.times(verts[v].r); // update position in world space
-      }
-    }
-    if (end0found == 1) { // reverse order of vertices so curve starts at end
-      for (int v=0;v<verts.length;v++) {
-        curvePoints[verts.length-1-v+counter]=mat.times(verts[v].r); // update position in world space
-      }
-    }
-    counter = counter + verts.length;
-    if (joinends) counter--;
-
-    //  assembly joined curve
-    while (curvesUsedIdx < curves.length) {
-      int c;
-      for (c=0;c<curves.length;c++)  { //cycle through the selected curves
-        if (c == curvesUsed[curvesUsedIdx-1]) continue; // skip if the same curve
-        int pointToCheck;
-        if (joinends) pointToCheck = counter;
-        else pointToCheck = counter - 1;
-        //
-        if (curvePoints[pointToCheck].distance(ends[c][0])<tol) { // if start of curve c is close to end
-          mat= curves[c].coords.fromLocal();
-          verts = ((Curve)curves[c].object).getVertices();
-          for (int v=0;v<verts.length;v++) {
-            curvePoints[v+counter]=mat.times(verts[v].r);
-          }
-          curvesUsed[curvesUsedIdx]=c; // add curve to list of those used
-          curvesUsedIdx++;  //update number of curves used
-          counter=counter+verts.length;
-          if (joinends) counter--;
-          break;
-        }
-        if (curvePoints[pointToCheck].distance(ends[c][1])<tol) { // if end of curve c is close to end
-          mat = curves[c].coords.fromLocal();
-          verts = ((Curve)curves[c].object).getVertices();
-          for (int v=0;v<verts.length;v++) {
-            curvePoints[verts.length-1-v+counter]=mat.times(verts[v].r);
-          }
-          curvesUsed[curvesUsedIdx]=c; // add curve to list of those used
-          curvesUsedIdx++;  //update number of curves used
-          counter=counter+verts.length;
-          if (joinends) counter--;
-          break;
-        }
-      }
-      if (c == curves.length) {
-        // FIXME: Throw exception
-//        new MessageDialog(window, "One or more of the curves are not within selected Proximity - either increase Proximity or move curves");
-        return result;
-      }
-    }
-//  create new curve
-    float[] smooth = new float[num];
-    for (i=0;i<num;i++) {
-      smooth[i]=smoothness;
-    }
-
-    Curve curve = new Curve(curvePoints, smooth, smoothtype, joinends || loop);
-    result.add(new ObjectInfo(curve, new CoordinateSystem(), "dummy"));
-    return result;
-  }
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/LatheObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/LatheObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/LatheObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,78 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec3;
-import artofillusion.object.CSGObject;
-import artofillusion.object.Curve;
-import artofillusion.object.Mesh;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-import artofillusion.object.TriangleMesh;
-import artofillusion.tools.ExtrudeTool;
-import artofillusion.tools.LatheTool;
-
-public class LatheObj extends MetaCADObject
-{
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-  
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-
-    // First parameter define the lathe axis (X, Y or Z)
-    int axis = LatheTool.X_AXIS;
-    if (parameters.size() >= 1) {
-      String dir = parameters.get(0);
-     if (dir.equals("Y")) axis = LatheTool.Y_AXIS;
-      else if (dir.equals("Z")) axis = LatheTool.Z_AXIS;
-    }
-    
-    // 2. parameter is sweep angle
-    double sweepang = 360;
-    if (parameters.size() >= 2) {
-      sweepang = ctx.evaluateExpression(parameters.get(1));
-    }
-
-    // 3. parameter is radius
-    double radius = 0.0;
-    if (parameters.size() >= 3) {
-      radius = ctx.evaluateExpression(parameters.get(2));
-    }
-    
-    result.addAll(lathe(ParsedTree.evaluate(ctx, children), axis, sweepang, radius));
-    return result;
-  }
-  
-  /**
-   * 
-   * Lathes the given profiles using the given parameters and returns the result object.
-   * 
-   */
-  public List<ObjectInfo> lathe(List<ObjectInfo> objects, int axis, double sweepang, double radius)
-  {
-    // Lathe each lathable child object
-    List<ObjectInfo> resultobjects = new LinkedList<ObjectInfo>();
-    Iterator<ObjectInfo> iter = objects.iterator();
-    while (iter.hasNext()) {
-      ObjectInfo profile = iter.next();
-      Object3D profileobj = profile.getObject();
-      Object3D obj3D = null;
-      if (profileobj instanceof Curve) {
-        Mesh mesh = LatheTool.latheCurve((Curve)profileobj, axis, 16, sweepang, radius);
-        if (mesh instanceof Object3D) obj3D = (Object3D)mesh;
-      }
-      if (obj3D != null) {
-        ObjectInfo objinfo = new ObjectInfo(obj3D, new CoordinateSystem(), "tmp");
-        resultobjects.add(objinfo);
-      }
-      profile.setVisible(false);
-    }
-    // FIXME: Undo support?
-    return resultobjects;
-  }
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,54 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.cheffo.jeplite.ASTVarNode;
-import org.reprap.artofillusion.language.MacroPrototype;
-
-import artofillusion.object.ObjectInfo;
-
-public class MacroObj extends MetaCADObject {
-  protected MacroPrototype prototype;   
-  
-  public MacroObj(MacroPrototype prototype)
-  {
-    this.prototype = prototype;
-  }
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    if (parameters.size() >= prototype.variables.size())
-    {
-      int n = prototype.variables.size();      
-      ASTVarNode[] backup = new ASTVarNode[n];
-      double[] values = new double[n];
-      // backup variables
-      for (int i = 0;  i < n; i++)
-      {
-        backup[i] = ctx.jep.getVarNode(prototype.variables.get(i)); 
-        values[i] = ctx.evaluateExpression(parameters.get(i));
-      }
-      // replace variables
-      for (int i = 0;  i < n; i++)
-      {
-        ctx.jep.setVarNode(prototype.variables.get(i), null);
-        ctx.jep.addVariable(prototype.variables.get(i), values[i]);
-      }
-      // evaluate
-      List<ObjectInfo> result = ParsedTree.evaluate(ctx, prototype.children);
-      // restore previous variables
-      for (int i = 0;  i < n; i++)
-      {
-        ctx.jep.setVarNode(prototype.variables.get(i), backup[i]);
-      }
-      return result;
-    }
-    else
-    {
-      throw new Exception("Not enough parameters  given to Macro Call: " + prototype.name);
-    }
-  }
-
-}
\ No newline at end of file

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,40 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.object.Curve;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-import artofillusion.object.TriangleMesh;
-
-public class MeshObj extends MetaCADObject
-{
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    double tolerance = 0.2;
-    if (parameters.size() > 0) {
-      tolerance = ctx.evaluateExpression(parameters.get(0));
-    }
-
-    List<ObjectInfo> results = new LinkedList<ObjectInfo>();
-
-    Iterator<ObjectInfo> iter = ParsedTree.evaluate(ctx, children).iterator();
-    while(iter.hasNext()) {
-      ObjectInfo chinfo = iter.next();
-      Object3D obj3D = chinfo.getObject();
-      if (obj3D instanceof Curve) {
-        assert(obj3D.canConvertToTriangleMesh() != Object3D.CANT_CONVERT);
-        TriangleMesh mesh = obj3D.convertToTriangleMesh(tolerance);
-        ObjectInfo newinfo = new ObjectInfo(mesh, chinfo.getCoords(), "dummy");
-        newinfo.setTexture(ctx.scene.getDefaultTexture(), ctx.scene.getDefaultTexture().getDefaultMapping(mesh));
-        results.add(newinfo);
-      }
-    }
-    return results;
-  }
-}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADContext.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -21,7 +21,7 @@
 
   // Evaluates an Expression like 3*x+sin(a) and returns the value of it or 0 if
   // any error occurred
-  double evaluateExpression(String expr) throws Exception {
+  public double evaluateExpression(String expr) throws Exception {
     try {
       this.jep.parseExpression(expr);
       return this.jep.getValue();
@@ -34,7 +34,7 @@
   
   // Evaluates Expressions like x=2*radius and assigns the value to the given
   // variable
-  void evaluateAssignment(String curLine) throws Exception {
+  public void evaluateAssignment(String curLine) throws Exception {
     try {
       int mark = curLine.indexOf("=");
       String name = curLine.substring(0, mark).trim();

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorDialog.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -87,16 +87,16 @@
     }
     
     // Parameters tab
-    paramtab=new BTextArea(this.engine.getParameters(), 10, 20) {
+    this.paramtab=new BTextArea(this.engine.getParameters(), 10, 20) {
       @Override
       protected void textChanged() {
         super.textChanged();
         MetaCADEvaluatorDialog.this.engine.setParameters(this.getText());
       }
     };
-    engine.addParameterChangedListener(this);
+    this.engine.addParameterChangedListener(this);
     
-    BScrollPane scrollpane = new BScrollPane(paramtab);
+    BScrollPane scrollpane = new BScrollPane(this.paramtab);
     tabcontainer.add(scrollpane, "Parameters");
 
     // CAD tab
@@ -161,14 +161,14 @@
   }
 
   public void textChanged(Object source) {
-    final String newText = engine.getParameters();
-    if (!newText.equals(paramtab.getText()))
+    final String newText = this.engine.getParameters();
+    if (!newText.equals(this.paramtab.getText()))
     {
       SwingUtilities.invokeLater(new Runnable()
       {
         public void run()
         {
-          paramtab.setText(newText);
+          MetaCADEvaluatorDialog.this.paramtab.setText(newText);
         }
       });
       

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -88,7 +88,7 @@
   public void setParameters(String text) {
     this.window.getScene().setMetadata(
         MetaCADEvaluatorEngine.class.getName() + "Parameters", text);
-    Iterator<TextChangedListener> iter = parameterListeners.iterator();
+    Iterator<TextChangedListener> iter = this.parameterListeners.iterator();
    
     while (iter.hasNext())
     {
@@ -585,7 +585,6 @@
 
     ObjectInfo resultinfo;
     try {
-      Scene theScene = this.window.getScene();
       resultinfo = new ObjectInfo(new Sphere(1,1,1), new CoordinateSystem(), defstr);
       
       // Inherit texture color from the first source object
@@ -789,6 +788,6 @@
   protected List<TextChangedListener> parameterListeners=new LinkedList<TextChangedListener>();
   public void addParameterChangedListener(TextChangedListener listener)
   {
-    parameterListeners.add(listener);
+    this.parameterListeners.add(listener);
   }
 }

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,13 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.List;
-
-import artofillusion.object.ObjectInfo;
-
-public abstract class MetaCADObject {
-
-  public abstract List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception;
-
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,17 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.List;
-
-import artofillusion.object.ObjectInfo;
-
-
-public class NativeObj extends MetaCADObject {
-
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    return null;
-  }
-
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,72 +0,0 @@
-package org.reprap.artofillusion;
-
-import org.reprap.artofillusion.language.MacroPrototype;
-
-import artofillusion.object.CSGObject;
-
-public class ObjFactory {
-  public static MetaCADObject create(MetaCADContext ctx, String name) throws ObjFactoryException {
-    name = name.toLowerCase();
-
-    if (name.equals("native")) {
-      return new NativeObj();
-    }
-    else if (name.startsWith("sphere")) {
-      return new SphereObj();
-    }
-    else if (name.startsWith("cube")) {
-      return new CubeObj();
-    }
-    else if (name.startsWith("cylinder")) {
-      return new CylinderObj();
-    }
-    else if (name.startsWith("cs")) {
-      return new CSObj();
-    }
-    else if (name.startsWith("union") || name.startsWith("+")) {
-      return new BooleanObj(CSGObject.UNION);
-    }
-    else if (name.startsWith("difference") || name.startsWith("-")) {
-      return new BooleanObj(CSGObject.DIFFERENCE12);
-    }
-    else if (name.startsWith("intersection") || name.startsWith("/")) {
-      return new BooleanObj(CSGObject.INTERSECTION);
-    }
-    else if (name.startsWith("star")) {
-      return new PolygonObj(PolygonObj.STAR);
-    }
-    else if (name.startsWith("reg")) {
-      return new PolygonObj(PolygonObj.REG);
-    }
-    else if (name.startsWith("roll")) {
-      return new PolygonObj(PolygonObj.ROLL);
-    }
-    else if (name.startsWith("extrude")) {
-      return new ExtrudeObj();
-    }
-    else if (name.startsWith("for")) {
-      return new ForObj();
-    }
-    else if (name.startsWith("inset")) {
-      return new InsetObj();
-    }
-    else if (name.startsWith("mesh")) {
-      return new MeshObj();
-    }
-    else if (name.startsWith("joincurves")) {
-      return new JoinCurvesObj();
-    }
-    else if (name.startsWith("lathe")) {
-      return new LatheObj();
-    }
-    else {
-      MacroPrototype macroPrototype = ctx.macros.get(name.toLowerCase());
-      if (macroPrototype != null)
-      {
-        return new MacroObj(macroPrototype);
-      }
-    }
-
-    throw new ObjFactoryException("ObjFactory: Unknown Object type: " + name);
-  }
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,12 +0,0 @@
-package org.reprap.artofillusion;
-
-import org.reprap.artofillusion.parser.ParseException;
-
-public class ObjFactoryException extends ParseException {
-
-  private static final long serialVersionUID = -5731809677962819119L;
-
-  public ObjFactoryException(String message) {
-    super(message);
-  }
-}

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,16 +1,12 @@
 package org.reprap.artofillusion;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
-import artofillusion.MeshViewer;
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Mat4;
 import artofillusion.math.Vec3;
 import artofillusion.object.Cube;
 import artofillusion.object.MeshVertex;
-import artofillusion.object.Object3D;
 import artofillusion.object.ObjectInfo;
 import artofillusion.object.TriangleMesh;
 import artofillusion.object.TriangleMesh.Edge;

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -5,6 +5,10 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import org.reprap.artofillusion.objects.MetaCADObject;
+import org.reprap.artofillusion.objects.ObjFactory;
+import org.reprap.artofillusion.objects.ObjFactoryException;
+
 import artofillusion.object.ObjectInfo;
 import artofillusion.texture.Texture;
 import artofillusion.texture.TextureMapping;

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,153 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec3;
-import artofillusion.object.Curve;
-import artofillusion.object.Mesh;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-
-public class PolygonObj extends MetaCADObject
-{
-  public static final int STAR = 0;
-  public static final int REG = 1;
-  public static final int ROLL = 2;
-  int type;
-  
-  public PolygonObj(int type) {
-    this.type = type;
-  }
-  
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-
-    Vec3[] v=null;
-      switch (this.type) {
-      case STAR: {
-        int n = 6;
-        double inner = 3;
-        double outer = 5;
-        if (parameters.size() >= 1) {
-          n = (int)ctx.evaluateExpression(parameters.get(0));
-        }
-        if (parameters.size() >= 3) {
-          inner  = ctx.evaluateExpression(parameters.get(1));
-          outer = ctx.evaluateExpression(parameters.get(2));
-        }
-
-        v = createStar(n, inner, outer);
-        break;
-      }
-      case REG: {
-        int n = 6;
-        double radiusx = 4;
-        double radiusy = 4;
-        if (parameters.size() >= 1) {
-          n = (int)ctx.evaluateExpression(parameters.get(0));
-        }
-        if (parameters.size() >= 2) {
-          radiusy = radiusx = ctx.evaluateExpression(parameters.get(1));
-        }
-        if (parameters.size() >= 3) {
-          radiusy  = ctx.evaluateExpression(parameters.get(2));
-        }
-
-        v = createRegular(n, radiusx, radiusy);
-        break;
-      }
-      case ROLL: {
-        int n = 30;
-        double big = 5;
-        double small = 1;
-        double small2 = 0.8;
-        if (parameters.size() >= 1) {
-          n = (int)ctx.evaluateExpression(parameters.get(0));
-        }
-        if (parameters.size() >= 3) {
-          big  = ctx.evaluateExpression(parameters.get(1));
-          small2 = small = ctx.evaluateExpression(parameters.get(2));
-        }
-        if (parameters.size() == 4) {
-          small2 = ctx.evaluateExpression(parameters.get(3));
-        }            
-          
-        v = createRoll(n, big, small, small2);
-        break;
-      }
-      }
-
-      if (v != null) {
-        Object3D obj3D = createPolygon(v);
-        result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
-        return result;
-      }
-      return null;
-  }
-  
-  Vec3[] createRoll(int n, double big, double small, double small2) {
-    Vec3[] v;
-    v = new Vec3[n];
-    int index = 0;
-    for (int i = 0; i < n; i++)
-    {
-      double biga=(2*Math.PI*i)/n;
-      double len = big*biga;
-      double smalla=len/small;
-      double x,y;
-      
-      x = (big+small)*Math.cos(biga) + (small2)*Math.cos(smalla);
-      y = (big+small)*Math.sin(biga) + (small2)*Math.sin(smalla);
-      
-      v[index] = new Vec3(x, y, 0 );
-      
-      index++;
-    }
-    return v;
-  }
-
-  Vec3[] createRegular(int n, double radiusx, double radiusy) {
-    Vec3[] v;
-    v = new Vec3[n];
-    int index = 0;
-    for (int i = 0; i < n; i++)
-    {
-      v[index] = new Vec3( radiusx*Math.cos( 2*Math.PI * index / (double) n ),
-          radiusy*Math.sin(2*Math.PI * index / (double) n ), 0 );
-      index++;
-    }
-    return v;
-  }
-
-  Vec3[] createStar(int n, double inner, double outer) {
-    Vec3[] v;
-    v = new Vec3[2*n];
-    int index = 0;
-    for (int i = 0; i < n; i++) {
-      v[index] = new Vec3(Math.cos(Math.PI * index / (double) n),
-                          Math.sin(Math.PI * index / (double) n), 0);
-      v[index].scale(inner);
-      v[index+1] = new Vec3(Math.cos(Math.PI * (index + 1) / (double) n),
-                            Math.sin(Math.PI * (index + 1) / (double) n), 0);
-      v[index+1].scale(outer);
-      index += 2;
-    }
-    return v;
-  }
-
-  static public Object3D createPolygon(Vec3[] v) {
-    Object3D obj3D;
-    float smoothness[] = new float[v.length];
-    Arrays.fill(smoothness, 0.0f);
-    obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true);
-    return obj3D;
-  }
-
-  
-}

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-10 02:42:08 UTC (rev 2938)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -1,35 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import artofillusion.math.CoordinateSystem;
-import artofillusion.math.Vec3;
-import artofillusion.object.Object3D;
-import artofillusion.object.ObjectInfo;
-
-public class SphereObj extends MetaCADObject {
-
-  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
-                                         List<String> parameters, 
-                                         List<ParsedTree> children) throws Exception {
-    
-    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
-
-    double mainparam = 1.0f;
-    if (parameters.size() >= 1) {
-      mainparam = ctx.evaluateExpression(parameters.get(0));
-    }
-    Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
-    if (parameters.size() >= 3) {
-      dims.set(mainparam,
-               ctx.evaluateExpression(parameters.get(1)),
-               ctx.evaluateExpression(parameters.get(2)));
-    }
-    Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
-
-    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
-    
-    return result;
-  }
-}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/BooleanObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/BooleanObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/BooleanObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/BooleanObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,35 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.CSGHelper;
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.object.ObjectInfo;
+
+
+public class BooleanObj extends MetaCADObject {
+  int type;
+
+  public BooleanObj(int type) {
+    this.type = type;
+  }
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+    
+    CSGHelper helper = new CSGHelper(this.type);
+    helper.addAll(ParsedTree.evaluate(ctx, children).iterator());
+    
+    if (helper.GetObjectInfo() !=  null)
+      result.add(helper.GetObjectInfo());
+    return result;
+    
+  }
+
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CSObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,42 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.ObjectInfo;
+
+public class CSObj extends MetaCADObject {
+
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+
+    assert(children.size() == 1);
+    List<ObjectInfo> chlist = ParsedTree.evaluate(ctx, children);
+    
+    CoordinateSystem coordsys = new CoordinateSystem();
+    if (parameters.size() >= 3) {
+      coordsys.setOrigin(new Vec3(ctx.evaluateExpression(parameters.get(0)),
+                                  ctx.evaluateExpression(parameters.get(1)),
+                                  ctx.evaluateExpression(parameters.get(2))));
+    }
+    if (parameters.size() >= 6) {
+      coordsys.setOrientation(ctx.evaluateExpression(parameters.get(3)),
+                              ctx.evaluateExpression(parameters.get(4)),
+                              ctx.evaluateExpression(parameters.get(5)));
+    }
+    
+    Iterator<ObjectInfo> iter = chlist.iterator();
+    while (iter.hasNext()) {
+      ObjectInfo info = iter.next();
+      info.coords.transformCoordinates(coordsys.fromLocal());
+    }
+    return chlist;
+  }
+
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CubeObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CubeObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CubeObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CubeObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,38 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Cube;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class CubeObj extends MetaCADObject {
+
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    double mainparam = 1.0f;
+    if (parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(parameters.get(0));
+    }
+    Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
+    if (parameters.size() >= 3) {
+      dims.set(mainparam,
+               ctx.evaluateExpression(parameters.get(1)),
+               ctx.evaluateExpression(parameters.get(2)));
+    }
+    Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
+    obj3D = new Cube(dims.x, dims.y, dims.z);
+    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
+    return result;
+  }
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CylinderObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/CylinderObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CylinderObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CylinderObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,47 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.object.Cylinder;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class CylinderObj extends MetaCADObject {
+
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+  
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    double mainparam = 1.0f;
+    if (parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(parameters.get(0));
+    }
+    // First (main) parameter is height
+    double height = mainparam;
+    double rx = mainparam;
+    double ry = mainparam;
+    double ratio = 1;
+
+    // Second parameter is radius
+    if (parameters.size() >= 2) rx = ry = ctx.evaluateExpression(parameters.get(1));
+    // Third parameter define separate y radius
+    if (parameters.size() >= 3) ry = ctx.evaluateExpression(parameters.get(2));
+    // Fourth parameter define top/bottom radius ratio
+    // Cylinder takes an optional fourth parameter
+    if (parameters.size() >= 4) {
+      ratio = ctx.evaluateExpression(parameters.get(3));
+      if (ratio > 1) ratio = 1.0;
+      if (ratio < 0) ratio = 0.0;
+    }
+    Object3D obj3D = new Cylinder(height, rx, ry, ratio);
+    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
+    return result;
+  }
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ExtrudeObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ExtrudeObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ExtrudeObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ExtrudeObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,112 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Curve;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.object.TriangleMesh;
+import artofillusion.tools.ExtrudeTool;
+
+public class ExtrudeObj extends MetaCADObject
+{
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+  
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    // Three first parameters define the extrusion vector
+    Vec3 dir = Vec3.vz();
+    if (parameters.size() >= 3) {
+      dir = new Vec3(ctx.evaluateExpression(parameters.get(0)),
+                     ctx.evaluateExpression(parameters.get(1)),
+                     ctx.evaluateExpression(parameters.get(2)));
+    }
+    // 4. parameter is num segments
+    int numsegments = 1;
+    if (parameters.size() >= 4) {
+      numsegments = (int)ctx.evaluateExpression(parameters.get(3));
+      if (numsegments < 2) numsegments = 1;
+    }
+    // 5. parameter is twist degrees
+    double twist = 0.0;
+    if (parameters.size() >= 5) {
+      twist = ctx.evaluateExpression(parameters.get(4));
+    }
+    
+    result.addAll(extrude(ParsedTree.evaluate(ctx, children), dir, numsegments, twist));
+    return result;
+  }
+  
+  /**
+   * 
+   * Extrudes the given profiles using the given parameters and returns the result object.
+   * 
+   * @param objects
+   * @param dir
+   * @param numsegments
+   * @param twist
+   * @return a list of ObjectInfos. The coordsys in the object infos are just there to move
+   * the objects back to their original positions since the extrusion operation always 
+   * centers the result in the origin.
+   */
+  public List<ObjectInfo> extrude(List<ObjectInfo> objects, Vec3 dir, int numsegments, double twist)
+  {
+    // Build extrusion curve from vector and segments
+    Vec3 v[] = new Vec3[numsegments+1];
+    float smooth[] = new float[v.length];
+    for (int i = 0; i < v.length; i++) {
+      v[i] = new Vec3(dir);
+      v[i].scale(1.0*i/numsegments);
+      smooth[i] = 1.0f;
+    }
+    Curve path = new Curve(v, smooth, Mesh.APPROXIMATING, false);
+    CoordinateSystem pathCS = new CoordinateSystem();
+
+    // FIXME: Support specifying extrusion curves
+    // Extrude each extrudable child object
+    List<ObjectInfo> resultobjects = new LinkedList<ObjectInfo>();
+    Iterator<ObjectInfo> iter = objects.iterator();
+    while (iter.hasNext()) {
+      ObjectInfo profile = iter.next();
+      Object3D profileobj = profile.getObject();
+
+      Object3D obj3D = null;
+      if (profileobj instanceof TriangleMesh) {
+        obj3D = ExtrudeTool.extrudeMesh((TriangleMesh)profileobj, path, profile.getCoords(), pathCS, twist*Math.PI/180.0, true);
+      }
+      else if (profileobj instanceof Curve) {
+        obj3D = ExtrudeTool.extrudeCurve((Curve)profileobj, path, profile.getCoords(), pathCS, twist*Math.PI/180.0, true);
+      }
+      if (obj3D != null) {
+        // Since the result is centered in the origin, offset the extruded object to 
+        // move it back to its original position
+        // FIXME: Combine this with the user-specified coordinate system
+        CoordinateSystem coordsys = new CoordinateSystem(new Vec3(), Vec3.vz(), Vec3.vy());
+        Vec3 offset = profile.getCoords().fromLocal().times(((Mesh)profileobj).getVertices()[0].r).
+          minus(coordsys.fromLocal().times(((Mesh)obj3D).getVertices()[0].r));
+        coordsys.setOrigin(offset);
+        ObjectInfo objinfo = new ObjectInfo(obj3D, coordsys, "tmp");
+        resultobjects.add(objinfo);
+      }
+      profile.setVisible(false);
+    }
+    // FIXME: Undo support?
+    return resultobjects;
+}
+
+  
+  
+  
+  
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ForObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ForObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ForObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ForObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,34 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.object.ObjectInfo;
+
+public class ForObj extends MetaCADObject {
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+    
+    // evaluate first part of for loop i.e. i=0
+    ctx.evaluateAssignment(parameters.get(0));
+
+    // security count to exit loop even if we fuck up exit condition
+    int count = 0;
+    // condition loop evaluate the condition i.e. i < 10
+    while (ctx.evaluateExpression(parameters.get(1)) != 0 && count < 100) {
+      result.addAll(ParsedTree.evaluate(ctx, children));
+      // "increment" evaluate 3rd for parameter i.e. i=i+1
+      ctx.evaluateAssignment(parameters.get(2));
+      count++;
+    }
+    return result;
+  }
+
+}
\ No newline at end of file

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/InsetObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,205 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec2;
+import artofillusion.math.Vec3;
+import artofillusion.object.Curve;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class InsetObj extends MetaCADObject
+{
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+
+    double inset = 1.0;
+    if (parameters.size() > 0) {
+      inset = ctx.evaluateExpression(parameters.get(0));
+    }
+    
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    Iterator<ObjectInfo> iter = ParsedTree.evaluate(ctx, children).iterator();
+
+    while (iter.hasNext()) {
+      ObjectInfo chinfo = iter.next();
+      Object3D obj3D = chinfo.object;
+      if (obj3D instanceof Curve) {
+        Curve curve = (Curve)obj3D;
+        Vec3[] newvec = insetPoly(curve.getVertexPositions(), inset);
+        obj3D = PolygonObj.createPolygon(newvec);
+        result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
+      }
+    }
+    return result;
+  }
+  
+  Vec3[] createRoll(int n, double big, double small, double small2) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      double biga=(2*Math.PI*i)/n;
+      double len = big*biga;
+      double smalla=len/small;
+      double x,y;
+      
+      x = (big+small)*Math.cos(biga) + (small2)*Math.cos(smalla);
+      y = (big+small)*Math.sin(biga) + (small2)*Math.sin(smalla);
+      
+      v[index] = new Vec3(x, y, 0 );
+      
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createRegular(int n, double radiusx, double radiusy) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      v[index] = new Vec3( radiusx*Math.cos( 2*Math.PI * index / (double) n ),
+          radiusy*Math.sin(2*Math.PI * index / (double) n ), 0 );
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createStar(int n, double inner, double outer) {
+    Vec3[] v;
+    v = new Vec3[2*n];
+    int index = 0;
+    for (int i = 0; i < n; i++) {
+      v[index] = new Vec3(Math.cos(Math.PI * index / (double) n),
+                          Math.sin(Math.PI * index / (double) n), 0);
+      v[index].scale(inner);
+      v[index+1] = new Vec3(Math.cos(Math.PI * (index + 1) / (double) n),
+                            Math.sin(Math.PI * (index + 1) / (double) n), 0);
+      v[index+1].scale(outer);
+      index += 2;
+    }
+    return v;
+  }
+
+  Object3D createPolygon(Vec3[] v) {
+    Object3D obj3D;
+    float smoothness[] = new float[v.length];
+    Arrays.fill(smoothness, 0.0f);
+    obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true).convertToTriangleMesh(0);
+    return obj3D;
+  }
+
+///////////////////////////////////////////
+//math helpers
+ 
+  // solves system of 2 linear equations in 2 unknown 
+  class LinearSolve2
+  {
+    public boolean error;
+    public double x1, x2;
+  
+    // matrix looks like this 
+    // a b
+    // c d
+    public double det(double a,double b, double c, double d)
+    {
+      return a*d-b*c;  
+    }
+    // the equations look like thsi looks like this
+    // x1*a + x2*b = r1
+    // x1*c + x2*d = r2
+    public LinearSolve2(double a,double b, double c, double d, double r1, double r2)
+    {
+      double q;
+      
+      q=det(a,b,c,d);
+      if (Math.abs(q) < 0.00000001)
+      {
+        this.error = true;
+      }
+      else
+      {
+        this.error = false;
+        this.x1=det(r1,b,r2,d)/q;
+        this.x2=det(a,r1,c,r2)/q;
+      }
+    }
+  }
+  
+  class MetaCADLine {
+    protected Vec2 start,end, dir;
+    protected Vec2 normal;
+    
+    public MetaCADLine(Vec3 s,Vec3 e)
+    {
+      this.start = new Vec2(s.x,s.y);
+      this.end = new Vec2(e.x, e.y);
+      this.dir = this.end.minus(this.start);
+      this.normal = new Vec2(this.dir);
+      this.normal.normalize();
+      this.normal.set(-this.normal.y, this.normal.x);
+    }
+    
+    public void parallelMove(double d)
+    {
+      this.start.add(this.normal.times(d));
+    }
+    
+    public Vec3 intersect3(MetaCADLine l)
+    {
+      LinearSolve2 solve = new LinearSolve2(l.dir.x, -this.dir.x, l.dir.y, -this.dir.y, this.start.x-l.start.x, this.start.y-l.start.y);
+      if (solve.error)
+      {
+        return null;
+      }
+      else
+      {
+        Vec2 point = this.start.plus(this.dir.times(solve.x2)); 
+        return new Vec3(point.x,point.y, 0);
+      }
+    }
+  }
+
+  Vec3[] insetPoly(Vec3[] poly, double inset)
+  {
+    //List<MetaCADLine> lines = new ArrayList<MetaCADLine>();
+    List<Vec3> points = new ArrayList<Vec3>();
+    
+    for (int i = 0; i < poly.length; i++)
+    {
+        int iprev = (i+poly.length-1)%poly.length;
+        int inext = (i+1)%poly.length;
+        
+        MetaCADLine prev = new MetaCADLine(poly[iprev], poly[i]);
+        MetaCADLine next = new MetaCADLine(poly[i], poly[inext]);
+        
+        prev.parallelMove(inset);
+        next.parallelMove(inset);
+        
+        Vec3 intersect=prev.intersect3(next);
+        if (intersect ==  null)
+        {
+          intersect = new Vec3(0,0,0);
+        }
+        points.add(intersect);
+    }
+     
+    return points.toArray(new Vec3[1]);
+  }
+  
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/JoinCurvesObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,161 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Mat4;
+import artofillusion.math.Vec3;
+import artofillusion.object.Curve;
+import artofillusion.object.MeshVertex;
+import artofillusion.object.ObjectInfo;
+
+public class JoinCurvesObj extends MetaCADObject
+{
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+    
+    List<ObjectInfo> ch = ParsedTree.evaluate(ctx, children);
+    
+    // FIXME: Check that # children >= 2
+    // FIXME: Check that all children are curves
+    
+    Vec3[][] ends = new Vec3[ch.size()][2];
+
+    float tol = 0.1f;
+    int smoothtype = 0;
+    float smoothness = 1.0f;
+    Boolean joinends = true;
+    
+    // get total number of curve points and start/end vertices of each curve
+    int num = 0;
+    int idx = 0;
+    ObjectInfo[] curves = new ObjectInfo[ch.size()];
+    curves = ch.toArray(curves);
+    for (idx=0;idx<curves.length;idx++) {
+      Mat4 mat = curves[idx].coords.fromLocal();
+      MeshVertex[] verts = ((Curve)curves[idx].object).getVertices();
+      num = num + verts.length;
+      ends[idx][0] = mat.times(verts[0].r);
+      ends[idx][1] = mat.times(verts[verts.length-1].r);
+    }
+
+    int end0found = 0;
+    int end1found = 0;
+    int i;
+    // find ends
+    for (i=0;i<curves.length;i++) {
+      end0found = 0;
+      end1found = 0;
+      for (int j=0;j<curves.length;j++) {
+        if (j == i) continue;
+        for (int k=0;k<2;k++)	{
+          if (ends[i][0].distance(ends[j][k]) < tol) end0found = 1;
+          if (ends[i][1].distance(ends[j][k]) < tol) end1found = 1;
+        }
+      }
+      if (end0found + end1found < 2) break;
+    }
+    if (end0found + end1found == 0) {
+      // FIXME: Throw exception
+//      new MessageDialog(window, "One or more of the curves are not within selected Proximity - either increase Proximity or move curves");
+      return result;
+    }
+
+    //
+    Boolean loop;
+    int firstCurve;
+    if (i == curves.length) {
+      loop = true;
+      firstCurve = 0; // if no ends found, then must be a loop so choose any starting curve
+    }
+    else {
+      loop = false;
+      firstCurve = i;  // otherwise curve i is at one end
+    }
+
+    // assemble the joined curve
+    int[] curvesUsed = new int[curves.length];
+    int curvesUsedIdx = 0;
+    curvesUsed[curvesUsedIdx] = firstCurve;
+    curvesUsedIdx++;
+    Vec3[] curvePoints;
+    int numCurvePoints = num - curves.length;
+    if (!loop) numCurvePoints++;
+    curvePoints = new Vec3[numCurvePoints];
+
+    // add first curve
+    int counter = 0;
+    Mat4 mat = curves[firstCurve].coords.fromLocal();
+    MeshVertex[] verts = ((Curve)curves[firstCurve].object).getVertices();
+    if (end1found == 1) {
+      for (int v=0;v<verts.length;v++) {
+        curvePoints[v+counter]=mat.times(verts[v].r); // update position in world space
+      }
+    }
+    if (end0found == 1) { // reverse order of vertices so curve starts at end
+      for (int v=0;v<verts.length;v++) {
+        curvePoints[verts.length-1-v+counter]=mat.times(verts[v].r); // update position in world space
+      }
+    }
+    counter = counter + verts.length;
+    if (joinends) counter--;
+
+    //  assembly joined curve
+    while (curvesUsedIdx < curves.length) {
+      int c;
+      for (c=0;c<curves.length;c++)  { //cycle through the selected curves
+        if (c == curvesUsed[curvesUsedIdx-1]) continue; // skip if the same curve
+        int pointToCheck;
+        if (joinends) pointToCheck = counter;
+        else pointToCheck = counter - 1;
+        //
+        if (curvePoints[pointToCheck].distance(ends[c][0])<tol) { // if start of curve c is close to end
+          mat= curves[c].coords.fromLocal();
+          verts = ((Curve)curves[c].object).getVertices();
+          for (int v=0;v<verts.length;v++) {
+            curvePoints[v+counter]=mat.times(verts[v].r);
+          }
+          curvesUsed[curvesUsedIdx]=c; // add curve to list of those used
+          curvesUsedIdx++;  //update number of curves used
+          counter=counter+verts.length;
+          if (joinends) counter--;
+          break;
+        }
+        if (curvePoints[pointToCheck].distance(ends[c][1])<tol) { // if end of curve c is close to end
+          mat = curves[c].coords.fromLocal();
+          verts = ((Curve)curves[c].object).getVertices();
+          for (int v=0;v<verts.length;v++) {
+            curvePoints[verts.length-1-v+counter]=mat.times(verts[v].r);
+          }
+          curvesUsed[curvesUsedIdx]=c; // add curve to list of those used
+          curvesUsedIdx++;  //update number of curves used
+          counter=counter+verts.length;
+          if (joinends) counter--;
+          break;
+        }
+      }
+      if (c == curves.length) {
+        // FIXME: Throw exception
+//        new MessageDialog(window, "One or more of the curves are not within selected Proximity - either increase Proximity or move curves");
+        return result;
+      }
+    }
+//  create new curve
+    float[] smooth = new float[num];
+    for (i=0;i<num;i++) {
+      smooth[i]=smoothness;
+    }
+
+    Curve curve = new Curve(curvePoints, smooth, smoothtype, joinends || loop);
+    result.add(new ObjectInfo(curve, new CoordinateSystem(), "dummy"));
+    return result;
+  }
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/LatheObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/LatheObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/LatheObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/LatheObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,77 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.object.Curve;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.tools.LatheTool;
+
+public class LatheObj extends MetaCADObject
+{
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+  
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    // First parameter define the lathe axis (X, Y or Z)
+    int axis = LatheTool.X_AXIS;
+    if (parameters.size() >= 1) {
+      String dir = parameters.get(0);
+     if (dir.equals("Y")) axis = LatheTool.Y_AXIS;
+      else if (dir.equals("Z")) axis = LatheTool.Z_AXIS;
+    }
+    
+    // 2. parameter is sweep angle
+    double sweepang = 360;
+    if (parameters.size() >= 2) {
+      sweepang = ctx.evaluateExpression(parameters.get(1));
+    }
+
+    // 3. parameter is radius
+    double radius = 0.0;
+    if (parameters.size() >= 3) {
+      radius = ctx.evaluateExpression(parameters.get(2));
+    }
+    
+    result.addAll(lathe(ParsedTree.evaluate(ctx, children), axis, sweepang, radius));
+    return result;
+  }
+  
+  /**
+   * 
+   * Lathes the given profiles using the given parameters and returns the result object.
+   * 
+   */
+  public List<ObjectInfo> lathe(List<ObjectInfo> objects, int axis, double sweepang, double radius)
+  {
+    // Lathe each lathable child object
+    List<ObjectInfo> resultobjects = new LinkedList<ObjectInfo>();
+    Iterator<ObjectInfo> iter = objects.iterator();
+    while (iter.hasNext()) {
+      ObjectInfo profile = iter.next();
+      Object3D profileobj = profile.getObject();
+      Object3D obj3D = null;
+      if (profileobj instanceof Curve) {
+        Mesh mesh = LatheTool.latheCurve((Curve)profileobj, axis, 16, sweepang, radius);
+        if (mesh instanceof Object3D) obj3D = (Object3D)mesh;
+      }
+      if (obj3D != null) {
+        ObjectInfo objinfo = new ObjectInfo(obj3D, new CoordinateSystem(), "tmp");
+        resultobjects.add(objinfo);
+      }
+      profile.setVisible(false);
+    }
+    // FIXME: Undo support?
+    return resultobjects;
+  }
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MacroObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MacroObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MacroObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MacroObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,55 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.List;
+
+import org.cheffo.jeplite.ASTVarNode;
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+import org.reprap.artofillusion.language.MacroPrototype;
+
+import artofillusion.object.ObjectInfo;
+
+public class MacroObj extends MetaCADObject {
+  protected MacroPrototype prototype;   
+  
+  public MacroObj(MacroPrototype prototype)
+  {
+    this.prototype = prototype;
+  }
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    if (parameters.size() >= this.prototype.variables.size())
+    {
+      int n = this.prototype.variables.size();      
+      ASTVarNode[] backup = new ASTVarNode[n];
+      double[] values = new double[n];
+      // backup variables
+      for (int i = 0;  i < n; i++)
+      {
+        backup[i] = ctx.jep.getVarNode(this.prototype.variables.get(i)); 
+        values[i] = ctx.evaluateExpression(parameters.get(i));
+      }
+      // replace variables
+      for (int i = 0;  i < n; i++)
+      {
+        ctx.jep.setVarNode(this.prototype.variables.get(i), null);
+        ctx.jep.addVariable(this.prototype.variables.get(i), values[i]);
+      }
+      // evaluate
+      List<ObjectInfo> result = ParsedTree.evaluate(ctx, this.prototype.children);
+      // restore previous variables
+      for (int i = 0;  i < n; i++)
+      {
+        ctx.jep.setVarNode(this.prototype.variables.get(i), backup[i]);
+      }
+      return result;
+    }
+    else
+    {
+      throw new Exception("Not enough parameters  given to Macro Call: " + this.prototype.name);
+    }
+  }
+
+}
\ No newline at end of file

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MeshObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MeshObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MeshObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MeshObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,43 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.object.Curve;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.object.TriangleMesh;
+
+public class MeshObj extends MetaCADObject
+{
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    double tolerance = 0.2;
+    if (parameters.size() > 0) {
+      tolerance = ctx.evaluateExpression(parameters.get(0));
+    }
+
+    List<ObjectInfo> results = new LinkedList<ObjectInfo>();
+
+    Iterator<ObjectInfo> iter = ParsedTree.evaluate(ctx, children).iterator();
+    while(iter.hasNext()) {
+      ObjectInfo chinfo = iter.next();
+      Object3D obj3D = chinfo.getObject();
+      if (obj3D instanceof Curve) {
+        assert(obj3D.canConvertToTriangleMesh() != Object3D.CANT_CONVERT);
+        TriangleMesh mesh = obj3D.convertToTriangleMesh(tolerance);
+        ObjectInfo newinfo = new ObjectInfo(mesh, chinfo.getCoords(), "dummy");
+        newinfo.setTexture(ctx.scene.getDefaultTexture(), ctx.scene.getDefaultTexture().getDefaultMapping(mesh));
+        results.add(newinfo);
+      }
+    }
+    return results;
+  }
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MetaCADObject.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObject.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MetaCADObject.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/MetaCADObject.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,16 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.object.ObjectInfo;
+
+public abstract class MetaCADObject {
+
+  public abstract List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception;
+
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/NativeObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/NativeObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/NativeObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/NativeObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,20 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.object.ObjectInfo;
+
+
+public class NativeObj extends MetaCADObject {
+
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    return null;
+  }
+
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactory.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,73 @@
+package org.reprap.artofillusion.objects;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.language.MacroPrototype;
+
+import artofillusion.object.CSGObject;
+
+public class ObjFactory {
+  public static MetaCADObject create(MetaCADContext ctx, String name) throws ObjFactoryException {
+    name = name.toLowerCase();
+
+    if (name.equals("native")) {
+      return new NativeObj();
+    }
+    else if (name.startsWith("sphere")) {
+      return new SphereObj();
+    }
+    else if (name.startsWith("cube")) {
+      return new CubeObj();
+    }
+    else if (name.startsWith("cylinder")) {
+      return new CylinderObj();
+    }
+    else if (name.startsWith("cs")) {
+      return new CSObj();
+    }
+    else if (name.startsWith("union") || name.startsWith("+")) {
+      return new BooleanObj(CSGObject.UNION);
+    }
+    else if (name.startsWith("difference") || name.startsWith("-")) {
+      return new BooleanObj(CSGObject.DIFFERENCE12);
+    }
+    else if (name.startsWith("intersection") || name.startsWith("/")) {
+      return new BooleanObj(CSGObject.INTERSECTION);
+    }
+    else if (name.startsWith("star")) {
+      return new PolygonObj(PolygonObj.STAR);
+    }
+    else if (name.startsWith("reg")) {
+      return new PolygonObj(PolygonObj.REG);
+    }
+    else if (name.startsWith("roll")) {
+      return new PolygonObj(PolygonObj.ROLL);
+    }
+    else if (name.startsWith("extrude")) {
+      return new ExtrudeObj();
+    }
+    else if (name.startsWith("for")) {
+      return new ForObj();
+    }
+    else if (name.startsWith("inset")) {
+      return new InsetObj();
+    }
+    else if (name.startsWith("mesh")) {
+      return new MeshObj();
+    }
+    else if (name.startsWith("joincurves")) {
+      return new JoinCurvesObj();
+    }
+    else if (name.startsWith("lathe")) {
+      return new LatheObj();
+    }
+    else {
+      MacroPrototype macroPrototype = ctx.macros.get(name.toLowerCase());
+      if (macroPrototype != null)
+      {
+        return new MacroObj(macroPrototype);
+      }
+    }
+
+    throw new ObjFactoryException("ObjFactory: Unknown Object type: " + name);
+  }
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactoryException.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjFactoryException.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactoryException.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactoryException.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,12 @@
+package org.reprap.artofillusion.objects;
+
+import org.reprap.artofillusion.parser.ParseException;
+
+public class ObjFactoryException extends ParseException {
+
+  private static final long serialVersionUID = -5731809677962819119L;
+
+  public ObjFactoryException(String message) {
+    super(message);
+  }
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/PolygonObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/PolygonObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/PolygonObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/PolygonObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,156 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Curve;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class PolygonObj extends MetaCADObject
+{
+  public static final int STAR = 0;
+  public static final int REG = 1;
+  public static final int ROLL = 2;
+  int type;
+  
+  public PolygonObj(int type) {
+    this.type = type;
+  }
+  
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    Vec3[] v=null;
+      switch (this.type) {
+      case STAR: {
+        int n = 6;
+        double inner = 3;
+        double outer = 5;
+        if (parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(parameters.get(0));
+        }
+        if (parameters.size() >= 3) {
+          inner  = ctx.evaluateExpression(parameters.get(1));
+          outer = ctx.evaluateExpression(parameters.get(2));
+        }
+
+        v = createStar(n, inner, outer);
+        break;
+      }
+      case REG: {
+        int n = 6;
+        double radiusx = 4;
+        double radiusy = 4;
+        if (parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(parameters.get(0));
+        }
+        if (parameters.size() >= 2) {
+          radiusy = radiusx = ctx.evaluateExpression(parameters.get(1));
+        }
+        if (parameters.size() >= 3) {
+          radiusy  = ctx.evaluateExpression(parameters.get(2));
+        }
+
+        v = createRegular(n, radiusx, radiusy);
+        break;
+      }
+      case ROLL: {
+        int n = 30;
+        double big = 5;
+        double small = 1;
+        double small2 = 0.8;
+        if (parameters.size() >= 1) {
+          n = (int)ctx.evaluateExpression(parameters.get(0));
+        }
+        if (parameters.size() >= 3) {
+          big  = ctx.evaluateExpression(parameters.get(1));
+          small2 = small = ctx.evaluateExpression(parameters.get(2));
+        }
+        if (parameters.size() == 4) {
+          small2 = ctx.evaluateExpression(parameters.get(3));
+        }            
+          
+        v = createRoll(n, big, small, small2);
+        break;
+      }
+      }
+
+      if (v != null) {
+        Object3D obj3D = createPolygon(v);
+        result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
+        return result;
+      }
+      return null;
+  }
+  
+  Vec3[] createRoll(int n, double big, double small, double small2) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      double biga=(2*Math.PI*i)/n;
+      double len = big*biga;
+      double smalla=len/small;
+      double x,y;
+      
+      x = (big+small)*Math.cos(biga) + (small2)*Math.cos(smalla);
+      y = (big+small)*Math.sin(biga) + (small2)*Math.sin(smalla);
+      
+      v[index] = new Vec3(x, y, 0 );
+      
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createRegular(int n, double radiusx, double radiusy) {
+    Vec3[] v;
+    v = new Vec3[n];
+    int index = 0;
+    for (int i = 0; i < n; i++)
+    {
+      v[index] = new Vec3( radiusx*Math.cos( 2*Math.PI * index / (double) n ),
+          radiusy*Math.sin(2*Math.PI * index / (double) n ), 0 );
+      index++;
+    }
+    return v;
+  }
+
+  Vec3[] createStar(int n, double inner, double outer) {
+    Vec3[] v;
+    v = new Vec3[2*n];
+    int index = 0;
+    for (int i = 0; i < n; i++) {
+      v[index] = new Vec3(Math.cos(Math.PI * index / (double) n),
+                          Math.sin(Math.PI * index / (double) n), 0);
+      v[index].scale(inner);
+      v[index+1] = new Vec3(Math.cos(Math.PI * (index + 1) / (double) n),
+                            Math.sin(Math.PI * (index + 1) / (double) n), 0);
+      v[index+1].scale(outer);
+      index += 2;
+    }
+    return v;
+  }
+
+  static public Object3D createPolygon(Vec3[] v) {
+    Object3D obj3D;
+    float smoothness[] = new float[v.length];
+    Arrays.fill(smoothness, 0.0f);
+    obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true);
+    return obj3D;
+  }
+
+  
+}

Copied: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/SphereObj.java (from rev 2938, trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/SphereObj.java)
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/SphereObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/SphereObj.java	2009-05-10 02:54:52 UTC (rev 2939)
@@ -0,0 +1,38 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Vec3;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+
+public class SphereObj extends MetaCADObject {
+
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    List<ObjectInfo> result = new LinkedList<ObjectInfo>();
+
+    double mainparam = 1.0f;
+    if (parameters.size() >= 1) {
+      mainparam = ctx.evaluateExpression(parameters.get(0));
+    }
+    Vec3 dims = new Vec3(mainparam, mainparam, mainparam);
+    if (parameters.size() >= 3) {
+      dims.set(mainparam,
+               ctx.evaluateExpression(parameters.get(1)),
+               ctx.evaluateExpression(parameters.get(2)));
+    }
+    Object3D obj3D = new artofillusion.object.Sphere(dims.x, dims.y, dims.z);
+
+    result.add(new ObjectInfo(obj3D, new CoordinateSystem(), "dummy"));
+    
+    return result;
+  }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2943
          http://reprap.svn.sourceforge.net/reprap/?rev=2943&view=rev
Author:   wizard23
Date:     2009-05-10 06:47:59 +0000 (Sun, 10 May 2009)

Log Message:
-----------
added scaling node (scaling gets applied before the coordinate system!)

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ScaleObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-10 06:46:38 UTC (rev 2942)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-10 06:47:59 UTC (rev 2943)
@@ -45,7 +45,8 @@
     List<ObjectInfo> result = this.cadobj.evaluateObject(ctx, this.parameters, this.children);
     if (result == null) {
       result = new LinkedList<ObjectInfo>();
-      result.add(this.aoiobj);
+      // duplicate native object to prevent accumulating cs
+      result.add(this.aoiobj.duplicate());
     }
     else if (result.size() == 0) {
       updateAOI(ObjectHelper.getErrorObject());

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java	2009-05-10 06:46:38 UTC (rev 2942)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/CSObj.java	2009-05-10 06:47:59 UTC (rev 2943)
@@ -7,6 +7,7 @@
 import org.reprap.artofillusion.ParsedTree;
 
 import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Mat4;
 import artofillusion.math.Vec3;
 import artofillusion.object.ObjectInfo;
 
@@ -30,6 +31,13 @@
                               ctx.evaluateExpression(parameters.get(4)),
                               ctx.evaluateExpression(parameters.get(5)));
     }
+    if  (parameters.size() >= 9) {
+      double scaleX = ctx.evaluateExpression(parameters.get(6));
+      double scaleY = ctx.evaluateExpression(parameters.get(7));
+      double scaleZ = ctx.evaluateExpression(parameters.get(8));
+      
+      coordsys.transformCoordinates(new Mat4(scaleX,0,0,0,  0,scaleY,0,0, 0,0,scaleZ,0, 0,0,0,1));
+    }
     
     Iterator<ObjectInfo> iter = chlist.iterator();
     while (iter.hasNext()) {

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java	2009-05-10 06:46:38 UTC (rev 2942)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ObjFactory.java	2009-05-10 06:47:59 UTC (rev 2943)
@@ -60,6 +60,9 @@
     else if (name.startsWith("lathe")) {
       return new LatheObj();
     }
+    else if (name.startsWith("scale")) {
+      return new ScaleObj();
+    }
     else {
       MacroPrototype macroPrototype = ctx.macros.get(name.toLowerCase());
       if (macroPrototype != null)

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ScaleObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ScaleObj.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/ScaleObj.java	2009-05-10 06:47:59 UTC (rev 2943)
@@ -0,0 +1,86 @@
+package org.reprap.artofillusion.objects;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.reprap.artofillusion.MetaCADContext;
+import org.reprap.artofillusion.ParsedTree;
+
+import artofillusion.math.BoundingBox;
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.Mat4;
+import artofillusion.math.Vec3;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.object.TriangleMesh;
+
+public class ScaleObj extends MetaCADObject {
+
+  public List<ObjectInfo> evaluateObject(MetaCADContext ctx, 
+                                         List<String> parameters, 
+                                         List<ParsedTree> children) throws Exception {
+    
+    List<ObjectInfo> chlist = ParsedTree.evaluate(ctx, children);
+  
+    // workaround: duplicate all evaluated children to make sure we dont 
+    // modify native objects
+    List<ObjectInfo> newChlist = new ArrayList<ObjectInfo>(chlist.size());
+    for (ObjectInfo child : chlist)
+    {
+      ObjectInfo clone = child.duplicate(child.object.duplicate());
+      newChlist.add(clone);
+    }  
+    chlist = newChlist;
+   
+    
+    double scaleX = 1, scaleY = 1, scaleZ = 1;
+    
+    if (parameters.size() >= 3) {
+      scaleX = ctx.evaluateExpression(parameters.get(0));
+      scaleY = ctx.evaluateExpression(parameters.get(1));
+      scaleZ = ctx.evaluateExpression(parameters.get(2));
+    }
+    
+    boolean absSize = false;
+    if (parameters.size() >= 4) {
+      if (parameters.get(3).toLowerCase().startsWith("abs"))
+        absSize =  true;
+    }
+    
+    for (ObjectInfo info : chlist)
+    {
+      try  {
+        Object3D obj3D = info.object;
+        if (absSize)
+        {
+          obj3D.setSize(scaleX, scaleY, scaleZ);
+        }
+        else
+        {
+          Vec3 sizes = obj3D.getBounds().getSize();
+          obj3D.setSize(sizes.x * scaleX, sizes.y * scaleY, sizes.z * scaleZ); 
+        }
+      }
+      catch (NullPointerException ex)
+      {
+        // WORKAROUND for failing CSGObjects
+        TriangleMesh mesh = info.object.convertToTriangleMesh(0.1);
+        
+        if (absSize)
+        {
+          mesh.setSize(scaleX, scaleY, scaleZ);
+        }
+        else
+        {
+          Vec3 sizes = mesh.getBounds().getSize();
+          mesh.setSize(sizes.x * scaleX, sizes.y * scaleY, sizes.z * scaleZ); 
+        }
+        info.setObject(mesh);
+      }
+    }
+    
+    return chlist;
+  }
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2945
          http://reprap.svn.sourceforge.net/reprap/?rev=2945&view=rev
Author:   kintel
Date:     2009-05-10 07:14:15 +0000 (Sun, 10 May 2009)

Log Message:
-----------
Misc. join curves bug fixes

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	2009-05-10 07:13:20 UTC (rev 2944)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ObjectHelper.java	2009-05-10 07:14:15 UTC (rev 2945)
@@ -6,6 +6,7 @@
 import artofillusion.math.Mat4;
 import artofillusion.math.Vec3;
 import artofillusion.object.Cube;
+import artofillusion.object.Curve;
 import artofillusion.object.MeshVertex;
 import artofillusion.object.ObjectInfo;
 import artofillusion.object.TriangleMesh;
@@ -42,6 +43,10 @@
   
   public static ObjectInfo join(List <ObjectInfo> objects, double tol)
   {
+    // FIXME: Worksaround for missing support for joining curves
+    if (objects.get(0).object instanceof Curve) return objects.get(0);
+    
+    
     int n = objects.size();
     TriangleMesh[] meshes = new TriangleMesh[n];
     

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java	2009-05-10 07:13:20 UTC (rev 2944)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/JoinCurvesObj.java	2009-05-10 07:14:15 UTC (rev 2945)
@@ -42,11 +42,11 @@
       tol = ctx.evaluateExpression(parameters.get(1));
     }
     
+    List<ObjectInfo> ch = ParsedTree.evaluate(ctx, children);
+    if (ch.size() < 2) return ch;
+    
     List<ObjectInfo> result = new LinkedList<ObjectInfo>();
     
-    List<ObjectInfo> ch = ParsedTree.evaluate(ctx, children);
-    
-    // FIXME: Check that # children >= 2
     // FIXME: Check that all children are curves
     ObjectInfo[] curves = ch.toArray(new ObjectInfo[ch.size()]);
 
@@ -69,38 +69,43 @@
       polyline.curves.add(curves[curridx]);
       polyline.flipped.add(false);
       polyline.numvertices += ((Curve)curves[curridx].object).getVertices().length;
-      curvesconsumed++;
+      curvesconsumed = 1;
       curves[curridx] = null;
-      
-      
       Vec3 loopstart = ends[curridx][0];
       Vec3 loopend = ends[curridx][1];
-      int i;
-      for (i=curridx+1;i<curves.length;i++) {
-        for (int k=0;k<2;k++) {
-          if (loopstart.distance(ends[i][k]) < tol) {
-            polyline.curves.addFirst(curves[i]);
-            polyline.numvertices += ((Curve)curves[i].object).getVertices().length;
-            polyline.flipped.addFirst(k == 0);
-            curvesconsumed++;
-            curves[i] = null;
+      int localconsumed = 1;
+      while (localconsumed > 0 && !polyline.loop) {
+        localconsumed = 0;
+        int i;
+        for (i=0;i<curves.length;i++) {
+          if (curves[i] == null) continue;
+          for (int k=0;k<2 && curves[i] != null;k++) {
+            if (loopstart.distance(ends[i][k]) < tol) {
+              polyline.curves.addFirst(curves[i]);
+              polyline.numvertices += ((Curve)curves[i].object).getVertices().length;
+              polyline.flipped.addFirst(k == 0);
+              localconsumed++;
+              curves[i] = null;
 
-            loopstart = ends[i][(k+1)%2];
-          }
-          if (loopend.distance(ends[i][k]) < tol) {
-            polyline.curves.addLast(curves[i]);
-            polyline.numvertices += ((Curve)curves[i].object).getVertices().length;
-            polyline.flipped.addFirst(k == 1);
-            curvesconsumed++;
-            curves[i] = null;
+              loopstart = ends[i][(k+1)%2];
+            }
+            else if (loopend.distance(ends[i][k]) < tol) {
+              polyline.curves.addLast(curves[i]);
+              polyline.numvertices += ((Curve)curves[i].object).getVertices().length;
+              polyline.flipped.addLast(k == 1);
+              localconsumed++;
+              curves[i] = null;
 
-            loopend = ends[i][(k+1)%2];
+              loopend = ends[i][(k+1)%2];
+            }
           }
           if (loopstart.distance(loopend) < tol) break; // Loop found
         }
+        if (i != curves.length) polyline.loop = true;
+        curvesconsumed += localconsumed;
       }
-      if (i != curves.length) polyline.loop = true;
       polylines.add(polyline);
+      curridx++;
     }
 
     for (Polyline polyline : polylines) {
@@ -117,7 +122,7 @@
         Mat4 mat = info.coords.fromLocal();
         MeshVertex[] verts = ((Curve)info.object).getVertices();
         for (int v=0;v<verts.length;v++) {
-          vertices[currvidx + (flipped?v:verts.length-1-v)] = mat.times(verts[v].r);
+          vertices[(currvidx + (flipped?verts.length-1-v:v)) % numvertices] = mat.times(verts[v].r);
         }
         currvidx += verts.length - 1;
       }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2955
          http://reprap.svn.sourceforge.net/reprap/?rev=2955&view=rev
Author:   kintel
Date:     2009-05-11 05:53:30 +0000 (Mon, 11 May 2009)

Log Message:
-----------
temporarily moved DXF importer here until we can load external plugins

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/translators/
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/translators/DXFImporter.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/translators/DXFImporter.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/translators/DXFImporter.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/translators/DXFImporter.java	2009-05-11 05:53:30 UTC (rev 2955)
@@ -0,0 +1,446 @@
+/*
+ * Import geometry information from a .DXF file
+ */
+
+package org.reprap.artofillusion.translators;
+
+import java.awt.Color;
+import java.awt.FileDialog;
+import java.awt.Frame;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import klynn.aoi.util.AWTMessageDialog;
+import klynn.aoi.util.MeshTools;
+import klynn.aoi.util.ProgressDialog;
+import artofillusion.ModellingApp;
+import artofillusion.Scene;
+import artofillusion.animation.PositionTrack;
+import artofillusion.animation.RotationTrack;
+import artofillusion.math.CoordinateSystem;
+import artofillusion.math.RGBColor;
+import artofillusion.math.Vec3;
+import artofillusion.object.Curve;
+import artofillusion.object.DirectionalLight;
+import artofillusion.object.Mesh;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectInfo;
+import artofillusion.object.SceneCamera;
+import artofillusion.object.TriangleMesh;
+import artofillusion.texture.Texture;
+import artofillusion.texture.UniformTexture;
+
+import com.ysystems.ycad.lib.ydxf.YdxfGet;
+import com.ysystems.ycad.lib.ydxf.YdxfGetBuffer;
+import com.ysystems.ycad.lib.yxxf.Yxxf;
+import com.ysystems.ycad.lib.yxxf.YxxfEnt;
+import com.ysystems.ycad.lib.yxxf.YxxfEnt3Dface;
+import com.ysystems.ycad.lib.yxxf.YxxfEntArc;
+import com.ysystems.ycad.lib.yxxf.YxxfEntBlock;
+import com.ysystems.ycad.lib.yxxf.YxxfEntCircle;
+import com.ysystems.ycad.lib.yxxf.YxxfEntHeader;
+import com.ysystems.ycad.lib.yxxf.YxxfEntInsert;
+import com.ysystems.ycad.lib.yxxf.YxxfEntLine;
+import com.ysystems.ycad.lib.yxxf.YxxfEntLwpolyline;
+import com.ysystems.ycad.lib.yxxf.YxxfEntPolyline;
+import com.ysystems.ycad.lib.yxxf.YxxfEntVertex;
+import com.ysystems.ycad.lib.yxxf.YxxfGfxContext;
+import com.ysystems.ycad.lib.yxxf.YxxfGfxMatrix;
+import com.ysystems.ycad.lib.yxxf.YxxfGfxPointW;
+import com.ysystems.ycad.lib.yxxf.YxxfTblLayer;
+
+
+class DXFLayer {
+  public Vector<int[]> faces;
+  public Vector<Vec3> vertices;
+  public Vector<Vec3[]> polylines;
+  
+  public DXFLayer() {
+    this.faces = new Vector<int[]>();
+    this.vertices = new Vector<Vec3>();
+    this.polylines = new Vector<Vec3[]>();
+  }
+};
+
+/**
+ * @see artofillusion.translators.DXFImporter
+ * @author klynn
+ */
+public class DXFImporter {
+
+  /**
+   * AOI Scene into which we import
+   */
+  private static Scene theScene = null;
+  private static boolean appendFlag = false;
+  private static boolean debug = true;
+  
+  Frame parent;
+  Boolean enableMeshRepair;
+  Hashtable<YxxfTblLayer, DXFLayer> layers;
+  YxxfGfxContext gc;
+  List<ObjectInfo> importedobjects;
+  Scene scene;
+  
+  public DXFImporter(Scene scene, Frame parent, Boolean enableMeshRepair) {
+    this.parent = parent;
+    this.enableMeshRepair = enableMeshRepair;
+    this.gc = new YxxfGfxContext();
+    this.layers = new Hashtable<YxxfTblLayer, DXFLayer>();
+    this.importedobjects = new LinkedList<ObjectInfo>();
+    this.scene = scene;
+  }
+  
+  public static List<ObjectInfo> importFile(Scene scene, String filename, boolean enableMeshRepair) throws Exception {
+
+    File f = new File(filename);
+
+    String objName = f.getName();
+    if (objName.lastIndexOf('.') > 0) objName = objName.substring(0, objName.lastIndexOf('.'));
+    if (debug) System.out.println("Object name: " + objName);
+    
+    // open file:
+    BufferedInputStream in = null;
+    try {
+      // read file using ycad lib:
+      in = new BufferedInputStream(new FileInputStream(f));
+      Yxxf drawing = new Yxxf();
+      YdxfGetBuffer buffer = new YdxfGetBuffer();
+      int type = YdxfGetBuffer.GET_TYPE_MAIN; // drawing (versus font) get this
+      // from file somehow?
+      buffer.setInput(type, in, drawing);
+      YdxfGet.get(buffer);
+      drawing = buffer.getDrawing();
+      String blockName = drawing.secEntities.insMSpace.block.getBlockname2();
+      if (debug) System.out.println("blockName: [" + blockName + "]");
+
+      DXFImporter importer = new DXFImporter(scene, null, enableMeshRepair);
+      for (int nextToDraw = 0;;) {
+        YxxfEnt ent = (YxxfEnt) drawing.secEntities.insMSpace.block.nextEntity(nextToDraw);
+        if (!(ent instanceof YxxfEntHeader)) break;
+        importer.addEntity((YxxfEntHeader)ent);
+        nextToDraw++;
+      }
+      Boolean geometryfound = false;
+      Enumeration<YxxfTblLayer> keys = importer.layers.keys();
+      while (keys.hasMoreElements()) {
+        YxxfTblLayer layer = keys.nextElement();
+        DXFLayer mylayer = importer.layers.get(layer);
+        Color col = importer.gc.getPalette().jcolorarr[layer.aci];
+        if (importer.createMesh(mylayer, objName, col) != null) geometryfound = true;
+        if (importer.createCurve(mylayer, objName)) geometryfound = true;
+      }
+      if (!geometryfound) {
+        throw new Exception("Import of file: \"" + f + "\" failed. No supported geometry found.");
+      }
+      return importer.importedobjects;
+    } catch (Exception ex) {
+      throw ex;
+    } finally {
+      try {
+        in.close();
+      } catch (Exception ex2) {
+        throw new Exception("Unable to close file: \"" + f + "\"." + ex2.getMessage());
+      }
+    }
+  }
+  
+  /**
+   * fetch DXF
+   * 
+   * @param parent
+   *          Frame Parent GUI frame
+   * @param inScene
+   *          Scene Scene to append to
+   */
+  public static void importFile(Frame parent) {
+    // input file setup:
+    FileDialog fd = new FileDialog(parent, "Import DXF File", FileDialog.LOAD);
+    File f;
+    if (ModellingApp.currentDirectory != null) fd.setDirectory(ModellingApp.currentDirectory);
+    fd.show();
+    if (fd.getFile() == null) return;
+    f = new File(fd.getDirectory(), fd.getFile());
+    String filename = f.getPath();
+    ModellingApp.currentDirectory = fd.getDirectory();
+
+    // ask user to enable/disable mesh repair tools:
+    String msgText = "WARNING: This option can be extremely slow!";
+    AWTMessageDialog dialog = new AWTMessageDialog(parent, msgText, new String[] {
+        " Mesh Repair ON ", " Mesh Repair OFF ", " Cancel " });
+    int choice = dialog.getChoice();
+    boolean enableMeshRepair = false;
+    if (choice == 0) enableMeshRepair = true;
+    if (choice == 2) return;
+    dialog.dispose();
+
+    // create an AOI Scene to add objects to:
+    if (theScene == null) {
+      theScene = new Scene();
+      CoordinateSystem coords = new CoordinateSystem(
+          new Vec3(0.0, 0.0, ModellingApp.DIST_TO_SCREEN), new Vec3(0.0, 0.0, -1.0), Vec3.vy());
+      ObjectInfo info = new ObjectInfo(new SceneCamera(), coords, "Camera 1");
+      info.addTrack(new PositionTrack(info), 0);
+      info.addTrack(new RotationTrack(info), 1);
+      theScene.addObject(info, null);
+      info = new ObjectInfo(new DirectionalLight(new RGBColor(1.0f, 1.0f, 1.0f), 0.8f), coords
+          .duplicate(), "Light 1");
+      info.addTrack(new PositionTrack(info), 0);
+      info.addTrack(new RotationTrack(info), 1);
+      theScene.addObject(info, null);
+    }
+
+    List<ObjectInfo> importedobjects;
+    try {
+      importedobjects = importFile(theScene, filename, enableMeshRepair);
+      addObjects(importedobjects);
+    } catch (Exception e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+    }
+    
+    if (!appendFlag) ModellingApp.newWindow(theScene);
+    return;
+  }
+
+  private void createObjectInfo(String objName, Object3D obj3d, Color col) {
+    Texture tex;
+    if (col != null) {
+      tex = new UniformTexture();
+      ((UniformTexture)tex).diffuseColor.setRGB(col.getRed(), col.getGreen(), col.getBlue());
+    }
+    else {
+      tex = scene.getDefaultTexture();
+    }
+    ObjectInfo info = new ObjectInfo(obj3d, new CoordinateSystem(), objName);
+    info.setTexture(tex, tex.getDefaultMapping(obj3d));
+    info.addTrack(new PositionTrack(info), 0);
+    info.addTrack(new RotationTrack(info), 1);
+    this.importedobjects.add(info);
+  }
+  
+  private static void addObjects(List<ObjectInfo> objects)
+  {
+    for (ObjectInfo info : objects) {
+      theScene.addObject(info, null);
+    }
+  }
+
+  private Boolean createCurve(DXFLayer mylayer, String objName) {
+    for (int i=0;i<mylayer.polylines.size();i++) {
+      Vec3[] verts = mylayer.polylines.get(i);
+      float smoothness[] = new float[verts.length];
+      Arrays.fill(smoothness, 0.0f);
+      Curve curve = new Curve(verts, smoothness, Mesh.NO_SMOOTHING, false);
+      createObjectInfo(objName + "_curve" + i, curve, null);
+    }
+    if (mylayer.polylines.size() > 0) return true;
+    else return false;
+  }
+
+  private TriangleMesh createMesh(DXFLayer mylayer, String objName, Color col) {
+    int numVerts = mylayer.vertices.size();
+    if (numVerts == 0) return null;
+    // construct AOI scene:
+    double min[] = new double[] { Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE };
+    double max[] = new double[] { -Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE };
+
+    // vertices:
+    Vec3 vert[] = new Vec3[numVerts], center = new Vec3();
+    for (int i = 0; i < numVerts; i++) {
+      vert[i] = mylayer.vertices.elementAt(i);
+
+      // new min?
+      if (vert[i].x < min[0]) min[0] = vert[i].x;
+      if (vert[i].y < min[1]) min[1] = vert[i].y;
+      if (vert[i].z < min[2]) min[2] = vert[i].z;
+
+      // new max?
+      if (vert[i].x > max[0]) max[0] = vert[i].x;
+      if (vert[i].y > max[1]) max[1] = vert[i].y;
+      if (vert[i].z > max[2]) max[2] = vert[i].z;
+
+      center.add(vert[i]);
+    }
+
+    // faces:
+    int fc[][] = new int[mylayer.faces.size()][];
+    for (int j = 0; j < mylayer.faces.size(); j++)
+      fc[j] = mylayer.faces.elementAt(j);
+    if (debug) System.out.println("numVerts=" + numVerts);
+    if (debug) System.out.println("numFaces=" + mylayer.faces.size());
+
+    // scale mesh:
+    double maxSize = Math.max(Math.max(max[0] - min[0], max[1] - min[1]), max[2] - min[2]);
+    double scale = Math.pow(10.0, -Math.floor(Math.log(maxSize) / Math.log(10.0)));
+    for (int i = 0; i < vert.length; i++)
+      ((Vec3) vert[i]).scale(scale);
+
+    // center mesh:
+    center.scale(1.0 / vert.length);
+    for (int i = 0; i < vert.length; i++)
+      vert[i] = vert[i].minus(center);
+    if (debug) System.out.println("CENTER: " + center);
+
+    if (vert.length > 0) {
+      // merge duplicate points:
+      MeshTools mutil = new MeshTools(this.parent);
+      vert = mutil.mergePoints(vert, fc);
+
+      // attempt to fix normals (SLOW!):
+      if (this.enableMeshRepair) mutil.fixCirality(fc);
+
+      TriangleMesh mesh = new TriangleMesh(vert, fc);
+      createObjectInfo(objName, mesh, col);
+      return mesh;
+    }
+    return null;
+  }
+
+  /**
+   * fetch DXF, append to specified scene
+   * 
+   * @param parent
+   *          Frame Parent GUI frame
+   * @param inScene
+   *          Scene Scene to append to
+   */
+  public static void importFile(Frame parent, Scene inScene) {
+    if (inScene != null) {
+      theScene = inScene;
+      appendFlag = true;
+    }
+    importFile(parent);
+  }
+
+  /**
+   * Try to add the entity to the faces and vertices lists
+   * 
+   * @param
+   * @return
+   */
+  private void addEntity(YxxfEntHeader ent) {
+    YxxfGfxMatrix m = new YxxfGfxMatrix();
+    m.mtxSetIdentity();
+    addEntity(ent, m);
+  }
+  
+  private void addEntity(YxxfEntHeader ent, YxxfGfxMatrix mat) {
+    YxxfTblLayer layer = ent.hdr_layer;
+    int colorindex = layer.aci;
+    if (colorindex < 0) return;
+    DXFLayer mylayer = this.layers.get(layer);
+    if (mylayer == null) {
+      mylayer = new DXFLayer();
+      this.layers.put(layer, mylayer);
+    }
+    
+    if (ent instanceof YxxfEnt3Dface) {
+      // if (debug) System.out.println("Found a 3DFace");
+      YxxfEnt3Dface f = (YxxfEnt3Dface) ent;
+      YxxfGfxPointW pt1 = f.pnt1;
+      YxxfGfxPointW pt2 = f.pnt2;
+      YxxfGfxPointW pt3 = f.pnt3;
+      YxxfGfxPointW pt4 = f.pnt4;
+      // if (debug) System.out.println("pt1: " + pt1.x + ", " + pt1.y + ", " +
+      // pt1.z);
+      // if (debug) System.out.println("pt2: " + pt2.x + ", " + pt2.y + ", " +
+      // pt2.z);
+      // if (debug) System.out.println("pt3: " + pt3.x + ", " + pt3.y + ", " +
+      // pt3.z);
+      // if (debug) System.out.println("pt4: " + pt4.x + ", " + pt4.y + ", " +
+      // pt4.z);
+      mylayer.vertices.add(new Vec3(pt1.x, pt1.y, pt1.z));
+      mylayer.vertices.add(new Vec3(pt2.x, pt2.y, pt2.z));
+      mylayer.vertices.add(new Vec3(pt3.x, pt3.y, pt3.z));
+      if (pt3.x == pt4.x && pt3.y == pt4.y && pt3.z == pt4.z) {
+        // 1 face
+        mylayer.faces.add(new int[] { mylayer.vertices.size() - 1, mylayer.vertices.size() - 2, mylayer.vertices.size() - 3 });
+      }
+      else {
+        // 2 faces
+        mylayer.vertices.add(new Vec3(pt4.x, pt4.y, pt4.z));
+        mylayer.faces.add(new int[] { mylayer.vertices.size() - 1, mylayer.vertices.size() - 2, mylayer.vertices.size() - 3 });
+        mylayer.faces.add(new int[] { mylayer.vertices.size() - 1, mylayer.vertices.size() - 3, mylayer.vertices.size() - 4 });
+      }
+    }
+    else if (ent instanceof YxxfEntArc) {
+      YxxfEntArc a = (YxxfEntArc) ent;
+      if (debug) {
+        System.out.printf("Found an Arc: c=%.2f,%.2f,%.2f r=%.2f start=%.2f end=%.2f\n",
+                          a.center.x,a.center.y,a.center.z,a.radius,a.entbegang,a.entendang);
+        
+      }
+      Vec3[] coords = createArc(mat, a.center, a.radius, a.entbegang, a.entendang);
+      mylayer.polylines.add(coords);
+    }
+    else if (ent instanceof YxxfEntCircle) {
+      YxxfEntCircle c = (YxxfEntCircle)ent;
+      Vec3[] coords = createArc(mat, c.center, c.radius, 0, 360);
+      mylayer.polylines.add(coords);
+    }
+    else if (ent instanceof YxxfEntLine) {
+      if (debug) System.out.println("Found an Line");
+      YxxfEntLine l = (YxxfEntLine)ent;
+      Vec3[] polyline = new Vec3[2];
+      YxxfGfxPointW p = mat.mtxTransformPoint(new YxxfGfxPointW(l.begpnt));
+      polyline[0] = new Vec3(p.x, p.y, p.z);
+      p = mat.mtxTransformPoint(new YxxfGfxPointW(l.endpnt));
+      polyline[1] = new Vec3(p.x, p.y, p.z); 
+      mylayer.polylines.add(polyline);
+    }
+    else if (ent instanceof YxxfEntLwpolyline) {
+      YxxfEntPolyline pl = (YxxfEntPolyline)((YxxfEntLwpolyline)ent).pline;
+      Vec3[] polyline = new Vec3[pl.vtxEntities.size()];
+      for (int i=0;i<pl.vtxEntities.size();i++) {
+        YxxfGfxPointW p = mat.mtxTransformPoint(new YxxfGfxPointW(((YxxfEntVertex)pl.vtxEntities.get(i)).pnt));
+        polyline[i] = new Vec3(p.x, p.y, p.z);
+      }
+      mylayer.polylines.add(polyline);
+    }
+    else if (ent instanceof YxxfEntInsert) {
+      YxxfEntInsert e = (YxxfEntInsert) ent;
+      if (debug) System.out.printf("Insert: %.2f,%.2f,%.2f\n",
+                                   e.inspnt.x, e.inspnt.y, e.inspnt.z);
+      YxxfEntBlock blk = (YxxfEntBlock)e.block;
+      for (int nextToDraw = 0;;) {
+        YxxfEnt ent2 = (YxxfEnt)blk.nextEntity(nextToDraw);
+        if (!(ent2 instanceof YxxfEntHeader)) break;
+        YxxfGfxMatrix m = new YxxfGfxMatrix(e.M_insert);
+        m.mtxTranslate(e.inspnt);
+        addEntity((YxxfEntHeader)ent2, m);
+        nextToDraw++;
+      }
+    }
+    
+    else System.out.println("Skipping unknown/unsupported entity: " + ent.getClass().getName());
+
+    return;
+  }
+
+  private Vec3[] createArc(YxxfGfxMatrix mat,
+                           YxxfGfxPointW center, double radius, double startang, double endang) {
+    int num = 8; // FIXME: Calculate a suitable # of segments
+    double sweepang = (endang - startang)*Math.PI/180;
+    while (sweepang < 0) sweepang += Math.PI*2;
+    double delta = sweepang/num;
+    double angle = startang*Math.PI/180;
+    Vec3[] coords = new Vec3[num+1]; 
+    for (int i = 0; i <= num; i++) {
+      YxxfGfxPointW p = mat.mtxTransformPoint(new YxxfGfxPointW(center.x + Math.cos(angle) * radius, 
+                                                                center.y + Math.sin(angle) * radius, 
+                                                                center.z));
+      coords[i] = new Vec3(p.x, p.y, p.z);
+      angle += delta;
+    }
+    return coords;
+  }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2959
          http://reprap.svn.sourceforge.net/reprap/?rev=2959&view=rev
Author:   wizard23
Date:     2009-05-11 06:16:58 +0000 (Mon, 11 May 2009)

Log Message:
-----------
now multipleresults are displayed as an ObjectCollection :)

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Added Paths:
-----------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java

Added: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java	                        (rev 0)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java	2009-05-11 06:16:58 UTC (rev 2959)
@@ -0,0 +1,54 @@
+package org.reprap.artofillusion;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
+import artofillusion.Scene;
+import artofillusion.animation.Keyframe;
+import artofillusion.object.Object3D;
+import artofillusion.object.ObjectCollection;
+import artofillusion.object.ObjectInfo;
+
+/** Used to display Groups of Objects that arise for example in a cs node
+ * shamelessly ripped  from:  ExternalObject:ExternalObjectCollection 
+ * which I would have used if it was public */
+
+public class MetaCADObjectCollection extends ObjectCollection
+{
+  private List<ObjectInfo> objects;
+
+  public MetaCADObjectCollection(List<ObjectInfo> objects)
+  {
+    this.objects = objects;
+  }
+
+  protected Enumeration enumerateObjects(ObjectInfo info, boolean interactive, Scene scene)
+  {
+    return Collections.enumeration(objects);
+  }
+
+  public Object3D duplicate()
+  {
+    return new MetaCADObjectCollection(objects);
+  }
+
+  public void copyObject(Object3D obj)
+  {
+    objects = ((MetaCADObjectCollection) obj).objects;
+  }
+
+  public void setSize(double xsize, double ysize, double zsize)
+  {
+  }
+
+  public Keyframe getPoseKeyframe()
+  {
+    return null;
+  }
+
+  public void applyPoseKeyframe(Keyframe k)
+  {
+  }
+}
\ No newline at end of file

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-11 06:14:52 UTC (rev 2958)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-11 06:16:58 UTC (rev 2959)
@@ -9,6 +9,7 @@
 import org.reprap.artofillusion.objects.ObjFactory;
 import org.reprap.artofillusion.objects.ObjFactoryException;
 
+import artofillusion.math.CoordinateSystem;
 import artofillusion.object.ObjectInfo;
 import artofillusion.texture.Texture;
 import artofillusion.texture.TextureMapping;
@@ -55,7 +56,8 @@
       updateAOI(result.get(0));
     }
     else {
-      updateAOI(ObjectHelper.join(result, 0.1));
+      ObjectInfo collection = new ObjectInfo(new MetaCADObjectCollection(result), new CoordinateSystem(), "dummy");
+      updateAOI(collection);
     }
     return result;
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2962
          http://reprap.svn.sourceforge.net/reprap/?rev=2962&view=rev
Author:   kintel
Date:     2009-05-11 07:01:33 +0000 (Mon, 11 May 2009)

Log Message:
-----------
Fixed ObjectCollection texture bug

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java	2009-05-11 06:29:24 UTC (rev 2961)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java	2009-05-11 07:01:33 UTC (rev 2962)
@@ -1,6 +1,5 @@
 package org.reprap.artofillusion;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -10,6 +9,8 @@
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectCollection;
 import artofillusion.object.ObjectInfo;
+import artofillusion.texture.Texture;
+import artofillusion.texture.TextureMapping;
 
 /** Used to display Groups of Objects that arise for example in a cs node
  * shamelessly ripped  from:  ExternalObject:ExternalObjectCollection 
@@ -26,17 +27,17 @@
 
   protected Enumeration enumerateObjects(ObjectInfo info, boolean interactive, Scene scene)
   {
-    return Collections.enumeration(objects);
+    return Collections.enumeration(this.objects);
   }
 
   public Object3D duplicate()
   {
-    return new MetaCADObjectCollection(objects);
+    return new MetaCADObjectCollection(this.objects);
   }
 
   public void copyObject(Object3D obj)
   {
-    objects = ((MetaCADObjectCollection) obj).objects;
+    this.objects = ((MetaCADObjectCollection) obj).objects;
   }
 
   public void setSize(double xsize, double ysize, double zsize)
@@ -51,4 +52,12 @@
   public void applyPoseKeyframe(Keyframe k)
   {
   }
+  
+  public void setTexture(Texture tex, TextureMapping map)
+  {
+    for (ObjectInfo info : this.objects) {
+      info.object.setTexture(tex, map);
+    }
+    super.setTexture(tex, map);
+  }
 }
\ No newline at end of file

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-11 06:29:24 UTC (rev 2961)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-11 07:01:33 UTC (rev 2962)
@@ -56,8 +56,9 @@
       updateAOI(result.get(0));
     }
     else {
-      ObjectInfo collection = new ObjectInfo(new MetaCADObjectCollection(result), new CoordinateSystem(), "dummy");
-      updateAOI(collection);
+     ObjectInfo collection = new ObjectInfo(new MetaCADObjectCollection(result), new CoordinateSystem(), "dummy");
+     updateAOI(collection);
+//      updateAOI(ObjectHelper.join(result, 0.1));
     }
     return result;
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2973
          http://reprap.svn.sourceforge.net/reprap/?rev=2973&view=rev
Author:   wizard23
Date:     2009-05-13 03:52:20 +0000 (Wed, 13 May 2009)

Log Message:
-----------
now saving of generated collection of objectinfos works out (hopefully)

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 00:21:49 UTC (rev 2972)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 03:52:20 UTC (rev 2973)
@@ -4,6 +4,8 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -17,12 +19,14 @@
 import artofillusion.ModellingApp;
 import artofillusion.Scene;
 import artofillusion.UndoRecord;
+import artofillusion.animation.Keyframe;
 import artofillusion.math.CoordinateSystem;
 import artofillusion.math.Vec2;
 import artofillusion.math.Vec3;
 import artofillusion.object.Cube;
 import artofillusion.object.Cylinder;
 import artofillusion.object.Object3D;
+import artofillusion.object.ObjectCollection;
 import artofillusion.object.ObjectInfo;
 import artofillusion.object.Sphere;
 import artofillusion.texture.Texture;

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java	2009-05-13 00:21:49 UTC (rev 2972)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADObjectCollection.java	2009-05-13 03:52:20 UTC (rev 2973)
@@ -1,11 +1,21 @@
 package org.reprap.artofillusion;
 
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
+import artofillusion.ArtOfIllusion;
 import artofillusion.Scene;
 import artofillusion.animation.Keyframe;
+import artofillusion.animation.ObjectRef;
+import artofillusion.math.CoordinateSystem;
 import artofillusion.object.Object3D;
 import artofillusion.object.ObjectCollection;
 import artofillusion.object.ObjectInfo;
@@ -24,7 +34,68 @@
   {
     this.objects = objects;
   }
+  
+  public void writeToFile(DataOutputStream out, Scene theScene) throws IOException
+  {
+    // inspired by CSGObject.writeToFile
+    super.writeToFile(out, theScene);
+    
+    out.writeShort(0);
+    
+    // how many objects do we have?
+    out.writeInt(objects.size());
+    // serializing all the ObjectInfos in the collection
+    for (ObjectInfo objInfo : objects)
+    {
+      objInfo.getCoords().writeToFile(out);
+      out.writeUTF(objInfo.getName());
+      out.writeUTF(objInfo.getObject().getClass().getName());
+      objInfo.getObject().writeToFile(out, theScene);
+    }
+  }
+  
+  public MetaCADObjectCollection(DataInputStream in, Scene theScene) throws IOException, 
+  InvalidObjectException
+  {
+    // inspired by CSGObject.CSGObject(DataInputStream in, Scene theScene)
+    super(in, theScene);
 
+    short version = in.readShort();
+    if (version != 0)
+      throw new InvalidObjectException("");
+
+    int objectSize = in.readInt();
+    try {
+      objects = new ArrayList<ObjectInfo>(objectSize);
+      // deserializing all the ObjectInfos in the collection
+      for (int i = 0; i < objectSize; i++)
+      {
+        ObjectInfo objInfo;
+        objInfo = new ObjectInfo(null, new CoordinateSystem(in), in.readUTF());
+        Class cls = ArtOfIllusion.getClass(in.readUTF());
+        Constructor con = cls.getConstructor(DataInputStream.class, Scene.class);
+        objInfo.setObject((Object3D) con.newInstance(in, theScene));
+        
+        objInfo.getObject().setTexture(getTexture(), getTextureMapping());
+        if (getMaterial() != null)
+        {
+          objInfo.getObject().setMaterial(getMaterial(), getMaterialMapping());
+        }
+        objects.add(objInfo);
+      }
+    }
+    catch (InvocationTargetException ex)
+    {
+      ex.getTargetException().printStackTrace();
+      throw new IOException();
+    }
+    catch (Exception ex) 
+    {
+      ex.printStackTrace();
+      throw new IOException();
+    }
+  }
+  
   protected Enumeration enumerateObjects(ObjectInfo info, boolean interactive, Scene scene)
   {
     return Collections.enumeration(this.objects);
@@ -55,8 +126,12 @@
   
   public void setTexture(Texture tex, TextureMapping map)
   {
-    for (ObjectInfo info : this.objects) {
-      info.object.setTexture(tex, map);
+    // need this check to prevent null pointer exception while loading
+    if (this.objects != null)
+    {
+      for (ObjectInfo info : this.objects) {
+        info.object.setTexture(tex, map);
+      }
     }
     super.setTexture(tex, map);
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2974
          http://reprap.svn.sourceforge.net/reprap/?rev=2974&view=rev
Author:   wizard23
Date:     2009-05-13 03:59:17 +0000 (Wed, 13 May 2009)

Log Message:
-----------
cleaning up, removing old crappy parser

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java

Removed Paths:
-------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 03:52:20 UTC (rev 2973)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 03:59:17 UTC (rev 2974)
@@ -38,62 +38,13 @@
 
 public class MetaCADEvaluatorEngine extends CSGEvaluatorEngine
 {
-  public static final int EXTRUSION = 10;
-  public static final int POLYGON   = 11;
-  public static final int SPHERE    = 12;
-  public static final int CUBE      = 13;
-  public static final int CYLINDER  = 14;
-  
   MetaCADContext context;
 
   public MetaCADEvaluatorEngine(LayoutWindow window) {
     super(window);
     this.context = new MetaCADContext(window.getScene());
   }
-
-  /**
-   * Converts from operation to String
-   */
-  public String opToString(int operation) {
-    switch (operation) {
-    case EXTRUSION:
-      return "extrude()";
-    case POLYGON:
-      return "polygon()";
-    case CUBE:
-      return "cube()";
-    case SPHERE:
-      return "sphere()";
-    case CYLINDER:
-      return "cylinder()";
-    default:
-      return super.opToString(operation);
-    }
-  }
-
-  /**
-   * Converts from string to operation.
-   */
-  public int stringToOp(String opstr) {
-    String lower = opstr.toLowerCase();
-    if (lower.startsWith("extrude")) {
-      return EXTRUSION;
-    }
-    else if (lower.startsWith("poly")) {
-      return POLYGON;
-    }
-    else if (lower.startsWith("cube")) {
-      return CUBE;
-    }
-    else if (lower.startsWith("sphere")) {
-      return SPHERE;
-    }
-    else if (lower.startsWith("cylinder")) {
-      return CYLINDER;
-    }
-    else return super.stringToOp(opstr);
-  }
-  
+ 
   public void setParameters(String text) {
     this.window.getScene().setMetadata(
         MetaCADEvaluatorEngine.class.getName() + "Parameters", text);
@@ -218,17 +169,6 @@
     }
   }
 
-  /*
-  public ObjectInfo evaluateNode(ObjectInfo parent, UndoRecord undo) throws Exception
-  {
-    if (evaluateLoop(parent, undo)) return parent;
-    if (convertObject(parent)) return parent;
-    if (evaluateObject(parent, undo)) return parent;
-
-    return super.evaluateNode(parent, undo);
-  }
-  */
-
   Boolean convertObject(ObjectInfo parent) {
     if (parent.name.startsWith("Cube ") && parent.object instanceof Cube) {
       Vec3 size = ((Cube)parent.object).getBounds().getSize();
@@ -268,91 +208,6 @@
     return false;
   }
 
-  /**
-   * 
-   * Evaluates a boolean expression as a loop.
-   * 
-   * @param parent
-   * @param undo
-   * @return
-   * @throws Exception
-   */
-  /*
-  public Boolean evaluateLoop(ObjectInfo parent, UndoRecord undo) throws Exception {
-    String line = parent.name;
-    int operation = this.stringToOp(line);
-
-    if (!isBooleanOp(operation)) return false;
-
-    String[] parameters = null;
-    CoordinateSystem coordsys=null;
-    MetaCADParser loopExpr = new MetaCADParser(line);
-
-    // The parsing will fail if we don't find parentheses.
-    if (!loopExpr.parse()) return false;
-
-    Enumeration<String> iter = loopExpr.getNames();
-    while (iter.hasMoreElements()) {
-      String name = iter.nextElement();
-      parameters = loopExpr.getParameters(name);
-      
-      if (name.startsWith(this.opToString(operation)))
-      {
-        parameters=loopExpr.getParameters(name);
-      }
-    }
-      
-    if (parameters == null || parameters.length != 3) {
-      // no loop but a simple boolean operation let base class do that
-      loopExpr = new MetaCADParser("dummyDummy(dummyDummy=0; dummyDummy<1; dummyDummy=dummyDummy+1)");
-      loopExpr.parse();
-      parameters = loopExpr.getParameters("dummyDummy");
-    }
-
-    CSGHelper helper = new CSGHelper(operation);
-
-    // evaluate first part of for loop i.e. i=0
-    this.context.evaluateAssignment(parameters[0]);
-
-    // security count to exit loop even if we fuck up exit condition
-    int count = 0;
-
-    // condition loop evaluate the condition i.e. i < 10
-    while (evaluateExpression(parameters[1]) != 0 && count < 100) {
-      ObjectInfo[] objects = parent.children;
-
-      for (int i = 0; i < objects.length; i++) {
-        helper.Add(evaluateNode(objects[i], undo).duplicate());
-        objects[i].setVisible(false);
-      }
-
-      // "increment" evaluate 3rd for parameter i.e. i=i+1
-      this.context.evaluateAssignment(parameters[2]);
-      count++;
-    }
-
-    if (helper.GetObject() != null) {
-      Texture tex = parent.object.getTexture();
-      TextureMapping map = parent.object.getTextureMapping();
-
-      if (coordsys != null) parent.setCoords(coordsys);
-      else parent.setCoords(new CoordinateSystem());
-
-      Object3D test = sanitizeObject3D(helper.GetObject());
-
-      parent.setObject(test);
-      parent.object.setTexture(tex, map);
-      parent.setVisible(true);
-
-      parent.clearCachedMeshes();
-      this.window.updateImage();
-      this.window.updateMenus();
-
-    }
-
-    return true;
-  }
-*/
   Object3D sanitizeObject3D(Object3D obj) throws Exception {
     try {
       obj.getBounds();
@@ -364,75 +219,6 @@
     return obj;
   }
 
-  
-  /**
-   * 
-   * Evaluates the given object.
-   * 
-   * @return true if object was successfully evaluated, 
-   * false if either an error occurred or if the object was not recognized by MetaCADEvaluator
-   * 
-   */
-  public Boolean evaluateObject(ObjectInfo parent, UndoRecord undo) throws Exception {
-    
-    String line = parent.name;
-
-    // Don't try to evaluate operations belonging to CSGEvaluator.
-    // FIXME: This is getting a little hackish
-    int op = stringToOp(parent.name);
-    if (op == -1 || isBooleanOp(op)) return false;
-
-    MetaCADParser objExpr = new MetaCADParser(line);
-    if (!objExpr.parse()) {
-      showMessage("evaluateObject: Unable to parse \"" + line + "\"");
-      return false;
-    }
-
-    Object3D obj3D = null;
-    CoordinateSystem coordsys = null;
-    CoordinateSystem objcoordsys = null;
-    
-    // FIXME: Verify that combining these coordsys'es is done correctly.
-    if (coordsys == null) {
-      if(objcoordsys != null) coordsys = objcoordsys;
-    }
-    else if (objcoordsys != null){
-      coordsys.transformCoordinates(objcoordsys.fromLocal());
-    }
-    
-    if (obj3D != null) {
-      Texture tex = parent.object.getTexture();
-      TextureMapping map = parent.object.getTextureMapping();
-
-      if (coordsys != null) parent.setCoords(coordsys);
-      else parent.setCoords(new CoordinateSystem());
-      parent.setObject(obj3D);
-      parent.object.setTexture(tex, map);
-      parent.setVisible(true);
-
-      parent.clearCachedMeshes();
-      this.window.updateImage();
-      this.window.updateMenus();
-    } else {
-      return false;
-    }
-    return true;
-  }
-
-  // Evaluates an Expression like 3*x+sin(a) and returns the value of it or 0 if
-  // any error occurred
-  double evaluateExpression(String expr) throws Exception {
-    try {
-      this.context.jep.parseExpression(expr);
-      return this.context.jep.getValue();
-    } catch (Exception ex) {
-      showMessage("Error while evaluating Expression: \"" + expr
-          + "\" Syntax Error or unknown variable?");
-      throw (ex);
-      // return 0;
-    }
-  }
-
 String coordSysToString(CoordinateSystem cs) {
     Vec3 t = cs.getOrigin();
     double r[] = cs.getRotationAngles();

Deleted: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java	2009-05-13 03:52:20 UTC (rev 2973)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADParser.java	2009-05-13 03:59:17 UTC (rev 2974)
@@ -1,65 +0,0 @@
-package org.reprap.artofillusion;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-/**
- * 
- * Splits lines on the form "function1(arg1,arg2)function2(arg1;arg2)..." into
- * a mapping from name:parameters[arg1, arg2]
- */
-public class MetaCADParser {
-
-  String expr;
-  Hashtable<String,String[]> expressions = new Hashtable<String,String[]>();
-  
-  public MetaCADParser(String expr) {
-    this.expr = expr;
-  }
-
-  /**
-   * Parses the current string of expressions and creates a hashtable of mapping from name -> parameter list
-   * 
-   * @return true if parse succeeded, false if parse failed
-   */
-  public Boolean parse() {
-    Boolean found = false;    
-    int pos = 0;
-    int numopens = 0;
-    while (true) {
-      int posOpenBracket = this.expr.indexOf("(", pos);
-      if (posOpenBracket > 0) {
-        String name = this.expr.substring(pos, posOpenBracket).trim();
-        numopens = 1;
-        pos = posOpenBracket;
-        while (numopens > 0) {
-          pos++;
-          if (pos == this.expr.length()) break;
-          if (this.expr.charAt(pos) == '(') numopens++;
-          else if (this.expr.charAt(pos) == ')') numopens--;
-        }
-        if (numopens > 0) {
-          System.out.println("MetaCADParser: Unbalanced expression " + this.expr);
-          return false;
-        }
-        String[] parameters = this.expr.substring(posOpenBracket + 1, pos).trim().split("[,;]");
-        this.expressions.put(name, parameters);     
-        pos++;
-        found = true;
-      }
-      else {
-        return found;
-      }
-      if (pos == this.expr.length()) break;
-    }
-    return found;
-  }
-
-  public Enumeration<String> getNames() {
-    return this.expressions.keys();
-  }
-
-  public String[] getParameters(String key) {
-    return this.expressions.get(key); 
-  }
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2975
          http://reprap.svn.sourceforge.net/reprap/?rev=2975&view=rev
Author:   wizard23
Date:     2009-05-13 04:04:47 +0000 (Wed, 13 May 2009)

Log Message:
-----------
cleanup,removed old duplicate code

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 03:59:17 UTC (rev 2974)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 04:04:47 UTC (rev 2975)
@@ -242,104 +242,6 @@
     new MessageDialog(this.window, text);
   }
 
-///////////////////////////////////////////
-//math helpers
- 
-  // solves system of 2 linear equations in 2 unknown 
-  class LinearSolve2
-  {
-    public boolean error;
-    public double x1, x2;
-  
-    // matrix looks like this 
-    // a b
-    // c d
-    public double det(double a,double b, double c, double d)
-    {
-      return a*d-b*c;  
-    }
-    // the equations look like thsi looks like this
-    // x1*a + x2*b = r1
-    // x1*c + x2*d = r2
-    public LinearSolve2(double a,double b, double c, double d, double r1, double r2)
-    {
-      double q;
-      
-      q=det(a,b,c,d);
-      if (Math.abs(q) < 0.00000001)
-      {
-        this.error = true;
-      }
-      else
-      {
-        this.error = false;
-        this.x1=det(r1,b,r2,d)/q;
-        this.x2=det(a,r1,c,r2)/q;
-      }
-    }
-  }
-  
-  class MetaCADLine {
-    protected Vec2 start,end, dir;
-    protected Vec2 normal;
-    
-    public MetaCADLine(Vec3 s,Vec3 e)
-    {
-      this.start = new Vec2(s.x,s.y);
-      this.end = new Vec2(e.x, e.y);
-      this.dir = this.end.minus(this.start);
-      this.normal = new Vec2(this.dir);
-      this.normal.normalize();
-      this.normal.set(-this.normal.y, this.normal.x);
-    }
-    
-    public void parallelMove(double d)
-    {
-      this.start.add(this.normal.times(d));
-    }
-    
-    public Vec3 intersect3(MetaCADLine l)
-    {
-      LinearSolve2 solve = new LinearSolve2(l.dir.x, -this.dir.x, l.dir.y, -this.dir.y, this.start.x-l.start.x, this.start.y-l.start.y);
-      if (solve.error)
-      {
-        return null;
-      }
-      else
-      {
-        Vec2 point = this.start.plus(this.dir.times(solve.x2)); 
-        return new Vec3(point.x,point.y, 0);
-      }
-    }
-  }
-  
-  Vec3[] insetPoly(Vec3[] poly, double inset)
-  {
-    //List<MetaCADLine> lines = new ArrayList<MetaCADLine>();
-    List<Vec3> points = new ArrayList<Vec3>();
-    
-    for (int i = 0; i < poly.length; i++)
-    {
-        int iprev = (i+poly.length-1)%poly.length;
-        int inext = (i+1)%poly.length;
-        
-        MetaCADLine prev = new MetaCADLine(poly[iprev], poly[i]);
-        MetaCADLine next = new MetaCADLine(poly[i], poly[inext]);
-        
-        prev.parallelMove(inset);
-        next.parallelMove(inset);
-        
-        Vec3 intersect=prev.intersect3(next);
-        if (intersect == null)
-        {
-          intersect = new Vec3(0,0,0);
-        }
-        points.add(intersect);
-    }
-     
-    return points.toArray(new Vec3[1]);
-  }
-
   public void cube() throws Exception
   {
     createObjectFromString("cube(1, 2, 3)");

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java	2009-05-13 03:59:17 UTC (rev 2974)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/objects/InsetObj.java	2009-05-13 04:04:47 UTC (rev 2975)
@@ -45,65 +45,7 @@
     }
     return result;
   }
-  
-  Vec3[] createRoll(int n, double big, double small, double small2) {
-    Vec3[] v;
-    v = new Vec3[n];
-    int index = 0;
-    for (int i = 0; i < n; i++)
-    {
-      double biga=(2*Math.PI*i)/n;
-      double len = big*biga;
-      double smalla=len/small;
-      double x,y;
-      
-      x = (big+small)*Math.cos(biga) + (small2)*Math.cos(smalla);
-      y = (big+small)*Math.sin(biga) + (small2)*Math.sin(smalla);
-      
-      v[index] = new Vec3(x, y, 0 );
-      
-      index++;
-    }
-    return v;
-  }
 
-  Vec3[] createRegular(int n, double radiusx, double radiusy) {
-    Vec3[] v;
-    v = new Vec3[n];
-    int index = 0;
-    for (int i = 0; i < n; i++)
-    {
-      v[index] = new Vec3( radiusx*Math.cos( 2*Math.PI * index / (double) n ),
-          radiusy*Math.sin(2*Math.PI * index / (double) n ), 0 );
-      index++;
-    }
-    return v;
-  }
-
-  Vec3[] createStar(int n, double inner, double outer) {
-    Vec3[] v;
-    v = new Vec3[2*n];
-    int index = 0;
-    for (int i = 0; i < n; i++) {
-      v[index] = new Vec3(Math.cos(Math.PI * index / (double) n),
-                          Math.sin(Math.PI * index / (double) n), 0);
-      v[index].scale(inner);
-      v[index+1] = new Vec3(Math.cos(Math.PI * (index + 1) / (double) n),
-                            Math.sin(Math.PI * (index + 1) / (double) n), 0);
-      v[index+1].scale(outer);
-      index += 2;
-    }
-    return v;
-  }
-
-  Object3D createPolygon(Vec3[] v) {
-    Object3D obj3D;
-    float smoothness[] = new float[v.length];
-    Arrays.fill(smoothness, 0.0f);
-    obj3D = new Curve(v, smoothness, Mesh.NO_SMOOTHING, true).convertToTriangleMesh(0);
-    return obj3D;
-  }
-
 ///////////////////////////////////////////
 //math helpers
  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2980
          http://reprap.svn.sourceforge.net/reprap/?rev=2980&view=rev
Author:   wizard23
Date:     2009-05-13 20:45:54 +0000 (Wed, 13 May 2009)

Log Message:
-----------
changed isLocked evaluation detection mechnism into "=" prefixed 

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 14:39:15 UTC (rev 2979)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 20:45:54 UTC (rev 2980)
@@ -39,6 +39,7 @@
 public class MetaCADEvaluatorEngine extends CSGEvaluatorEngine
 {
   MetaCADContext context;
+  static final String evaluateMePrefix = "=";
 
   public MetaCADEvaluatorEngine(LayoutWindow window) {
     super(window);
@@ -92,7 +93,6 @@
     return true;
   }
 
-  
   /**
    * 
    * Recursively extracts an AoI object tree and creates our own ParsedTree representation.
@@ -105,6 +105,49 @@
 
     // Parse this ObjectInfo
     ParsedTree root = null;
+    
+    String name =  parent.name.trim();
+    if (name.startsWith(evaluateMePrefix))
+    {
+      name = name.substring(evaluateMePrefix.length());
+      root = org.reprap.artofillusion.parser.MetaCADParser.parseTree(name + ";");
+      root.aoiobj = parent;
+    }
+    // not preceded by a * so it must be a native object
+    else
+    {
+      root = new ParsedTree();
+      root.name = "native";
+      root.aoiobj = parent;
+    }
+    
+    // If the parser returned a subtree, find the leaf node
+    // (we guarantee that there are at most one child of each intermediate node)
+    ParsedTree parenttree = root;
+    while (!parenttree.children.isEmpty()) parenttree = (ParsedTree)parenttree.children.get(0);
+
+    // Build hierarchy recursively
+    ObjectInfo[] objects = parent.children;
+    for (int i=0;i<objects.length;i++) {
+      parenttree.children.add(extractTree(objects[i]));
+    }
+    return root;
+  }
+
+  /**
+   * 
+   * Recursively extracts an AoI object tree and creates our own ParsedTree representation.
+   * 
+   */
+  // is locked  version
+  /*
+  public ParsedTree extractTree(ObjectInfo parent) throws ParseException {
+
+    // Try converting the object before parsing
+    convertObject(parent);
+
+    // Parse this ObjectInfo
+    ParsedTree root = null;
     try {
       root = org.reprap.artofillusion.parser.MetaCADParser.parseTree(parent.name + ";");
       root.aoiobj = parent;
@@ -132,6 +175,7 @@
     }
     return root;
   }
+  */
 
   /**
    * Evaluates selected objects
@@ -173,7 +217,7 @@
     if (parent.name.startsWith("Cube ") && parent.object instanceof Cube) {
       Vec3 size = ((Cube)parent.object).getBounds().getSize();
       
-      String name = coordSysToString(parent.getCoords());
+      String name = evaluateMePrefix + coordSysToString(parent.getCoords());
       name += "cube(" + 
               String.format("%.2f", size.x) + "," +
               String.format("%.2f", size.y) + "," +
@@ -185,7 +229,7 @@
       Cylinder c = (Cylinder)parent.object;
       Vec3 size = c.getBounds().getSize();
       
-      String name = coordSysToString(parent.getCoords());
+      String name = evaluateMePrefix + coordSysToString(parent.getCoords());
       name += "cylinder("+
               String.format("%.2f", size.y)+","+
               String.format("%.2f", size.x/2)+","+
@@ -197,7 +241,7 @@
     else if (parent.name.startsWith("Sphere ") && parent.object instanceof Sphere) {
       Vec3 size = ((Sphere)parent.object).getRadii();
       
-      String name = coordSysToString(parent.getCoords());
+      String name = evaluateMePrefix + coordSysToString(parent.getCoords());
       name += "sphere("+
               String.format("%.2f", size.x)+","+
               String.format("%.2f", size.y)+","+

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-13 14:39:15 UTC (rev 2979)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-13 20:45:54 UTC (rev 2980)
@@ -25,7 +25,38 @@
     this.parameters =  new ArrayList<String>();
     this.children = new ArrayList<ParsedTree>();
   }
+  
+  // experimental version without locked check
+  public List<ObjectInfo> evaluate(MetaCADContext ctx) throws Exception {
 
+    this.cadobj = ObjFactory.create(ctx, this.name);
+
+    // FIXME: If we're native, we can probably skip the evaluation
+    
+    List<ObjectInfo> result = this.cadobj.evaluateObject(ctx, this.parameters, this.children);
+    
+    //must have been a  native object
+    if (result == null) {
+      result = new LinkedList<ObjectInfo>();
+      // duplicate native object to prevent accumulating cs
+      result.add(this.aoiobj.duplicate());
+    }
+    else if (result.size() == 0) {
+      updateAOI(ObjectHelper.getErrorObject());
+    }
+    else if (result.size() == 1) {
+      updateAOI(result.get(0));
+    }
+    else {
+     ObjectInfo collection = new ObjectInfo(new MetaCADObjectCollection(result), new CoordinateSystem(), "dummy");
+     updateAOI(collection);
+//      updateAOI(ObjectHelper.join(result, 0.1));
+    }
+    return result;
+  }
+
+  // this is the isLocked version - wasnot so nice to use
+  /*
   public List<ObjectInfo> evaluate(MetaCADContext ctx) throws Exception {
 
     try {
@@ -62,6 +93,7 @@
     }
     return result;
   }
+  */
 
   public static List<ObjectInfo> evaluate(MetaCADContext ctx, List<ParsedTree> children) throws Exception {
     if (children.size() == 0) return null;
@@ -89,7 +121,7 @@
         this.aoiobj.object.setTexture(tex, map);
       }
       this.aoiobj.setVisible(true);
-      this.aoiobj.setLocked(true); // Indicate that this object is a MetaCAD evaluated object
+      //this.aoiobj.setLocked(true); // Indicate that this object is a MetaCAD evaluated object
       this.aoiobj.clearCachedMeshes();
     }
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2981
          http://reprap.svn.sourceforge.net/reprap/?rev=2981&view=rev
Author:   wizard23
Date:     2009-05-13 21:57:23 +0000 (Wed, 13 May 2009)

Log Message:
-----------
fixed buttons that were broken after the "=" change

Modified Paths:
--------------
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
    trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 20:45:54 UTC (rev 2980)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/MetaCADEvaluatorEngine.java	2009-05-13 21:57:23 UTC (rev 2981)
@@ -106,10 +106,9 @@
     // Parse this ObjectInfo
     ParsedTree root = null;
     
-    String name =  parent.name.trim();
-    if (name.startsWith(evaluateMePrefix))
+    String name =  removeEvaluationPrefix(parent.name);
+    if (name != null)
     {
-      name = name.substring(evaluateMePrefix.length());
       root = org.reprap.artofillusion.parser.MetaCADParser.parseTree(name + ";");
       root.aoiobj = parent;
     }
@@ -217,36 +216,36 @@
     if (parent.name.startsWith("Cube ") && parent.object instanceof Cube) {
       Vec3 size = ((Cube)parent.object).getBounds().getSize();
       
-      String name = evaluateMePrefix + coordSysToString(parent.getCoords());
+      String name = coordSysToString(parent.getCoords());
       name += "cube(" + 
               String.format("%.2f", size.x) + "," +
               String.format("%.2f", size.y) + "," +
               String.format("%.2f", size.z) + ")";
-      parent.setName(name);
+      parent.setName(evaluateMePrefix + name);
       return true;
     }
     else if (parent.name.startsWith("Cylinder ") && parent.object instanceof Cylinder) {
       Cylinder c = (Cylinder)parent.object;
       Vec3 size = c.getBounds().getSize();
       
-      String name = evaluateMePrefix + coordSysToString(parent.getCoords());
+      String name = coordSysToString(parent.getCoords());
       name += "cylinder("+
               String.format("%.2f", size.y)+","+
               String.format("%.2f", size.x/2)+","+
               String.format("%.2f", size.z/2)+","+
               String.format("%.2f", c.getRatio())+")";
-      parent.setName(name);
+      parent.setName(evaluateMePrefix + name);
       return true;
     }
     else if (parent.name.startsWith("Sphere ") && parent.object instanceof Sphere) {
       Vec3 size = ((Sphere)parent.object).getRadii();
       
-      String name = evaluateMePrefix + coordSysToString(parent.getCoords());
+      String name = coordSysToString(parent.getCoords());
       name += "sphere("+
               String.format("%.2f", size.x)+","+
               String.format("%.2f", size.y)+","+
               String.format("%.2f", size.z)+")";
-      parent.setName(name);
+      parent.setName(evaluateMePrefix + name);
       return true;
     }
     return false;
@@ -304,7 +303,7 @@
   public ObjectInfo createObjectFromString(String defstr) throws Exception
   {
     Scene theScene = this.window.getScene();
-    ObjectInfo objInfo = new ObjectInfo(new Sphere(1,1,1), new CoordinateSystem(), defstr);
+    ObjectInfo objInfo = new ObjectInfo(new Sphere(1,1,1), new CoordinateSystem(), addEvaluationPrefix(defstr));
     this.window.addObject(objInfo, null);
     this.window.setSelection(theScene.getNumObjects()-1);
     evaluate();
@@ -326,7 +325,7 @@
 
     ObjectInfo resultinfo;
     try {
-      resultinfo = new ObjectInfo(new Sphere(1,1,1), new CoordinateSystem(), defstr);
+      resultinfo = new ObjectInfo(new Sphere(1,1,1), new CoordinateSystem(), addEvaluationPrefix(defstr));
       
       // Inherit texture color from the first source object
       Object3D inheritfrom = objects[0].getObject();
@@ -521,8 +520,13 @@
     for (i = 0; i < indent; i++)
       sb.append(' ');
     
-    sb.append(objInfo.name);
+    String name = removeEvaluationPrefix(objInfo.name);
     
+    if (name != null)
+      sb.append(name);
+    else
+      sb.append("/* unconvertable native object object */");
+    
     if (objInfo.children.length > 0)
     {
       sb.append(" {\n");
@@ -544,4 +548,19 @@
   {
     this.parameterListeners.add(listener);
   }
+  
+  protected String removeEvaluationPrefix(String objInfoName)
+  {
+    objInfoName = objInfoName.trim();
+    if (objInfoName.startsWith(evaluateMePrefix))
+    {
+      return objInfoName.substring(evaluateMePrefix.length());
+    }
+    return null;
+  }
+  
+  protected String addEvaluationPrefix(String objInfoName)
+  {
+    return evaluateMePrefix + objInfoName;
+  }
 }

Modified: trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
===================================================================
--- trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-13 20:45:54 UTC (rev 2980)
+++ trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java	2009-05-13 21:57:23 UTC (rev 2981)
@@ -39,7 +39,9 @@
     if (result == null) {
       result = new LinkedList<ObjectInfo>();
       // duplicate native object to prevent accumulating cs
-      result.add(this.aoiobj.duplicate());
+      ObjectInfo objInfo = this.aoiobj.duplicate();
+      objInfo.setVisible(true);
+      result.add(objInfo);
     }
     else if (result.size() == 0) {
       updateAOI(ObjectHelper.getErrorObject());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.