diff --git a/docs/api/en/materials/SpriteMaterial.html b/docs/api/en/materials/SpriteMaterial.html index 5f3f06cd331338577161333ea2c7bb2a957e6ae3..79c735ca09c2d5af62f77e9559717bc8a4171201 100644 --- a/docs/api/en/materials/SpriteMaterial.html +++ b/docs/api/en/materials/SpriteMaterial.html @@ -18,7 +18,6 @@
[example:webgl_sprites WebGL / sprites]
[example:misc_ubiquity_test misc / ubiquity / test]
- [example:misc_ubiquity_test2 misc / ubiquity / test2]
[example:software_sandbox software / sandbox]
[example:svg_sandbox svg / sandbox]
[example:webgl_materials_cubemap_dynamic webgl / materials / cubemap / dynamic] diff --git a/docs/api/zh/materials/SpriteMaterial.html b/docs/api/zh/materials/SpriteMaterial.html index c6e53d0e0657b9cbf18ad2199dfba7495f3c0f69..c0cd126bfeef2fa33083ef396d353b1f14015725 100644 --- a/docs/api/zh/materials/SpriteMaterial.html +++ b/docs/api/zh/materials/SpriteMaterial.html @@ -18,7 +18,6 @@
[example:webgl_sprites WebGL / sprites]
[example:misc_ubiquity_test misc / ubiquity / test]
- [example:misc_ubiquity_test2 misc / ubiquity / test2]
[example:software_sandbox software / sandbox]
[example:svg_sandbox svg / sandbox]
[example:webgl_materials_cubemap_dynamic webgl / materials / cubemap / dynamic] diff --git a/examples/files.js b/examples/files.js index 48b0c523bfee3c02404fb2ff628a05775bb4ad60..1b191ec3efa3b082eed06f35af56b61227b71c04 100644 --- a/examples/files.js +++ b/examples/files.js @@ -189,7 +189,6 @@ var files = { "webgl_modifier_tessellation", "webgl_morphtargets", "webgl_morphtargets_horse", - "webgl_morphtargets_human", "webgl_morphtargets_sphere", "webgl_multiple_canvases_circle", "webgl_multiple_canvases_complex", @@ -356,7 +355,7 @@ var files = { "misc_fps", "misc_lights_test", "misc_lookat", - "misc_ubiquity_test2", + "misc_ubiquity_test", "misc_uv_tests" ], "css3d": [ diff --git a/examples/js/UCSCharacter.js b/examples/js/UCSCharacter.js deleted file mode 100644 index a3978c9f12fba98a4d7d0a60aa71b82d087ac619..0000000000000000000000000000000000000000 --- a/examples/js/UCSCharacter.js +++ /dev/null @@ -1,141 +0,0 @@ -THREE.UCSCharacter = function () { - - var scope = this; - - var mesh; - - this.scale = 1; - - this.root = new THREE.Object3D(); - - this.numSkins = undefined; - this.numMorphs = undefined; - - this.skins = []; - this.materials = []; - this.morphs = []; - - this.mixer = new THREE.AnimationMixer( this.root ); - - this.onLoadComplete = function () {}; - - this.loadCounter = 0; - - this.loadParts = function ( config ) { - - this.numSkins = config.skins.length; - this.numMorphs = config.morphs.length; - - // Character geometry + number of skins - this.loadCounter = 1 + config.skins.length; - - // SKINS - this.skins = loadTextures( config.baseUrl + "skins/", config.skins ); - this.materials = createMaterials( this.skins ); - - // MORPHS - this.morphs = config.morphs; - - // CHARACTER - var loader = new THREE.JSONLoader(); - console.log( config.baseUrl + config.character ); - loader.load( config.baseUrl + config.character, function ( geometry ) { - - geometry.computeBoundingBox(); - geometry.computeVertexNormals(); - - mesh = new THREE.SkinnedMesh( geometry, [] ); - mesh.name = config.character; - scope.root.add( mesh ); - - var bb = geometry.boundingBox; - scope.root.scale.set( config.s, config.s, config.s ); - scope.root.position.set( config.x, config.y - bb.min.y * config.s, config.z ); - - mesh.castShadow = true; - mesh.receiveShadow = true; - - scope.mixer.clipAction( geometry.animations[ 0 ], mesh ).play(); - - scope.setSkin( 0 ); - - scope.checkLoadComplete(); - - } ); - - }; - - this.setSkin = function ( index ) { - - if ( mesh && scope.materials ) { - - mesh.material = scope.materials[ index ]; - - } - - }; - - this.updateMorphs = function ( influences ) { - - if ( mesh ) { - - for ( var i = 0; i < scope.numMorphs; i ++ ) { - - mesh.morphTargetInfluences[ i ] = influences[ scope.morphs[ i ] ] / 100; - - } - - } - - }; - - function loadTextures( baseUrl, textureUrls ) { - - var textureLoader = new THREE.TextureLoader(); - var textures = []; - - for ( var i = 0; i < textureUrls.length; i ++ ) { - - textures[ i ] = textureLoader.load( baseUrl + textureUrls[ i ], scope.checkLoadComplete ); - textures[ i ].mapping = THREE.UVMapping; - textures[ i ].name = textureUrls[ i ]; - - } - - return textures; - - } - - function createMaterials( skins ) { - - var materials = []; - - for ( var i = 0; i < skins.length; i ++ ) { - - materials[ i ] = new THREE.MeshLambertMaterial( { - color: 0xeeeeee, - specular: 10.0, - map: skins[ i ], - skinning: true, - morphTargets: true - } ); - - } - - return materials; - - } - - this.checkLoadComplete = function () { - - scope.loadCounter -= 1; - - if ( scope.loadCounter === 0 ) { - - scope.onLoadComplete(); - - } - - }; - -}; diff --git a/examples/misc_ubiquity_test2.html b/examples/misc_ubiquity_test.html similarity index 98% rename from examples/misc_ubiquity_test2.html rename to examples/misc_ubiquity_test.html index 8694604685d5d760b95c06d9e22541749b9678f3..e118d3c7e34475b7194ec091a5dafb2e4eb866e5 100644 --- a/examples/misc_ubiquity_test2.html +++ b/examples/misc_ubiquity_test.html @@ -1,7 +1,7 @@ - three.js misc - ubiquity - test2 + three.js misc - ubiquity - test - - - - -
- -
- three.js webgl - morph targets - human -
- - - - - - - - - - - - - - -