From 92876d839e33f034b151f621e09d2a798d669716 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Mon, 15 Dec 2014 01:19:52 +0100 Subject: [PATCH] Fixed more envMap breakage. --- examples/js/loaders/MTLLoader.js | 2 +- examples/js/loaders/SceneLoader.js | 7 +++++-- src/renderers/webgl/WebGLProgram.js | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/js/loaders/MTLLoader.js b/examples/js/loaders/MTLLoader.js index d9b6dcfc9f..dd8207b8cf 100644 --- a/examples/js/loaders/MTLLoader.js +++ b/examples/js/loaders/MTLLoader.js @@ -387,7 +387,7 @@ THREE.MTLLoader.MaterialCreator.prototype = { } - texture.mapping = mapping; + if ( mapping !== undefined ) texture.mapping = mapping; return texture; diff --git a/examples/js/loaders/SceneLoader.js b/examples/js/loaders/SceneLoader.js index b3033a12c3..71fb148764 100644 --- a/examples/js/loaders/SceneLoader.js +++ b/examples/js/loaders/SceneLoader.js @@ -937,7 +937,9 @@ THREE.SceneLoader.prototype = { if ( loader !== null ) { texture = loader.load( url_array, generateTextureCallback( count ) ); - texture.mapping = textureJSON.mapping; + + if ( textureJSON.mapping !== undefined ) + texture.mapping = textureJSON.mapping; } else { @@ -977,7 +979,8 @@ THREE.SceneLoader.prototype = { } - texture.mapping = textureJSON.mapping; + if ( textureJSON.mapping !== undefined ) + texture.mapping = textureJSON.mapping; if ( THREE[ textureJSON.minFilter ] !== undefined ) texture.minFilter = THREE[ textureJSON.minFilter ]; diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js index 449a7acf31..a1e2b77382 100644 --- a/src/renderers/webgl/WebGLProgram.js +++ b/src/renderers/webgl/WebGLProgram.js @@ -104,8 +104,7 @@ THREE.WebGLProgram = ( function () { envMapTypeDefine = "ENVMAP_TYPE_SPHERE"; break; - case THREE.UVMapping: - console.warn( 'THREE.WebGLProgram: envMap.mapping shouldn\'t be THREE.UVMapping. Using THREE.CubeReflectionMapping instead.') + default: envMapTypeDefine = "ENVMAP_TYPE_CUBE"; break; -- GitLab