Luis Fraguada 5 jaren geleden
bovenliggende
commit
c0c9b04af7
2 gewijzigde bestanden met toevoegingen van 15 en 27 verwijderingen
  1. 10 21
      examples/jsm/loaders/3DMLoader.js
  2. 5 6
      examples/webgl_loader_3dm.html

+ 10 - 21
examples/jsm/loaders/3DMLoader.js

@@ -149,11 +149,11 @@ Rhino3dmLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 		let loader = new BufferGeometryLoader();
 		console.log(geometryData);
 
-		for(var i = 0; i < geometryData.length; i++){
+		for( var i = 0; i < geometryData.length; i++ ){
 
 			var geometry = loader.parse( geometryData[i] );
 
-			geometries.push(geometry);
+			geometries.push( geometry );
 
 		}
 		
@@ -328,34 +328,23 @@ Rhino3dmLoader.Rhino3dmWorker = function () {
 				break;
 
 			case 'decode':
-				// console.log(message);
-				var buffer = message.buffer;
-				libraryPending.then( () => { 
-
-					// TODO
-					var sphere = new rhino.Sphere([0,0,0], 10);
-					console.log(sphere.radius);
-
 
+				var buffer = message.buffer;
+				libraryPending.then( () => {
 
 					var arr = new Uint8Array(buffer);
 					var doc = rhino.File3dm.fromByteArray(arr);
-					console.log(doc);
 
 					var objects = doc.objects();
 					var geometryList = [];
-					var geometry;
 					
-					for (var i = 0; i < objects.count; i++) {
+					for ( var i = 0; i < objects.count; i++ ) {
 						var obj = objects.get(i).geometry();
-						if(obj instanceof rhino.Mesh) {
-							// convert all meshes in 3dm model into threejs objects
-							
-							geometry = obj.toThreejsJSON();
-							geometryList.push(geometry);
-							
-							
-							
+						if( obj instanceof rhino.Mesh ) {
+
+							var geometry = obj.toThreejsJSON();
+							geometryList.push( geometry );
+
 						}
 
 						/*

+ 5 - 6
examples/webgl_loader_3dm.html

@@ -46,14 +46,13 @@
 				
 				loader.load( 'models/3dm/hello_mesh.3dm', function ( objects ) {
 
-					console.log('onLoad');
-					console.log(objects);
-
-					// they need materials
+					// TODO: return an object 3d
 
 					var material = new THREE.MeshNormalMaterial();
-					for(var i = 0; i < objects.length; i++) {
-						var mesh = new THREE.Mesh(objects[i], material);
+
+					for( var i = 0; i < objects.length; i++ ) {
+
+						var mesh = new THREE.Mesh( objects[i], material );
 						scene.add( mesh );
 					}