diff --git a/editor/js/libs/ui.three.js b/editor/js/libs/ui.three.js index 2f5306ceb459fffb8ad745b172df93ba10fc749e..78e77fefad4e85ec7b43ec0ba1623cdc7bf48a9c 100644 --- a/editor/js/libs/ui.three.js +++ b/editor/js/libs/ui.three.js @@ -189,9 +189,7 @@ UI.CubeTexture = function () { var image = document.createElement( 'img' ); image.addEventListener( 'load', function( event ) { - var array = [ this, this, this, this, this, this ]; - - var texture = new THREE.Texture( array, new THREE.CubeReflectionMapping() ); + var texture = new THREE.Texture( this, THREE.SphericalReflectionMapping ); texture.sourceFile = file.name; texture.needsUpdate = true; diff --git a/examples/canvas_materials.html b/examples/canvas_materials.html index 728235e6907685e9ab994dd7e9cab652203d4022..35acdf3b54cbaed4e69443a660f00f28587206fd 100644 --- a/examples/canvas_materials.html +++ b/examples/canvas_materials.html @@ -76,8 +76,8 @@ new THREE.MeshDepthMaterial( { overdraw: 0.5 } ), new THREE.MeshNormalMaterial( { overdraw: 0.5 } ), new THREE.MeshBasicMaterial( { map: THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) } ), - new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalReflectionMapping() ), overdraw: 0.5 } ), - new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/envmap.png', new THREE.SphericalRefractionMapping() ), overdraw: 0.5 } ) + new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/envmap.png', THREE.SphericalReflectionMapping ), overdraw: 0.5 } ), + new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/envmap.png', THREE.SphericalRefractionMapping ), overdraw: 0.5 } ) ]; diff --git a/examples/canvas_materials_reflection.html b/examples/canvas_materials_reflection.html index f27b07a1e1802ee989e72a98eaf2547a4fc2b925..3fa02c91520b8601221c7514c416dfa15c2ffb7d 100644 --- a/examples/canvas_materials_reflection.html +++ b/examples/canvas_materials_reflection.html @@ -67,7 +67,7 @@ geometry.computeVertexNormals(); - mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ), overdraw: 0.5 } ) ); + mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', THREE.SphericalReflectionMapping ), overdraw: 0.5 } ) ); scene.add( mesh ); } ); diff --git a/examples/canvas_sandbox.html b/examples/canvas_sandbox.html index 18f53552e3490fdc342f9d61b8c29ae78166e437..841876b23ab8553253f1c93ec2b275aab9fffb85 100644 --- a/examples/canvas_sandbox.html +++ b/examples/canvas_sandbox.html @@ -94,7 +94,7 @@ geometry = new THREE.IcosahedronGeometry( 100, 1 ); - material = new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', new THREE.SphericalReflectionMapping() ), overdraw: 0.5 } ); + material = new THREE.MeshBasicMaterial( { envMap: THREE.ImageUtils.loadTexture( 'textures/metal.jpg', THREE.SphericalReflectionMapping ), overdraw: 0.5 } ); for ( var i = 0; i < 10; i ++ ) { diff --git a/examples/js/MD2Character.js b/examples/js/MD2Character.js index 82f0d3b51afd722e5e8d7ac84bb507755daf2445..784fd803fc070e40056633e430248614f3f87b97 100644 --- a/examples/js/MD2Character.js +++ b/examples/js/MD2Character.js @@ -183,7 +183,7 @@ THREE.MD2Character = function () { function loadTextures( baseUrl, textureUrls ) { - var mapping = new THREE.UVMapping(); + var mapping = THREE.UVMapping; var textures = []; for ( var i = 0; i < textureUrls.length; i ++ ) { diff --git a/examples/js/MD2CharacterComplex.js b/examples/js/MD2CharacterComplex.js index c4fc84b62000eb6b693f9626a98aedcfcdd5f2f2..8cfa8845944a9ebff96d11104f1831c6bf2127ec 100644 --- a/examples/js/MD2CharacterComplex.js +++ b/examples/js/MD2CharacterComplex.js @@ -506,7 +506,7 @@ THREE.MD2CharacterComplex = function () { function loadTextures( baseUrl, textureUrls ) { - var mapping = new THREE.UVMapping(); + var mapping = THREE.UVMapping; var textures = []; for ( var i = 0; i < textureUrls.length; i ++ ) { diff --git a/examples/js/UCSCharacter.js b/examples/js/UCSCharacter.js index 11f9960747c09da63708340588a9730457a49f04..aa51bafb956e7fcdafb047f5e9199a220ff480b6 100644 --- a/examples/js/UCSCharacter.js +++ b/examples/js/UCSCharacter.js @@ -78,7 +78,7 @@ THREE.UCSCharacter = function() { } function loadTextures( baseUrl, textureUrls ) { - var mapping = new THREE.UVMapping(); + var mapping = THREE.UVMapping; var textures = []; for ( var i = 0; i < textureUrls.length; i ++ ) { diff --git a/examples/js/renderers/CanvasRenderer.js b/examples/js/renderers/CanvasRenderer.js index 050d35b04d76e5b4025549d3c95fc53438063df4..bc504e92c3ad0a5aa19bf54d6220664b8a4dd8cd 100644 --- a/examples/js/renderers/CanvasRenderer.js +++ b/examples/js/renderers/CanvasRenderer.js @@ -700,8 +700,10 @@ THREE.CanvasRenderer = function ( parameters ) { material instanceof THREE.MeshPhongMaterial ) { if ( material.map !== null ) { + + var mapping = material.map.mapping; - if ( material.map.mapping instanceof THREE.UVMapping ) { + if ( mapping === THREE.UVMapping ) { _uvs = element.uvs; patternPath( _v1x, _v1y, _v2x, _v2y, _v3x, _v3y, _uvs[ uv1 ].x, _uvs[ uv1 ].y, _uvs[ uv2 ].x, _uvs[ uv2 ].y, _uvs[ uv3 ].x, _uvs[ uv3 ].y, material.map ); @@ -710,7 +712,7 @@ THREE.CanvasRenderer = function ( parameters ) { } else if ( material.envMap !== null ) { - if ( material.envMap.mapping instanceof THREE.SphericalReflectionMapping ) { + if ( mapping === THREE.SphericalReflectionMapping ) { _normal.copy( element.vertexNormalsModel[ uv1 ] ).applyMatrix3( _normalViewMatrix ); _uv1x = 0.5 * _normal.x + 0.5; @@ -726,7 +728,7 @@ THREE.CanvasRenderer = function ( parameters ) { patternPath( _v1x, _v1y, _v2x, _v2y, _v3x, _v3y, _uv1x, _uv1y, _uv2x, _uv2y, _uv3x, _uv3y, material.envMap ); - } else if ( material.envMap.mapping instanceof THREE.SphericalRefractionMapping ) { + } else if ( mapping === THREE.SphericalRefractionMapping ) { _normal.copy( element.vertexNormalsModel[ uv1 ] ).applyMatrix3( _normalViewMatrix ); _uv1x = - 0.5 * _normal.x + 0.5; diff --git a/examples/misc_controls_transform.html b/examples/misc_controls_transform.html index bbfa7bd3aab4a6c576daa8d1feb8d4bb57eb9fee..45a21be9844f4daf732a6619f32200b7dee672f7 100644 --- a/examples/misc_controls_transform.html +++ b/examples/misc_controls_transform.html @@ -60,7 +60,7 @@ scene.add( light ); - var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif', new THREE.UVMapping(), render ); + var texture = THREE.ImageUtils.loadTexture( 'textures/crate.gif', THREE.UVMapping, render ); texture.anisotropy = renderer.getMaxAnisotropy(); var geometry = new THREE.BoxGeometry( 200, 200, 200 ); diff --git a/examples/webgl_effects_stereo.html b/examples/webgl_effects_stereo.html index 19dfecfe5aab54d88e94db2837e4c63174d9e3d5..da72b33f7b6ee901c3a6f4bcf4531a2e18f9ff1f 100644 --- a/examples/webgl_effects_stereo.html +++ b/examples/webgl_effects_stereo.html @@ -86,7 +86,7 @@ path + 'pz' + format, path + 'nz' + format ]; - var textureCube = THREE.ImageUtils.loadTextureCube( urls, new THREE.CubeRefractionMapping() ); + var textureCube = THREE.ImageUtils.loadTextureCube( urls, THREE.CubeRefractionMapping ); var material = new THREE.MeshBasicMaterial( { color: 0xffffff, envMap: textureCube, refractionRatio: 0.95 } ); for ( var i = 0; i < 500; i ++ ) { diff --git a/examples/webgl_geometry_terrain.html b/examples/webgl_geometry_terrain.html index bce9b08b8f90700bd7b387749c8c90fd577b4c87..f9eeea09e55b8541138f75956c858f6a517b05db 100644 --- a/examples/webgl_geometry_terrain.html +++ b/examples/webgl_geometry_terrain.html @@ -92,7 +92,7 @@ } - texture = new THREE.Texture( generateTexture( data, worldWidth, worldDepth ), new THREE.UVMapping(), THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping ); + texture = new THREE.Texture( generateTexture( data, worldWidth, worldDepth ), THREE.UVMapping, THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping ); texture.needsUpdate = true; mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { map: texture } ) ); diff --git a/examples/webgl_geometry_terrain_fog.html b/examples/webgl_geometry_terrain_fog.html index 9c0d33b0110b383a4d0ae07484214ca495781e88..1fc77dc78b42fe7463dc555a5667505ad1b255a9 100644 --- a/examples/webgl_geometry_terrain_fog.html +++ b/examples/webgl_geometry_terrain_fog.html @@ -94,7 +94,7 @@ } - texture = new THREE.Texture( generateTexture( data, worldWidth, worldDepth ), new THREE.UVMapping(), THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping ); + texture = new THREE.Texture( generateTexture( data, worldWidth, worldDepth ), THREE.UVMapping, THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping ); texture.needsUpdate = true; mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { map: texture } ) ); diff --git a/examples/webgl_geometry_terrain_raycast.html b/examples/webgl_geometry_terrain_raycast.html index 92514c3b38dfa745230240c389dd166e967a5443..09b072bdca5b92740ae8ea8e763d5b9fe5837f62 100644 --- a/examples/webgl_geometry_terrain_raycast.html +++ b/examples/webgl_geometry_terrain_raycast.html @@ -98,7 +98,7 @@ geometry.computeFaceNormals(); - texture = new THREE.Texture( generateTexture( data, worldWidth, worldDepth ), new THREE.UVMapping(), THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping ); + texture = new THREE.Texture( generateTexture( data, worldWidth, worldDepth ), THREE.UVMapping, THREE.ClampToEdgeWrapping, THREE.ClampToEdgeWrapping ); texture.needsUpdate = true; mesh = new THREE.Mesh( geometry, new THREE.MeshBasicMaterial( { map: texture } ) ); diff --git a/examples/webgl_loader_json_objconverter.html b/examples/webgl_loader_json_objconverter.html index e2b659b1a583f65ecade525c49effb4d64dda613..ae31b6dea3775f1b7be5d968e7e11f1358a98828 100644 --- a/examples/webgl_loader_json_objconverter.html +++ b/examples/webgl_loader_json_objconverter.html @@ -101,7 +101,7 @@ xc.fillStyle = "#555"; xc.fillRect(96, 96, 32, 32); - var xm = new THREE.MeshBasicMaterial( { map: new THREE.Texture( x, new THREE.UVMapping(), THREE.RepeatWrapping, THREE.RepeatWrapping ) } ); + var xm = new THREE.MeshBasicMaterial( { map: new THREE.Texture( x, THREE.UVMapping, THREE.RepeatWrapping, THREE.RepeatWrapping ) } ); xm.map.needsUpdate = true; xm.map.repeat.set( 10, 10 ); diff --git a/examples/webgl_marchingcubes.html b/examples/webgl_marchingcubes.html index 98f6bed9717254ec0a40bd6394ef80452eda8f94..3b985b1fd2dc6c7f3623449857473b6a8437f97a 100644 --- a/examples/webgl_marchingcubes.html +++ b/examples/webgl_marchingcubes.html @@ -263,7 +263,7 @@ var reflectionCube = THREE.ImageUtils.loadTextureCube( urls ); reflectionCube.format = THREE.RGBFormat; - var refractionCube = new THREE.Texture( reflectionCube.image, new THREE.CubeRefractionMapping() ); + var refractionCube = new THREE.Texture( reflectionCube.image, THREE.CubeRefractionMapping ); reflectionCube.format = THREE.RGBFormat; // toons diff --git a/examples/webgl_materials_cubemap.html b/examples/webgl_materials_cubemap.html index c5dd0b6b7b79521e07c9ea662d3c934f7211779a..192c4b6abecd0ce756c7f4b31538a7c03015a73e 100644 --- a/examples/webgl_materials_cubemap.html +++ b/examples/webgl_materials_cubemap.html @@ -108,7 +108,7 @@ var reflectionCube = THREE.ImageUtils.loadTextureCube( urls ); reflectionCube.format = THREE.RGBFormat; - var refractionCube = new THREE.CubeTexture( reflectionCube.image, new THREE.CubeRefractionMapping() ); + var refractionCube = new THREE.CubeTexture( reflectionCube.image, THREE.CubeRefractionMapping ); refractionCube.format = THREE.RGBFormat; //var cubeMaterial3 = new THREE.MeshPhongMaterial( { color: 0x000000, specular:0xaa0000, envMap: reflectionCube, combine: THREE.MixOperation, reflectivity: 0.25 } ); diff --git a/examples/webgl_materials_cubemap_balls_refraction.html b/examples/webgl_materials_cubemap_balls_refraction.html index a9ce35d8579f13dffd6a7220ba5a2bb6e7882f5e..0b4a547e5e52be012bda4bc6ca8d9e3775161600 100644 --- a/examples/webgl_materials_cubemap_balls_refraction.html +++ b/examples/webgl_materials_cubemap_balls_refraction.html @@ -86,7 +86,7 @@ path + 'pz' + format, path + 'nz' + format ]; - var textureCube = THREE.ImageUtils.loadTextureCube( urls, new THREE.CubeRefractionMapping() ); + var textureCube = THREE.ImageUtils.loadTextureCube( urls, THREE.CubeRefractionMapping ); var material = new THREE.MeshBasicMaterial( { color: 0xffffff, envMap: textureCube, refractionRatio: 0.95 } ); for ( var i = 0; i < 500; i ++ ) { diff --git a/examples/webgl_materials_cubemap_dynamic2.html b/examples/webgl_materials_cubemap_dynamic2.html index 91a3c5bd1e0d461073bee773ebaf77430808c45b..131ce3d9341aff160269650cdff241f078116152 100644 --- a/examples/webgl_materials_cubemap_dynamic2.html +++ b/examples/webgl_materials_cubemap_dynamic2.html @@ -45,7 +45,7 @@ lat = 0, onMouseDownLat = 0, phi = 0, theta = 0; - var texture = THREE.ImageUtils.loadTexture( 'textures/2294472375_24a3b8ef46_o.jpg', new THREE.UVMapping(), function () { + var texture = THREE.ImageUtils.loadTexture( 'textures/2294472375_24a3b8ef46_o.jpg', THREE.UVMapping, function () { init(); animate(); diff --git a/examples/webgl_materials_cubemap_refraction.html b/examples/webgl_materials_cubemap_refraction.html index 78c5945cae7e49ea2b73c13a1f28a552b5ffa2ef..53718aa3abff8121a6595d3d6fa97f63e2014c57 100644 --- a/examples/webgl_materials_cubemap_refraction.html +++ b/examples/webgl_materials_cubemap_refraction.html @@ -103,7 +103,7 @@ r + "py.jpg", r + "ny.jpg", r + "pz.jpg", r + "nz.jpg" ]; - var textureCube = THREE.ImageUtils.loadTextureCube( urls, new THREE.CubeRefractionMapping() ); + var textureCube = THREE.ImageUtils.loadTextureCube( urls, THREE.CubeRefractionMapping ); var cubeMaterial3 = new THREE.MeshBasicMaterial( { color: 0xccddff, envMap: textureCube, refractionRatio: 0.98, reflectivity:0.9 } ); var cubeMaterial2 = new THREE.MeshBasicMaterial( { color: 0xccfffd, envMap: textureCube, refractionRatio: 0.985 } ); diff --git a/examples/webgl_materials_texture_compressed.html b/examples/webgl_materials_texture_compressed.html index ca3c085937680d52782cb7098c2e3c14572f6b79..3d3ae301059c325905f6dffbbd688ce7f287462c 100644 --- a/examples/webgl_materials_texture_compressed.html +++ b/examples/webgl_materials_texture_compressed.html @@ -95,21 +95,21 @@ var cubemap1 = loader.load( 'textures/compressed/Mountains.dds', function ( texture ) { texture.magFilter = THREE.LinearFilter texture.minFilter = THREE.LinearFilter; - texture.mapping = new THREE.CubeReflectionMapping(); + texture.mapping = THREE.CubeReflectionMapping; material1.needsUpdate = true; } ); var cubemap2 = loader.load( 'textures/compressed/Mountains_argb_mip.dds', function ( texture ) { texture.magFilter = THREE.LinearFilter; texture.minFilter = THREE.LinearFilter; - texture.mapping = new THREE.CubeReflectionMapping(); + texture.mapping = THREE.CubeReflectionMapping; material5.needsUpdate = true; } ); var cubemap3 = loader.load( 'textures/compressed/Mountains_argb_nomip.dds', function ( texture ) { texture.magFilter = THREE.LinearFilter; texture.minFilter = THREE.LinearFilter; - texture.mapping = new THREE.CubeReflectionMapping(); + texture.mapping = THREE.CubeReflectionMapping; material6.needsUpdate = true; } ); diff --git a/examples/webgl_materials_texture_pvrtc.html b/examples/webgl_materials_texture_pvrtc.html index 7444036a8d1ce7258bd1c7c30798d9ced5ff64ea..a4eac788df7bebd60a390bf518f9f96aa8a71782 100644 --- a/examples/webgl_materials_texture_pvrtc.html +++ b/examples/webgl_materials_texture_pvrtc.html @@ -73,14 +73,14 @@ var onCube1Loaded = function(texture){ texture.magFilter = THREE.LinearFilter; texture.minFilter = THREE.LinearFilter; - texture.mapping = new THREE.CubeReflectionMapping(); + texture.mapping = THREE.CubeReflectionMapping; material6.needsUpdate = true; }; var onCube2Loaded = function(texture){ texture.magFilter = THREE.LinearFilter; // texture.minFilter = THREE.LinearMipMapNearestFilter; texture.minFilter = THREE.LinearFilter; - texture.mapping = new THREE.CubeReflectionMapping(); + texture.mapping = THREE.CubeReflectionMapping; material8.needsUpdate = true; }; diff --git a/examples/webgl_sandbox.html b/examples/webgl_sandbox.html index d14a2468dd9d28091dd8465aa99353da1097d2f5..0d3bdabd8f69ada6825700fbbae1e44c4f8d6ae6 100644 --- a/examples/webgl_sandbox.html +++ b/examples/webgl_sandbox.html @@ -77,8 +77,8 @@ var vertexShader = shader.vertexShader; var fragmentShader = shader.fragmentShader; - var texture1 = new THREE.Texture( generateTexture( 0, 0.5, 1 ), new THREE.UVMapping() ); - var texture2 = new THREE.Texture( generateTexture( 0, 1, 0 ), new THREE.SphericalReflectionMapping() ); + var texture1 = new THREE.Texture( generateTexture( 0, 0.5, 1 ), THREE.UVMapping ); + var texture2 = new THREE.Texture( generateTexture( 0, 1, 0 ), THREE.SphericalReflectionMapping ); var texture3 = THREE.ImageUtils.loadTexture( 'textures/land_ocean_ice_cloud_2048.jpg' ) texture1.needsUpdate = true; diff --git a/examples/webgl_shading_physical.html b/examples/webgl_shading_physical.html index 00f583096ae247d3dd318f0a5964ee0e50854e52..a35081416fa4fe804cb53b88e2960e26897b9841 100644 --- a/examples/webgl_shading_physical.html +++ b/examples/webgl_shading_physical.html @@ -146,7 +146,7 @@ xc.fillStyle = "#555"; xc.fillRect(96, 96, 32, 32); - var texturePattern = new THREE.Texture( x, new THREE.UVMapping(), THREE.RepeatWrapping, THREE.RepeatWrapping ); + var texturePattern = new THREE.Texture( x, THREE.UVMapping, THREE.RepeatWrapping, THREE.RepeatWrapping ); texturePattern.needsUpdate = true; texturePattern.repeat.set( 1000, 1000 ); texturePattern.format = THREE.RGBFormat;