Changeset 1137317
- Timestamp:
- 04/17/2015 03:54:03 PM (11 years ago)
- Location:
- 3d-model-viewer/trunk
- Files:
-
- 2 edited
-
3d-model-viewer.php (modified) (1 diff)
-
js/3d-model-viewer.js (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
3d-model-viewer/trunk/3d-model-viewer.php
r1137308 r1137317 36 36 return array_merge($mimes,array ( 37 37 'dae' => 'model/vnd.collada+xml', 38 'objmtl' => 'text/plain', 38 39 'obj' => 'text/plain', 39 'mtl' => 'text/plain',40 'mtl' => 'text/plain', 40 41 )); 41 42 } -
3d-model-viewer/trunk/js/3d-model-viewer.js
r1137308 r1137317 50 50 else if (this.endsWith(model, '.obj')) 51 51 this.loadOBJ(model, options); 52 else if (this.endsWith(model, '.objmtl')) 53 this.loadOBJMTL(model, options); 52 54 53 55 dirty = true; … … 59 61 60 62 this.loadDAE = function(model, options) { 63 console.log('loading DAE'); 61 64 var loader = new THREE.ColladaLoader(); 62 65 loader.options.convertUpAxis = true; … … 74 77 this.loadOBJ = function(model, options) { 75 78 console.log('loading OBJ'); 79 var loader = new THREE.OBJLoader(); 80 var loadScene = this.scene; 81 loader.load( model, function ( object ) { 82 object.position.set(options.modelPosition[0],options.modelPosition[1],options.modelPosition[2]);//x,z,y- if you think in blender dimensions ;) 83 object.scale.set(options.modelScale[0],options.modelScale[1],options.modelScale[2]); 84 loadScene.add( object ); 85 }); 86 } 87 88 this.loadOBJMTL = function(model, options) { 89 console.log('loading OBJMTL'); 76 90 var loader = new THREE.OBJMTLLoader(); 77 mtl = model.substring(0, model.length- 3) + 'mtl';91 mtl = model.substring(0, model.length-6) + 'mtl'; 78 92 var loadScene = this.scene; 79 93 loader.load( model, mtl, function ( object ) {
Note: See TracChangeset
for help on using the changeset viewer.