[reprap-commits] SF.net SVN: reprap:[2959] trunk/reprap/miscellaneous/AoI/plugins/ CSGEvaluator/src/org/reprap/artofillusion

[<wiz...@us...>]

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.