Merge branch 'master' of https://github.com/opensourceBIM/BIMsurfer.git

opensourceBIM · Jan 11, 2016 · 7eddb18 · 7eddb18
2 parents c167dae + ac73f03
commit 7eddb18
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 33 deletions.
diff --git a/api/DataInputStream.js b/api/DataInputStream.js
@@ -36,6 +36,15 @@ BIMSURFER.DataInputStreamReader = BIMSURFER.Class({
 		}
 	},
 
+	align8: function() {
+		// Skips to the next alignment of 4 (source should have done the same!)
+		var skip = 8 - (this.pos % 8);
+		if(skip > 0 && skip != 8) {
+//			console.log("Skip", skip);
+			this.pos += skip;
+		}
+	},
+
 	readFloat: function() {
 		var value = this.dataView.getFloat32(this.pos, true);
 		this.pos += 4;
@@ -76,6 +85,12 @@ BIMSURFER.DataInputStreamReader = BIMSURFER.Class({
 		return result;
 	},
 
+	readDoubleArray: function(length) {
+		var result = new Float64Array(this.arrayBuffer, this.pos, length);
+		this.pos += length * 8;
+		return result;
+	},
+
 	readIntArray2: function(length) {
 		var results = [];
 		for (var i=0; i<length; i++) {

diff --git a/api/GeometryLoader.js b/api/GeometryLoader.js
@@ -26,11 +26,11 @@ function GeometryLoader(bimServerApi, models, viewer) {
 	};
 
 	this.readObject = function(data, geometryType) {
-		data.align4();
+		data.align8();
 		if (geometryType == 5) {
 			var roid = data.readLong();
 			var geometryInfoOid = data.readLong();
-			var objectBounds = data.readFloatArray(6);
+			var objectBounds = data.readDoubleArray(6);
 //			if (objectBounds[0] < o.modelBounds.min.x) {
 //				o.modelBounds.min.x = objectBounds[0];
 //			}
@@ -50,7 +50,7 @@ function GeometryLoader(bimServerApi, models, viewer) {
 //				o.modelBounds.max.z = objectBounds[5];
 //			}
 
-			var transformationMatrix = data.readFloatArray(16);
+			var transformationMatrix = data.readDoubleArray(16);
 			var geometryDataOid = data.readLong();
 			var coreIds = [geometryDataOid];
 			o.infoToData[geometryInfoOid] = geometryDataOid;
@@ -108,29 +108,29 @@ function GeometryLoader(bimServerApi, models, viewer) {
 					}
 
 					var flags = {
-							type : "flags",
-							flags : {
-								transparent : hasTransparency
-							},
+						type : "flags",
+						flags : {
+							transparent : hasTransparency
+						},
+						nodes : [{
+							type: "enable",
+							enabled: enabled,
 							nodes : [{
-								type: "enable",
-								enabled: enabled,
+								type : "material",
+								baseColor: material,
+								alpha: material.a,
 								nodes : [{
-									type : "material",
-									baseColor: material,
-									alpha: material.a,
+									type : "name",
+									id : geometryInfoOid,
+									oid: oid,
 									nodes : [{
-										type : "name",
-										id : geometryInfoOid,
-										oid: oid,
-										nodes : [{
-											type: "matrix",
-											elements: transformationMatrix,
-											nodes: coreNodes
-										}]
+										type: "matrix",
+										elements: transformationMatrix,
+										nodes: coreNodes
 									}]
 								}]
 							}]
+						}]
 					};
 
 					o.modelNode.addNode(flags);
@@ -335,9 +335,9 @@ function GeometryLoader(bimServerApi, models, viewer) {
 		} else {
 			o.state.version = version;
 		}
-		data.align4();
+		data.align8();
 
-		var modelBounds = data.readFloatArray(6);
+		var modelBounds = data.readDoubleArray(6);
 		o.modelBounds = {
 			min: {x: modelBounds[0], y: modelBounds[1], z: modelBounds[2]},
 			max: {x: modelBounds[3], y: modelBounds[4], z: modelBounds[5]}
@@ -450,14 +450,6 @@ function GeometryLoader(bimServerApi, models, viewer) {
 		o.options = {type: "oids", roids: roids, oids: oids};
 	}
 
-	this.afterRegistration = function(topicId) {
-		o.bimServerApi.call("Bimsie1NotificationRegistryInterface", "getProgress", {
-			topicId: o.topicId
-		}, function(state){
-			o.progressHandler(o.topicId, state);
-		});
-	}
-
 	this.start = function(){
 		if (o.options != null) {
 			if (o.options.type == "types") {
@@ -478,7 +470,7 @@ function GeometryLoader(bimServerApi, models, viewer) {
 						deep: false
 					}, function(topicId){
 						o.topicId = topicId;
-						o.bimServerApi.registerProgressHandler(o.topicId, o.progressHandler, o.afterRegistration);
+						o.bimServerApi.registerProgressHandler(o.topicId, o.progressHandler);
 					});
 				});
 			} else if (o.options.type == "revision") {
@@ -492,7 +484,7 @@ function GeometryLoader(bimServerApi, models, viewer) {
 						showOwn: true
 					}, function(topicId){
 						o.topicId = topicId;
-						o.bimServerApi.registerProgressHandler(o.topicId, o.progressHandler, o.afterRegistration);
+						o.bimServerApi.registerProgressHandler(o.topicId, o.progressHandler);
 					});
 				});
 			} else if (o.options.type == "oids") {
@@ -525,7 +517,7 @@ function GeometryLoader(bimServerApi, models, viewer) {
 						query: JSON.stringify(query)
 					}, function(topicId){
 						o.topicId = topicId;
-						o.bimServerApi.registerProgressHandler(o.topicId, o.progressHandler, o.afterRegistration);
+						o.bimServerApi.registerProgressHandler(o.topicId, o.progressHandler);
 					});
 				});
 			}