From d74ae20c3e02808a33f1dd825b1be965446f4936 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 16 Jun 2016 12:18:41 -0700 Subject: [PATCH] Cleaned up loader usage in webvr_vive. --- examples/webvr_vive.html | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/examples/webvr_vive.html b/examples/webvr_vive.html index 3599a0e0e1..c8d93257ca 100755 --- a/examples/webvr_vive.html +++ b/examples/webvr_vive.html @@ -108,21 +108,22 @@ var material = new THREE.MeshStandardMaterial(); - var path = 'models/obj/cerberus/'; var loader = new THREE.OBJLoader(); - loader.load( path + 'Cerberus.obj', function ( group ) { + loader.setPath( 'models/obj/cerberus/' ); + loader.load( 'Cerberus.obj', function ( group ) { // var material = new THREE.MeshBasicMaterial( { wireframe: true } ); var loader = new THREE.TextureLoader(); + loader.setPath( 'models/obj/cerberus/' ); material.roughness = 1; material.metalness = 1; - material.map = loader.load( path + 'Cerberus_A.jpg' ); - material.roughnessMap = loader.load( path + 'Cerberus_R.jpg' ); - material.metalnessMap = loader.load( path + 'Cerberus_M.jpg' ); - material.normalMap = loader.load( path + 'Cerberus_N.jpg' ); + material.map = loader.load( 'Cerberus_A.jpg' ); + material.roughnessMap = loader.load( 'Cerberus_R.jpg' ); + material.metalnessMap = loader.load( 'Cerberus_M.jpg' ); + material.normalMap = loader.load( 'Cerberus_N.jpg' ); material.map.wrapS = THREE.RepeatWrapping; material.roughnessMap.wrapS = THREE.RepeatWrapping; @@ -175,15 +176,16 @@ controller2.standingMatrix = controls.getStandingMatrix(); scene.add( controller2 ); - var vivePath = 'models/obj/vive-controller/'; var loader = new THREE.OBJLoader(); - loader.load( vivePath + 'vr_controller_vive_1_5.obj', function ( object ) { + loader.setPath( 'models/obj/vive-controller/' ); + loader.load( 'vr_controller_vive_1_5.obj', function ( object ) { var loader = new THREE.TextureLoader(); + loader.setPath( 'models/obj/vive-controller/' ); - var controller = object.children[0]; - controller.material.map = loader.load( vivePath + 'onepointfive_texture.png' ); - controller.material.specularMap = loader.load( vivePath + 'onepointfive_spec.png' ); + var controller = object.children[ 0 ]; + controller.material.map = loader.load( 'onepointfive_texture.png' ); + controller.material.specularMap = loader.load( 'onepointfive_spec.png' ); controller1.add( object.clone() ); controller2.add( object.clone() ); -- GitLab