Jan Eriks changes to server side code

Author: hlg

ServerPlugin/EmfSerializerFactory.java

@@ -125,14 +125,6 @@ public void initSerializers() {
 				enabled.add(upperCase);
 			}
 		}
-		register(new ResultType("JSON_MODEL_FORMAT_2", "JSON Model Formal 2.0", "js", "appliction/collada", UseInCheckout.USE_NOT_IN_CHECKOUT, UserType.USER_TYPE, Type.MULTIPLE, DefaultSelected.FALSE, enabled.contains("JSON_MODEL_FORMAT_2")), new EmfSerializerCreator() {
-			@Override
-			public EmfSerializer create(Project project, User user, IfcModel model, String fileName) throws SerializerException {
-				JSONModelFormat2Serializer jsonModelFormat2Serializer = new JSONModelFormat2Serializer();				
-				jsonModelFormat2Serializer.init(project, user, fileName, model, fieldIgnoreMap, schemaDefinition, ifcEngineFactory);
-				return jsonModelFormat2Serializer;
-			}
-		});
 		register(new ResultType("IFC", "IFC2x3", "ifc", "application/ifc", UseInCheckout.USE_IN_CHECKOUT, UserType.USER_TYPE, Type.MULTIPLE, DefaultSelected.TRUE, enabled.contains("IFC")), new EmfSerializerCreator(){
 			@Override
 			public EmfSerializer create(Project project, User user, IfcModel model, String fileName) {
@@ -189,6 +181,15 @@ public EmfSerializer create(Project project, User user, IfcModel model, String f
 				return o3dJsonSerializer;
 			}
 		});
+		register(new ResultType("THREEJS", "Three.js viewer", "js", "application/json", UseInCheckout.USE_NOT_IN_CHECKOUT, UserType.USER_TYPE, Type.MULTIPLE, DefaultSelected.FALSE, enabled.contains("THREEJS")), new EmfSerializerCreator() {
+			@Override
+			public EmfSerializer create(Project project, User user, IfcModel model, String fileName) throws SerializerException {
+				//fileName = "wall.js";
+				JSONModelFormat2Serializer JsonModelFormat2Serializer = new JSONModelFormat2Serializer();
+				JsonModelFormat2Serializer.init(project, user, fileName, model, fieldIgnoreMap, schemaDefinition, ifcEngineFactory);
+				return JsonModelFormat2Serializer;
+			}
+		});
 		register(new ResultType("OBJECT_INFO", "Object Info", "html", "text/html", UseInCheckout.USE_NOT_IN_CHECKOUT, UserType.USER_TYPE, Type.SINGLE, DefaultSelected.FALSE, enabled.contains("OBJECT_INFO")), new EmfSerializerCreator() {
 			@Override
 			public EmfSerializer create(Project project, User user, IfcModel model, String fileName) {

ServerPlugin/JSONModelFormat2Serializer.java

@@ -81,10 +81,11 @@ public boolean write(OutputStream outputStream) throws SerializerException {
 			PrintWriter out = new PrintWriter(outputStream);
 			out.println("var model = [");
 
-			for(SetGeometryResult geometry : geometries) {
-				out.println("{");
+			for(int i=0; i<geometries.size(); i++) {
+				SetGeometryResult geometry = geometries.get(i);
+				out.println(i == 0 ? "{": ",{");
 				writeGeometry(out, geometry);
-				out.println("},");
+				out.println("}");
 			}
 
 			out.println("");
@@ -103,14 +104,10 @@ public boolean write(OutputStream outputStream) throws SerializerException {
 
 	private void writeGeometry(PrintWriter out, SetGeometryResult geometry) {
 		out.println("id : '" + geometry.getGuid() +  "', ");
+		out.println("type : '" + geometry.getEntityType() +  "', ");
 		out.println("geometry : {");
 		out.println(" 'version' : 2, ");
-		out.println("  'materials': [ {" +
-		        		"\"DbgColor\" : 0xeeeeee," +
-		        		"\"DbgIndex\" : 0," + 
-		        		"\"DbgName\" : \"dummy\"," +
-		        		"\"colorDiffuse\" : [ 1, 0, 0 ]" + 
-		    		"} ],");
+		out.println("  'materials': [],");
 		out.print("  'vertices': [ ");
 
 		List<Float> vertices = geometry.getBinaryVertexBuffer().getVertices();
@@ -213,19 +210,14 @@ private List<SetGeometryResult> getGeometries() {
 		List<SetGeometryResult> geometryList = new ArrayList<SetGeometryResult>();
 		//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[] eClasses = new Class[] { IfcWallStandardCase.class, IfcWall.class, IfcWindow.class, IfcDoor.class };
+		Class[] eClasses = new Class[] { IfcWallStandardCase.class, IfcWall.class, IfcWindow.class, IfcDoor.class, IfcSlab.class, IfcColumn.class };
 
 		try {
 			for (Class<? extends EObject> eClass : eClasses) {
-				int i=0;
 				for (Object object : model.getAll(eClass)) {
-					i++;
-		//			if (i < 2) { continue; }
 					IfcRoot ifcRoot = (IfcRoot) object;
 					SetGeometryResult geometry = getGeometry(ifcRoot);
-					if (geometry != null) { geometryList.add(geometry); }
-			//		if (i == 13) { break; }
-					
+					if (geometry != null) { geometryList.add(geometry); }					
 				}
 			}
 		}  catch (SerializerException e) {
@@ -269,8 +261,9 @@ private SetGeometryResult getGeometry(IdEObject ifcRootObject) throws Serializer
 					binaryVertexBuffer.addNormal(geometry.getNormal(i + 1));
 					binaryVertexBuffer.addNormal(geometry.getNormal(i + 2));
 				}
-				String guid = Long.toString(ifcRootObject.getOid()); // TODO
-				return new SetGeometryResult(guid, nrIndices * 3, geometry.getNrVertices(), binaryIndexBuffer, binaryVertexBuffer);
+				String guid =  ((IfcRoot)ifcRootObject).getGlobalId().getWrappedValue(); // "TODO" + Long.toString(ifcRootObject.getOid()); // TODO
+				String entityType = ifcRootObject.eClass().getName().toUpperCase();
+				return new SetGeometryResult(entityType, guid, nrIndices * 3, geometry.getNrVertices(), binaryIndexBuffer, binaryVertexBuffer);
 			}
 		} finally {
 			model.close();
@@ -279,4 +272,4 @@ private SetGeometryResult getGeometry(IdEObject ifcRootObject) throws Serializer
 	}
 
 
-}
+}

ServerPlugin/SetGeometryResult.java

@@ -0,0 +1,49 @@
+package ServerPlugin;
+
+public class SetGeometryResult {
+	private final int addedIndices;
+	private final int addedVertices;
+	private final BinaryIndexBuffer binaryIndexBuffer;
+	private final BinaryVertexBuffer binaryVertexBuffer;
+	private final String guid;
+	private final String entityType;
+	
+	
+	public SetGeometryResult(String entityType, String guid, int addedIndices, int addedVertices, BinaryIndexBuffer binaryIndexBuffer, BinaryVertexBuffer binaryVertexBuffer) {
+		this.entityType = entityType;
+		this.guid = guid;
+		this.addedIndices = addedIndices;
+		this.addedVertices = addedVertices;
+		this.binaryIndexBuffer = binaryIndexBuffer;
+		this.binaryVertexBuffer = binaryVertexBuffer;
+	}
+	
+	public SetGeometryResult(int addedIndices, int addedVertices, BinaryIndexBuffer binaryIndexBuffer, BinaryVertexBuffer binaryVertexBuffer) {
+		this(null, null, addedIndices, addedVertices, binaryIndexBuffer, binaryVertexBuffer);
+	}
+
+	public int getAddedIndices() {
+		return addedIndices;
+	}
+
+	public int getAddedVertices() {
+		return addedVertices;
+	}
+
+	public BinaryIndexBuffer getBinaryIndexBuffer() {
+		return binaryIndexBuffer;
+	}
+
+	public BinaryVertexBuffer getBinaryVertexBuffer() {
+		return binaryVertexBuffer;
+	}	
+	
+	public String getGuid() {
+		return guid;
+	}
+	
+	public String getEntityType() {
+		return entityType;
+	}
+	
+}