update to BIMserver 1.4.0-FINAL, cleanup

Author: hlg

ServerPlugin/plugin/plugin.xml

@@ -2,6 +2,7 @@
 <PluginDescriptor>
 	<PluginImplementation>
 		<interfaceClass>org.bimserver.plugins.serializers.SerializerPlugin</interfaceClass>
-		<implementationClass>org.bimserver.serializers.json.JSONModelFormat2SerializerPlugin</implementationClass>
+		<implementationClass>org.bimserver.serializers.json.ThreeJsSerializerPlugin</implementationClass>
+		<enabled>true</enabled>
 	</PluginImplementation>
-</PluginDescriptor>
+</PluginDescriptor>

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

@@ -3,35 +3,38 @@
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.bimserver.emf.IdEObject;
 import org.bimserver.emf.IfcModelInterface;
-import org.bimserver.models.ifc2x3tc1.GeometryData;
-import org.bimserver.models.ifc2x3tc1.GeometryInfo;
+import org.bimserver.emf.PackageMetaData;
+import org.bimserver.models.geometry.GeometryData;
+import org.bimserver.models.geometry.GeometryInfo;
 import org.bimserver.models.ifc2x3tc1.IfcColumn;
 import org.bimserver.models.ifc2x3tc1.IfcDoor;
 import org.bimserver.models.ifc2x3tc1.IfcProduct;
 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.plugins.PluginManager;
 import org.bimserver.plugins.renderengine.RenderEnginePlugin;
 import org.bimserver.plugins.serializers.EmfSerializer;
+import org.bimserver.plugins.serializers.ProgressReporter;
 import org.bimserver.plugins.serializers.ProjectInfo;
 import org.bimserver.plugins.serializers.SerializerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class JSONModelFormat2Serializer extends EmfSerializer {
+public class ThreeJsSerializer extends EmfSerializer {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JSONModelFormat2Serializer.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ThreeJsSerializer.class);
 	private PrintWriter out;
 
-	public void init(IfcModelInterface model, ProjectInfo projectInfo, PluginManager pluginManager, RenderEnginePlugin renderEnginePlugin, boolean oids) throws SerializerException {
-		super.init(model, projectInfo, pluginManager, renderEnginePlugin, false);
+	public void init(IfcModelInterface model, ProjectInfo projectInfo, PluginManager pluginManager, RenderEnginePlugin renderEnginePlugin, PackageMetaData packageMetaData, boolean oids) throws SerializerException {
+		super.init(model, projectInfo, pluginManager, renderEnginePlugin, packageMetaData, false);
 	}
 
 	@Override
@@ -40,7 +43,7 @@ public void reset() {
 	}
 
 	@Override
-	public boolean write(OutputStream outputStream) throws SerializerException {
+	protected boolean write(OutputStream outputStream, ProgressReporter progressReporter) {
 		if (getMode() == Mode.BODY) {
 			out = new PrintWriter(outputStream);
 			out.println("[");
@@ -56,15 +59,15 @@ public boolean write(OutputStream outputStream) throws SerializerException {
 		}
 	}
 
-	private void writeGeometry(SetGeometryResult geometry, IfcRoot ifcRoot) {
+	private void writeGeometry(GeometryData geometryData, IfcRoot ifcRoot) {
 		out.println("  \"id\" : \"" + ifcRoot.getGlobalId() + "\", ");
 		out.println("  \"type\" : \"" + ifcRoot.eClass().getName().toUpperCase() + "\", ");
 		out.println("  \"geometry\" : {");
 		out.println("   \"metadata\" : { \"formatVersion\" : 3 }, ");
 		out.println("	\"materials\": [],");
 		out.print("	\"vertices\": [ ");
 
-		List<Float> vertices = geometry.getBinaryVertexBuffer().getVertices();
+		List<Float> vertices = getFloatList(geometryData.getVertices());
 		if (vertices != null && vertices.size() > 0) {
 			for (int i = 0; i < vertices.size(); i++) {
 				out.print(i == 0 ? "" : ",");
@@ -76,7 +79,7 @@ private void writeGeometry(SetGeometryResult geometry, IfcRoot ifcRoot) {
 		out.println("	], ");
 		out.print("	\"normals\":  [");
 
-		List<Float> normals = geometry.getBinaryVertexBuffer().getNormals();
+		List<Float> normals = getFloatList(geometryData.getNormals());
 		if (normals != null && normals.size() > 0) {
 			for (int i = 0; i < normals.size(); i++) {
 				out.print(i == 0 ? "" : ",");
@@ -90,7 +93,7 @@ private void writeGeometry(SetGeometryResult geometry, IfcRoot ifcRoot) {
 		out.println("	\"uvs\":	  [ ],");
 		out.print("	\"faces\": [ ");
 
-		List<Integer> indices = geometry.getBinaryIndexBuffer().getIndices();
+		List<Integer> indices = getIntegerList(geometryData.getIndices());
 		if (indices != null && indices.size() > 0) {
 			for (int i = 0; i < indices.size(); i += 3) {
 				out.print(i == 0 ? "" : ",");
@@ -107,52 +110,45 @@ private void writeGeometry(SetGeometryResult geometry, IfcRoot ifcRoot) {
 
 	@SuppressWarnings("unchecked")
 	private void writeGeometries() {
-		// Class[] eClasses = new Class[] { IfcSlab.class, IfcRoof.class,
-		// IfcWall.class, IfcWallStandardCase.class, IfcWindow.class,
-		// IfcDoor.class, IfcColumn.class, IfcRamp.class,
-		// IfcStair.class, IfcStairFlight.class, IfcRailing.class };
-		Class<IdEObject>[] eClasses = new Class[] { IfcWallStandardCase.class, IfcWall.class, IfcWindow.class, IfcDoor.class, IfcSlab.class, IfcColumn.class };
-
-		try {
-			boolean first = true;
-			for (Class<? extends IdEObject> eClass : eClasses) {
-				for (IdEObject object : model.getAll(eClass)) {
-                    IfcProduct ifcRoot = (IfcProduct) object;
-					SetGeometryResult geometry = getGeometry(ifcRoot);
-					if (geometry != null) {
-						out.println(first ? "  {" : " ,{");
-						first = false;
-						writeGeometry(geometry, ifcRoot);
-						out.print("  }");
-					}
-				}
-			}
-		} catch (SerializerException e) {
-			LOGGER.error("", e);
-		}
+		Class<IdEObject>[] eClasses = new Class[] {
+				IfcWall.class, IfcWindow.class, IfcDoor.class, IfcSlab.class, IfcColumn.class,
+				org.bimserver.models.ifc4.IfcWall.class,org.bimserver.models.ifc4.IfcWindow.class,
+				org.bimserver.models.ifc4.IfcDoor.class, org.bimserver.models.ifc4.IfcSlab.class,
+				org.bimserver.models.ifc4.IfcColumn.class
+		};
+
+		boolean first = true;
+		for (Class<? extends IdEObject> eClass : eClasses) {
+            for (IdEObject object : model.getAllWithSubTypes(eClass)) {
+				IfcProduct ifcRoot = (IfcProduct) object;
+                GeometryInfo geometryInfo = ifcRoot.getGeometry();
+                if (geometryInfo != null) {
+                    out.println(first ? "  {" : " ,{");
+                    first = false;
+                    writeGeometry(geometryInfo.getData(), ifcRoot);
+                    out.print("  }");
+                }
+            }
+        }
 	}
 
-	private SetGeometryResult getGeometry(IfcProduct ifcRootObject) throws SerializerException {
-		GeometryInfo geometryInfo = ifcRootObject.getGeometry();
-		if (geometryInfo != null) {
-			GeometryData geometryData = geometryInfo.getData();
-			ByteBuffer verticesBuffer = ByteBuffer.wrap(geometryData.getVertices());
-			ByteBuffer normalsBuffer = ByteBuffer.wrap(geometryData.getNormals());
-			
-			int t = geometryInfo.getPrimitiveCount() * 3 * 3;
-			
-			BinaryIndexBuffer binaryIndexBuffer = new BinaryIndexBuffer();
-			BinaryVertexBuffer binaryVertexBuffer = new BinaryVertexBuffer();
-			
-			for (int i = 0; i < t; i++) {
-				binaryVertexBuffer.addVertex(verticesBuffer.getFloat());
-				binaryVertexBuffer.addNormal(normalsBuffer.getFloat());
-			}
-			for (int i = 0; i < geometryInfo.getPrimitiveCount() * 3; i++) {
-				binaryIndexBuffer.addIndex(i);
-			}
-			return new SetGeometryResult(geometryInfo.getPrimitiveCount() * 3, geometryInfo.getData().getVertices().length, binaryIndexBuffer, binaryVertexBuffer);
+	private List<Float> getFloatList(byte[] byteArray) {
+		ByteBuffer byteBuffer = ByteBuffer.wrap(byteArray);
+		byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
+		List<Float> floatList = new ArrayList<Float>();
+		while(byteBuffer.hasRemaining()){
+            floatList.add(byteBuffer.getFloat());
+        }
+		return floatList;
+	}
+	private List<Integer> getIntegerList(byte[] byteArray) {
+		ByteBuffer byteBuffer = ByteBuffer.wrap(byteArray);
+		byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
+		List<Integer> integerList = new ArrayList<Integer>();
+		while(byteBuffer.hasRemaining()){
+			integerList.add(byteBuffer.getInt());
 		}
-		return null;
+		return integerList;
 	}
+
 }

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

@@ -1,29 +1,37 @@
 package org.bimserver.serializers.json;
 
+import org.bimserver.emf.Schema;
 import org.bimserver.models.store.ObjectDefinition;
 import org.bimserver.plugins.PluginConfiguration;
 import org.bimserver.plugins.PluginException;
 import org.bimserver.plugins.PluginManager;
 import org.bimserver.plugins.serializers.AbstractSerializerPlugin;
 import org.bimserver.plugins.serializers.Serializer;
 
-public class JSONModelFormat2SerializerPlugin extends AbstractSerializerPlugin {
+import java.util.Set;
+
+public class ThreeJsSerializerPlugin extends AbstractSerializerPlugin {
 
 	private boolean initialized = false;
 
 	@Override
 	public Serializer createSerializer(PluginConfiguration pluginConfiguration) {
-		return new JSONModelFormat2Serializer();
+		return new ThreeJsSerializer();
 	}
 
     @Override
     public boolean needsGeometry() {
         return true;
     }
 
+    @Override
+    public Set<Schema> getSupportedSchemas() {
+        return Schema.asSet(Schema.IFC2X3TC1, Schema.IFC4);
+    }
+
     @Override
 	public String getDescription() {
-		return "JSONModelFormat2Serializer"; // TODO: better names and descriptions
+		return "serializer for three.js json geometry";
 	}
 
     @Override
@@ -38,7 +46,6 @@ public ObjectDefinition getSettingsDefinition() {
 
     @Override
 	public void init(PluginManager pluginManager) throws PluginException {
-		pluginManager.requireSchemaDefinition();
 		initialized = true;
 	}