diff --git a/tabs/setup.js b/tabs/setup.js index 62caa2ed..6bafec53 100755 --- a/tabs/setup.js +++ b/tabs/setup.js @@ -258,16 +258,13 @@ TABS.setup.initialize3D = function () { // setup scene scene = new THREE.Scene(); - - loader = new THREE.JSONLoader(); - loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) { - var modelMaterial = new THREE.MeshFaceMaterial(materials); - model = new THREE.Mesh(geometry, modelMaterial); - + const manager = new THREE.LoadingManager(); + loader = new THREE.GLTFLoader(manager); + loader.load('./resources/models/' + model_file + '.gltf', (obj) =>{ + model = obj.scene; model.scale.set(15, 15, 15); - - modelWrapper.add(model); - scene.add(modelWrapper); + //modelWrapper.add(obj); + scene.add(model); }); // stationary camera