diff --git a/docs/api/textures/CompressedTexture.html b/docs/api/textures/CompressedTexture.html
index 4b4048cbb3950e9d788cb95ff6963c27c8fa0e79..96731125381e742ac4959e74920fea3819eb7a77 100644
--- a/docs/api/textures/CompressedTexture.html
+++ b/docs/api/textures/CompressedTexture.html
@@ -26,7 +26,7 @@
height -- The height of the biggest mipmap
format -- The format used in the mipmaps
type -- The type used in the mipmaps
- mapping -- How the image is applied to the object. An object type of THREE.UVMapping() is the default, where the U,V coordinates are used to apply the map, and a single texture is expected. The other types are THREE.CubeReflectionMapping, for cube maps used as a reflection map; THREE.CubeRefractionMapping, refraction mapping; and THREE.SphericalReflectionMapping, a spherical reflection map projection.
+ mapping -- How the image is applied to the object. An object type of THREE.UVMapping is the default, where the U,V coordinates are used to apply the map, and a single texture is expected. The other types are THREE.CubeReflectionMapping, for cube maps used as a reflection map; THREE.CubeRefractionMapping, refraction mapping; and THREE.SphericalReflectionMapping, a spherical reflection map projection.
wrapS -- The default is THREE.ClampToEdgeWrapping, where the edge is clamped to the outer edge texels. The other two choices are THREE.RepeatWrapping and THREE.MirroredRepeatWrapping.
wrapT -- The default is THREE.ClampToEdgeWrapping, where the edge is clamped to the outer edge texels. The other two choices are THREE.RepeatWrapping and THREE.MirroredRepeatWrapping.
magFilter -- How the texture is sampled when a texel covers more than one pixel. The default is THREE.LinearFilter, which takes the four closest texels and bilinearly interpolates among them. The other option is THREE.NearestFilter, which uses the value of the closest texels.
diff --git a/docs/api/textures/DataTexture.html b/docs/api/textures/DataTexture.html
index 26ecacc4058edc06c11fe316b35987f87cae121f..490b4464cd840c0990bcbcb8ac2f698dc2ccd1eb 100644
--- a/docs/api/textures/DataTexture.html
+++ b/docs/api/textures/DataTexture.html
@@ -26,7 +26,7 @@
height -- The height of the image.
format -- The default is THREE.RGBAFormat for the texture. Other formats are: THREE.AlphaFormat, THREE.RGBFormat, THREE.LuminanceFormat, and THREE.LuminanceAlphaFormat. There are also compressed texture formats, if the S3TC extension is supported: THREE.RGB_S3TC_DXT1_Format, THREE.RGBA_S3TC_DXT1_Format, THREE.RGBA_S3TC_DXT3_Format, and THREE.RGBA_S3TC_DXT5_Format.
type -- The default is THREE.UnsignedByteType. Other valid types (as WebGL allows) are THREE.ByteType, THREE.ShortType, THREE.UnsignedShortType, THREE.IntType, THREE.UnsignedIntType, THREE.FloatType, THREE.UnsignedShort4444Type, THREE.UnsignedShort5551Type, and THREE.UnsignedShort565Type.
- mapping -- How the image is applied to the object. An object type of THREE.UVMapping() is the default, where the U,V coordinates are used to apply the map, and a single texture is expected. The other types are THREE.CubeReflectionMapping, for cube maps used as a reflection map; THREE.CubeRefractionMapping, refraction mapping; and THREE.SphericalReflectionMapping, a spherical reflection map projection.
+ mapping -- How the image is applied to the object. An object type of THREE.UVMapping is the default, where the U,V coordinates are used to apply the map, and a single texture is expected. The other types are THREE.CubeReflectionMapping, for cube maps used as a reflection map; THREE.CubeRefractionMapping, refraction mapping; and THREE.SphericalReflectionMapping, a spherical reflection map projection.
wrapS -- The default is THREE.ClampToEdgeWrapping, where the edge is clamped to the outer edge texels. The other two choices are THREE.RepeatWrapping and THREE.MirroredRepeatWrapping.
wrapT -- The default is THREE.ClampToEdgeWrapping, where the edge is clamped to the outer edge texels. The other two choices are THREE.RepeatWrapping and THREE.MirroredRepeatWrapping.
magFilter -- How the texture is sampled when a texel covers more than one pixel. The default is THREE.LinearFilter, which takes the four closest texels and bilinearly interpolates among them. The other option is THREE.NearestFilter, which uses the value of the closest texel.
diff --git a/docs/api/textures/Texture.html b/docs/api/textures/Texture.html
index b95c3936c4c807b2734f10c35e142f2956b54582..2f073d07ccc2a777bffe451b97f4cf2771fde13c 100644
--- a/docs/api/textures/Texture.html
+++ b/docs/api/textures/Texture.html
@@ -40,7 +40,7 @@
[property:object mapping]
- How the image is applied to the object. An object type of THREE.UVMapping() is the default, where the U,V coordinates are used to apply the map, and a single texture is expected. The other types are THREE.CubeReflectionMapping, for cube maps used as a reflection map; THREE.CubeRefractionMapping, refraction mapping; and THREE.SphericalReflectionMapping, a spherical reflection map projection.
+ How the image is applied to the object. An object type of THREE.UVMapping is the default, where the U,V coordinates are used to apply the map, and a single texture is expected. The other types are THREE.CubeReflectionMapping, for cube maps used as a reflection map; THREE.CubeRefractionMapping, refraction mapping; and THREE.SphericalReflectionMapping, a spherical reflection map projection.
[property:number wrapS]
diff --git a/examples/js/loaders/ColladaLoader.js b/examples/js/loaders/ColladaLoader.js
index 631e58310158dd74ce92e334dbf3dfa1b4bb3978..ce6dfdde5a34905be1c93360db19b7e2853b0b4e 100644
--- a/examples/js/loaders/ColladaLoader.js
+++ b/examples/js/loaders/ColladaLoader.js
@@ -1147,7 +1147,7 @@
this.id = "";
this.name = "";
this.nodes = [];
- this.scene = new THREE.Scene();
+ this.scene = new THREE.Group();
};
diff --git a/examples/js/loaders/SceneLoader.js b/examples/js/loaders/SceneLoader.js
index e0d5934409363c992e33bc114d3305ebf26eb101..1bb7194e727749bbd8b62edca45b4eaff136e7b1 100644
--- a/examples/js/loaders/SceneLoader.js
+++ b/examples/js/loaders/SceneLoader.js
@@ -187,25 +187,6 @@ THREE.SceneLoader.prototype = {
if ( objJSON.loading === undefined ) {
- var reservedTypes = {
- "type": 1, "url": 1, "material": 1,
- "position": 1, "rotation": 1, "scale" : 1,
- "visible": 1, "children": 1, "userData": 1,
- "skin": 1, "morph": 1, "mirroredLoop": 1, "duration": 1
- };
-
- var loaderParameters = {};
-
- for ( var parType in objJSON ) {
-
- if ( ! ( parType in reservedTypes ) ) {
-
- loaderParameters[ parType ] = objJSON[ parType ];
-
- }
-
- }
-
material = result.materials[ objJSON.material ];
objJSON.loading = true;
@@ -223,7 +204,7 @@ THREE.SceneLoader.prototype = {
} else {
- loader.load( get_url( objJSON.url, data.urlBaseType ), create_callback_hierachy( objID, parent, material, objJSON ), loaderParameters );
+ loader.load( get_url( objJSON.url, data.urlBaseType ), create_callback_hierachy( objID, parent, material, objJSON ) );
}
@@ -872,20 +853,8 @@ THREE.SceneLoader.prototype = {
} else if ( geoJSON.type in this.geometryHandlers ) {
- var loaderParameters = {};
-
- for ( var parType in geoJSON ) {
-
- if ( parType !== "type" && parType !== "url" ) {
-
- loaderParameters[ parType ] = geoJSON[ parType ];
-
- }
-
- }
-
var loader = this.geometryHandlers[ geoJSON.type ][ "loaderObject" ];
- loader.load( get_url( geoJSON.url, data.urlBaseType ), create_callback_geometry( geoID ), loaderParameters );
+ loader.load( get_url( geoJSON.url, data.urlBaseType ), create_callback_geometry( geoID ) );
} else if ( geoJSON.type === "embedded" ) {
diff --git a/examples/js/loaders/UTF8Loader.js b/examples/js/loaders/UTF8Loader.js
index c4578414bdb6d436dc207c7204562880b4a838c5..3037ae0d8c7c53e3f0630c9347e8817f9636c5b8 100644
--- a/examples/js/loaders/UTF8Loader.js
+++ b/examples/js/loaders/UTF8Loader.js
@@ -19,7 +19,7 @@ THREE.UTF8Loader = function () {};
THREE.UTF8Loader.prototype.load = function ( jsonUrl, callback, options ) {
- this.downloadModelJson( jsonUrl, options, callback );
+ this.downloadModelJson( jsonUrl, callback, options );
};
@@ -690,7 +690,7 @@ THREE.UTF8Loader.prototype.downloadModel = function ( geometryBase, materialBase
};
-THREE.UTF8Loader.prototype.downloadModelJson = function ( jsonUrl, options, callback ) {
+THREE.UTF8Loader.prototype.downloadModelJson = function ( jsonUrl, callback, options ) {
getJsonRequest( jsonUrl, function( loaded ) {
diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js
index 59fc9f7589327553c1fa1b24be2c4b9deac44a92..449a7acf31fc5136c9b020ae6f8440b7664c3241 100644
--- a/src/renderers/webgl/WebGLProgram.js
+++ b/src/renderers/webgl/WebGLProgram.js
@@ -104,6 +104,11 @@ 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.')
+ envMapTypeDefine = "ENVMAP_TYPE_CUBE";
+ break;
+
}
}