ant build, update to Bimserver 1.2beta

Author: hlg

ServerPlugin/build.xml

@@ -0,0 +1,33 @@
+<project name="Bimserver ThreeJs Plugin" default="dist" basedir=".">
+    <property name="src" location="src"/>
+    <property name="build" location="build"/>
+    <property name="dist"  location="dist"/>
+    <property file="build.properties"/>
+
+    <target name="init">
+        <tstamp/>
+        <mkdir dir="${build}"/>
+    </target>
+
+    <target name="compile" depends="init">
+        <javac srcdir="${src}" destdir="${build}" debug="true">
+            <classpath>
+            <fileset dir="${bimserverlibraries}">
+                <include name="**/*.jar" />
+            </fileset>
+            </classpath>
+        </javac>
+        <mkdir dir="${build}/plugin"/>
+        <copyfile src="plugin/plugin.xml" dest="${build}/plugin/plugin.xml"/>
+    </target>
+
+    <target name="dist" depends="compile">
+        <mkdir dir="${dist}/lib"/>
+        <jar jarfile="${dist}/lib/threejs-${DSTAMP}-${version}.jar" basedir="${build}"/>
+    </target>
+
+    <target name="clean">
+        <delete dir="${build}"/>
+        <delete dir="${dist}"/>
+    </target>
+</project>

ServerPlugin/sample.build.properties

@@ -0,0 +1,7 @@
+# adjust and save as build.properties
+
+# path to uncompressed Bimserver client lib folder (may contain dependency jars in nested folders)
+bimserverlibraries=
+
+# plugin version, used for the file name only
+version=

ServerPlugin/src/org/bimserver/serializers/json/JSONModelFormat2Serializer.java

@@ -5,15 +5,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.bimserver.emf.IdEObject;
 import org.bimserver.emf.IfcModelInterface;
-import org.bimserver.models.ifc2x3tc1.IfcColumn;
-import org.bimserver.models.ifc2x3tc1.IfcDoor;
-import org.bimserver.models.ifc2x3tc1.IfcRoot;
-import org.bimserver.models.ifc2x3tc1.IfcSlab;
-import org.bimserver.models.ifc2x3tc1.IfcWall;
-import org.bimserver.models.ifc2x3tc1.IfcWallStandardCase;
-import org.bimserver.models.ifc2x3tc1.IfcWindow;
+import org.bimserver.models.ifc2x3tc1.*;
 import org.bimserver.plugins.PluginManager;
 import org.bimserver.plugins.ifcengine.*;
 import org.bimserver.plugins.serializers.EmfSerializer;
@@ -35,8 +28,9 @@ public void init(IfcModelInterface model, ProjectInfo projectInfo, PluginManager
 		super.init(model, projectInfo, pluginManager, ifcEnginPlugin, false);
 		try {
 			IfcEngine ifcEngine = ifcEnginPlugin.createIfcEngine();
+            ifcEngine.init();
             Serializer serializer = getPluginManager().requireIfcStepSerializer();
-			serializer.init(model, getProjectInfo(), getPluginManager(), ifcEnginPlugin, false);
+			serializer.init(model, getProjectInfo(), getPluginManager(), ifcEnginPlugin, true);
 			ifcEngineModel = ifcEngine.openModel(serializer.getBytes());
 			ifcEngineModel.setPostProcessing(true);
 			geometry = ifcEngineModel.finalizeModelling(ifcEngineModel.initializeModelling());
@@ -129,7 +123,7 @@ private void writeGeometries() {
 			boolean first = true;
 			for (Class<? extends EObject> eClass : eClasses) {
 				for (Object object : model.getAll(eClass)) {
-					IfcRoot ifcRoot = (IfcRoot) object;
+                    IfcProduct ifcRoot = (IfcProduct) object;
 					SetGeometryResult geometry = getGeometry(ifcRoot);
 					if (geometry != null) {
 						out.println(first ? "  {" : " ,{");
@@ -146,11 +140,11 @@ private void writeGeometries() {
 		}
 	}
 
-	private SetGeometryResult getGeometry(IdEObject ifcRootObject) throws SerializerException, IfcEngineException {
+	private SetGeometryResult getGeometry(IfcProduct ifcRootObject) throws SerializerException, IfcEngineException {
 		BinaryIndexBuffer binaryIndexBuffer = new BinaryIndexBuffer();
 		BinaryVertexBuffer binaryVertexBuffer = new BinaryVertexBuffer();
 		int nrIndices = 0;
-		IfcEngineInstance instance = ifcEngineModel.getInstanceFromExpressId((int)ifcRootObject.getOid());
+		IfcEngineInstance instance = ifcEngineModel.getInstanceFromExpressId(ifcRootObject.getExpressId());
 		IfcEngineInstanceVisualisationProperties visualisationProperties = instance.getVisualisationProperties();
 		for (int i = visualisationProperties.getStartIndex(); i < visualisationProperties.getPrimitiveCount() * 3 + visualisationProperties.getStartIndex(); i += 3) {
 			binaryIndexBuffer.addIndex(geometry.getIndex(i));

ServerPlugin/src/org/bimserver/serializers/json/JSONModelFormat2SerializerPlugin.java

@@ -1,18 +1,11 @@
 package org.bimserver.serializers.json;
 
 import org.bimserver.models.store.ObjectDefinition;
-import org.bimserver.plugins.Plugin;
 import org.bimserver.plugins.PluginException;
 import org.bimserver.plugins.PluginManager;
-import org.bimserver.plugins.ifcengine.IfcEnginePlugin;
-import org.bimserver.plugins.schema.SchemaPlugin;
 import org.bimserver.plugins.serializers.EmfSerializer;
 import org.bimserver.plugins.serializers.SerializerPlugin;
 
-import java.util.HashSet;
-import java.util.Set;
-
-
 public class JSONModelFormat2SerializerPlugin implements SerializerPlugin {
 
 	private boolean initialized = false;