|
|
@@ -6,6 +6,19 @@ if ( Number.EPSILON === undefined ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
+if ( Number.isInteger === undefined ) {
|
|
|
+
|
|
|
+ // Missing in IE
|
|
|
+ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isInteger
|
|
|
+
|
|
|
+ Number.isInteger = function ( value ) {
|
|
|
+
|
|
|
+ return typeof value === 'number' && isFinite( value ) && Math.floor( value ) === value;
|
|
|
+
|
|
|
+ };
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
//
|
|
|
|
|
|
if ( Math.sign === undefined ) {
|
|
|
@@ -22,7 +35,7 @@ if ( Math.sign === undefined ) {
|
|
|
|
|
|
if ( Function.prototype.name === undefined ) {
|
|
|
|
|
|
- // Missing in IE9-11.
|
|
|
+ // Missing in IE
|
|
|
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/name
|
|
|
|
|
|
Object.defineProperty( Function.prototype, 'name', {
|
|
|
@@ -39,7 +52,7 @@ if ( Function.prototype.name === undefined ) {
|
|
|
|
|
|
if ( Object.assign === undefined ) {
|
|
|
|
|
|
- // Missing in IE.
|
|
|
+ // Missing in IE
|
|
|
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
|
|
|
|
|
|
( function () {
|
|
|
@@ -4188,6 +4201,30 @@ Object.assign( Matrix4.prototype, {
|
|
|
|
|
|
} );
|
|
|
|
|
|
+/**
|
|
|
+ * @author alteredq / http://alteredqualia.com/
|
|
|
+ */
|
|
|
+
|
|
|
+function DataTexture( data, width, height, format, type, mapping, wrapS, wrapT, magFilter, minFilter, anisotropy, encoding ) {
|
|
|
+
|
|
|
+ Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding );
|
|
|
+
|
|
|
+ this.image = { data: data, width: width, height: height };
|
|
|
+
|
|
|
+ this.magFilter = magFilter !== undefined ? magFilter : NearestFilter;
|
|
|
+ this.minFilter = minFilter !== undefined ? minFilter : NearestFilter;
|
|
|
+
|
|
|
+ this.generateMipmaps = false;
|
|
|
+ this.flipY = false;
|
|
|
+ this.unpackAlignment = 1;
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+DataTexture.prototype = Object.create( Texture.prototype );
|
|
|
+DataTexture.prototype.constructor = DataTexture;
|
|
|
+
|
|
|
+DataTexture.prototype.isDataTexture = true;
|
|
|
+
|
|
|
/**
|
|
|
* @author mrdoob / http://mrdoob.com/
|
|
|
*/
|
|
|
@@ -5697,30 +5734,6 @@ Object.assign( Color.prototype, {
|
|
|
|
|
|
} );
|
|
|
|
|
|
-/**
|
|
|
- * @author alteredq / http://alteredqualia.com/
|
|
|
- */
|
|
|
-
|
|
|
-function DataTexture( data, width, height, format, type, mapping, wrapS, wrapT, magFilter, minFilter, anisotropy, encoding ) {
|
|
|
-
|
|
|
- Texture.call( this, null, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy, encoding );
|
|
|
-
|
|
|
- this.image = { data: data, width: width, height: height };
|
|
|
-
|
|
|
- this.magFilter = magFilter !== undefined ? magFilter : NearestFilter;
|
|
|
- this.minFilter = minFilter !== undefined ? minFilter : NearestFilter;
|
|
|
-
|
|
|
- this.generateMipmaps = false;
|
|
|
- this.flipY = false;
|
|
|
- this.unpackAlignment = 1;
|
|
|
-
|
|
|
-}
|
|
|
-
|
|
|
-DataTexture.prototype = Object.create( Texture.prototype );
|
|
|
-DataTexture.prototype.constructor = DataTexture;
|
|
|
-
|
|
|
-DataTexture.prototype.isDataTexture = true;
|
|
|
-
|
|
|
/**
|
|
|
* Uniforms library for shared webgl shaders
|
|
|
*/
|
|
|
@@ -7308,6 +7321,7 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
|
|
|
if ( this.wireframeLinecap !== 'round' ) data.wireframeLinecap = this.wireframeLinecap;
|
|
|
if ( this.wireframeLinejoin !== 'round' ) data.wireframeLinejoin = this.wireframeLinejoin;
|
|
|
|
|
|
+ data.skinning = this.skinning;
|
|
|
data.morphTargets = this.morphTargets;
|
|
|
|
|
|
// TODO: Copied from Object3D.toJSON
|
|
|
@@ -7440,6 +7454,7 @@ Object.assign( Material.prototype, EventDispatcher.prototype, {
|
|
|
*
|
|
|
* lights: <bool>,
|
|
|
*
|
|
|
+ * skinning: <bool>,
|
|
|
* morphTargets: <bool>,
|
|
|
* morphNormals: <bool>
|
|
|
* }
|
|
|
@@ -7466,6 +7481,7 @@ function ShaderMaterial( parameters ) {
|
|
|
this.lights = false; // set to use scene lights
|
|
|
this.clipping = false; // set to use user-defined clipping planes
|
|
|
|
|
|
+ this.skinning = false; // set to use skinning attribute streams
|
|
|
this.morphTargets = false; // set to use morph targets
|
|
|
this.morphNormals = false; // set to use morph normals
|
|
|
|
|
|
@@ -7522,6 +7538,8 @@ ShaderMaterial.prototype.copy = function ( source ) {
|
|
|
this.lights = source.lights;
|
|
|
this.clipping = source.clipping;
|
|
|
|
|
|
+ this.skinning = source.skinning;
|
|
|
+
|
|
|
this.morphTargets = source.morphTargets;
|
|
|
this.morphNormals = source.morphNormals;
|
|
|
|
|
|
@@ -7574,6 +7592,7 @@ function MeshDepthMaterial( parameters ) {
|
|
|
|
|
|
this.depthPacking = BasicDepthPacking;
|
|
|
|
|
|
+ this.skinning = false;
|
|
|
this.morphTargets = false;
|
|
|
|
|
|
this.map = null;
|
|
|
@@ -7605,6 +7624,7 @@ MeshDepthMaterial.prototype.copy = function ( source ) {
|
|
|
|
|
|
this.depthPacking = source.depthPacking;
|
|
|
|
|
|
+ this.skinning = source.skinning;
|
|
|
this.morphTargets = source.morphTargets;
|
|
|
|
|
|
this.map = source.map;
|
|
|
@@ -9030,6 +9050,7 @@ function WebGLShadowMap( _renderer, _lights, _objects, capabilities ) {
|
|
|
|
|
|
var depthMaterial = depthMaterialTemplate.clone();
|
|
|
depthMaterial.morphTargets = useMorphing;
|
|
|
+ depthMaterial.skinning = useSkinning;
|
|
|
|
|
|
_depthMaterials[ i ] = depthMaterial;
|
|
|
|
|
|
@@ -9041,6 +9062,7 @@ function WebGLShadowMap( _renderer, _lights, _objects, capabilities ) {
|
|
|
vertexShader: distanceShader.vertexShader,
|
|
|
fragmentShader: distanceShader.fragmentShader,
|
|
|
morphTargets: useMorphing,
|
|
|
+ skinning: useSkinning,
|
|
|
clipping: true
|
|
|
} );
|
|
|
|
|
|
@@ -9266,7 +9288,7 @@ function WebGLShadowMap( _renderer, _lights, _objects, capabilities ) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- var useSkinning = object.isSkinnedMesh;
|
|
|
+ var useSkinning = object.isSkinnedMesh && material.skinning;
|
|
|
|
|
|
var variantIndex = 0;
|
|
|
|
|
|
@@ -11529,6 +11551,7 @@ Object.assign( Face3.prototype, {
|
|
|
* wireframe: <boolean>,
|
|
|
* wireframeLinewidth: <float>,
|
|
|
*
|
|
|
+ * skinning: <bool>,
|
|
|
* morphTargets: <bool>
|
|
|
* }
|
|
|
*/
|
|
|
@@ -11563,6 +11586,7 @@ function MeshBasicMaterial( parameters ) {
|
|
|
this.wireframeLinecap = 'round';
|
|
|
this.wireframeLinejoin = 'round';
|
|
|
|
|
|
+ this.skinning = false;
|
|
|
this.morphTargets = false;
|
|
|
|
|
|
this.lights = false;
|
|
|
@@ -11604,6 +11628,7 @@ MeshBasicMaterial.prototype.copy = function ( source ) {
|
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
|
|
|
|
+ this.skinning = source.skinning;
|
|
|
this.morphTargets = source.morphTargets;
|
|
|
|
|
|
return this;
|
|
|
@@ -17255,31 +17280,6 @@ function WebGLPrograms( renderer, capabilities ) {
|
|
|
|
|
|
if ( capabilities.floatVertexTextures ) {
|
|
|
|
|
|
- if ( skeleton.boneTexture === undefined ) {
|
|
|
-
|
|
|
- // layout (1 matrix = 4 pixels)
|
|
|
- // RGBA RGBA RGBA RGBA (=> column1, column2, column3, column4)
|
|
|
- // with 8x8 pixel texture max 16 bones * 4 pixels = (8 * 8)
|
|
|
- // 16x16 pixel texture max 64 bones * 4 pixels = (16 * 16)
|
|
|
- // 32x32 pixel texture max 256 bones * 4 pixels = (32 * 32)
|
|
|
- // 64x64 pixel texture max 1024 bones * 4 pixels = (64 * 64)
|
|
|
-
|
|
|
-
|
|
|
- var size = Math.sqrt( bones.length * 4 ); // 4 pixels needed for 1 matrix
|
|
|
- size = _Math.nextPowerOfTwo( Math.ceil( size ) );
|
|
|
- size = Math.max( size, 4 );
|
|
|
-
|
|
|
- var boneMatrices = new Float32Array( size * size * 4 ); // 4 floats per RGBA pixel
|
|
|
- boneMatrices.set( skeleton.boneMatrices ); // copy current values
|
|
|
-
|
|
|
- var boneTexture = new DataTexture( boneMatrices, size, size, RGBAFormat, FloatType );
|
|
|
-
|
|
|
- skeleton.boneMatrices = boneMatrices;
|
|
|
- skeleton.boneTexture = boneTexture;
|
|
|
- skeleton.boneTextureSize = size;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
return 1024;
|
|
|
|
|
|
} else {
|
|
|
@@ -17403,7 +17403,7 @@ function WebGLPrograms( renderer, capabilities ) {
|
|
|
sizeAttenuation: material.sizeAttenuation,
|
|
|
logarithmicDepthBuffer: capabilities.logarithmicDepthBuffer,
|
|
|
|
|
|
- skinning: ( object && object.isSkinnedMesh ) && maxBones > 0,
|
|
|
+ skinning: material.skinning && maxBones > 0,
|
|
|
maxBones: maxBones,
|
|
|
useVertexTexture: capabilities.floatVertexTextures,
|
|
|
|
|
|
@@ -17508,7 +17508,7 @@ function WebGLPrograms( renderer, capabilities ) {
|
|
|
|
|
|
};
|
|
|
|
|
|
- this.releaseProgram = function( program ) {
|
|
|
+ this.releaseProgram = function ( program ) {
|
|
|
|
|
|
if ( -- program.usedTimes === 0 ) {
|
|
|
|
|
|
@@ -20276,16 +20276,14 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
};
|
|
|
|
|
|
- var program, geometryProgram, updateBuffers;
|
|
|
-
|
|
|
this.renderBufferDirect = function ( camera, fog, geometry, material, object, group ) {
|
|
|
|
|
|
state.setMaterial( material );
|
|
|
|
|
|
- program = setProgram( camera, fog, material, object );
|
|
|
- geometryProgram = geometry.id + '_' + program.id + '_' + material.wireframe;
|
|
|
+ var program = setProgram( camera, fog, material, object );
|
|
|
+ var geometryProgram = geometry.id + '_' + program.id + '_' + material.wireframe;
|
|
|
|
|
|
- updateBuffers = false;
|
|
|
+ var updateBuffers = false;
|
|
|
|
|
|
if ( geometryProgram !== _currentGeometryProgram ) {
|
|
|
|
|
|
@@ -20835,19 +20833,19 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
var overrideMaterial = scene.overrideMaterial;
|
|
|
|
|
|
- renderObjects( opaqueObjects, scene, camera, overrideMaterial );
|
|
|
- renderObjects( transparentObjects, scene, camera, overrideMaterial );
|
|
|
+ if ( opaqueObjects.length ) renderObjects( opaqueObjects, scene, camera, overrideMaterial );
|
|
|
+ if ( transparentObjects.length ) renderObjects( transparentObjects, scene, camera, overrideMaterial );
|
|
|
|
|
|
} else {
|
|
|
|
|
|
// opaque pass (front-to-back order)
|
|
|
|
|
|
state.setBlending( NoBlending );
|
|
|
- renderObjects( opaqueObjects, scene, camera );
|
|
|
+ if ( opaqueObjects.length ) renderObjects( opaqueObjects, scene, camera );
|
|
|
|
|
|
// transparent pass (back-to-front order)
|
|
|
|
|
|
- renderObjects( transparentObjects, scene, camera );
|
|
|
+ if ( transparentObjects.length ) renderObjects( transparentObjects, scene, camera );
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -21391,7 +21389,7 @@ function WebGLRenderer( parameters ) {
|
|
|
material.isMeshBasicMaterial ||
|
|
|
material.isMeshStandardMaterial ||
|
|
|
material.isShaderMaterial ||
|
|
|
- object.isSkinnedMesh ) {
|
|
|
+ material.skinning ) {
|
|
|
|
|
|
p_uniforms.setValue( _gl, 'viewMatrix', camera.matrixWorldInverse );
|
|
|
|
|
|
@@ -21406,7 +21404,7 @@ function WebGLRenderer( parameters ) {
|
|
|
// auto-setting of texture unit for bone texture must go before other textures
|
|
|
// not sure why, but otherwise weird things happen
|
|
|
|
|
|
- if ( object.isSkinnedMesh ) {
|
|
|
+ if ( material.skinning ) {
|
|
|
|
|
|
p_uniforms.setOptional( _gl, object, 'bindMatrix' );
|
|
|
p_uniforms.setOptional( _gl, object, 'bindMatrixInverse' );
|
|
|
@@ -21415,8 +21413,35 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
if ( skeleton ) {
|
|
|
|
|
|
+ var bones = skeleton.bones;
|
|
|
+
|
|
|
if ( capabilities.floatVertexTextures ) {
|
|
|
|
|
|
+ if ( skeleton.boneTexture === undefined ) {
|
|
|
+
|
|
|
+ // layout (1 matrix = 4 pixels)
|
|
|
+ // RGBA RGBA RGBA RGBA (=> column1, column2, column3, column4)
|
|
|
+ // with 8x8 pixel texture max 16 bones * 4 pixels = (8 * 8)
|
|
|
+ // 16x16 pixel texture max 64 bones * 4 pixels = (16 * 16)
|
|
|
+ // 32x32 pixel texture max 256 bones * 4 pixels = (32 * 32)
|
|
|
+ // 64x64 pixel texture max 1024 bones * 4 pixels = (64 * 64)
|
|
|
+
|
|
|
+
|
|
|
+ var size = Math.sqrt( bones.length * 4 ); // 4 pixels needed for 1 matrix
|
|
|
+ size = _Math.nextPowerOfTwo( Math.ceil( size ) );
|
|
|
+ size = Math.max( size, 4 );
|
|
|
+
|
|
|
+ var boneMatrices = new Float32Array( size * size * 4 ); // 4 floats per RGBA pixel
|
|
|
+ boneMatrices.set( skeleton.boneMatrices ); // copy current values
|
|
|
+
|
|
|
+ var boneTexture = new DataTexture( boneMatrices, size, size, RGBAFormat, FloatType );
|
|
|
+
|
|
|
+ skeleton.boneMatrices = boneMatrices;
|
|
|
+ skeleton.boneTexture = boneTexture;
|
|
|
+ skeleton.boneTextureSize = size;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
p_uniforms.set( _gl, skeleton, 'boneTexture' );
|
|
|
p_uniforms.set( _gl, skeleton, 'boneTextureSize' );
|
|
|
|
|
|
@@ -28127,6 +28152,7 @@ RawShaderMaterial.prototype.isRawShaderMaterial = true;
|
|
|
* wireframe: <boolean>,
|
|
|
* wireframeLinewidth: <float>,
|
|
|
*
|
|
|
+ * skinning: <bool>,
|
|
|
* morphTargets: <bool>,
|
|
|
* morphNormals: <bool>
|
|
|
* }
|
|
|
@@ -28182,6 +28208,7 @@ function MeshStandardMaterial( parameters ) {
|
|
|
this.wireframeLinecap = 'round';
|
|
|
this.wireframeLinejoin = 'round';
|
|
|
|
|
|
+ this.skinning = false;
|
|
|
this.morphTargets = false;
|
|
|
this.morphNormals = false;
|
|
|
|
|
|
@@ -28242,6 +28269,7 @@ MeshStandardMaterial.prototype.copy = function ( source ) {
|
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
|
|
|
|
+ this.skinning = source.skinning;
|
|
|
this.morphTargets = source.morphTargets;
|
|
|
this.morphNormals = source.morphNormals;
|
|
|
|
|
|
@@ -28338,6 +28366,7 @@ MeshPhysicalMaterial.prototype.copy = function ( source ) {
|
|
|
* wireframe: <boolean>,
|
|
|
* wireframeLinewidth: <float>,
|
|
|
*
|
|
|
+ * skinning: <bool>,
|
|
|
* morphTargets: <bool>,
|
|
|
* morphNormals: <bool>
|
|
|
* }
|
|
|
@@ -28389,6 +28418,7 @@ function MeshPhongMaterial( parameters ) {
|
|
|
this.wireframeLinecap = 'round';
|
|
|
this.wireframeLinejoin = 'round';
|
|
|
|
|
|
+ this.skinning = false;
|
|
|
this.morphTargets = false;
|
|
|
this.morphNormals = false;
|
|
|
|
|
|
@@ -28445,6 +28475,7 @@ MeshPhongMaterial.prototype.copy = function ( source ) {
|
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
|
|
|
|
+ this.skinning = source.skinning;
|
|
|
this.morphTargets = source.morphTargets;
|
|
|
this.morphNormals = source.morphNormals;
|
|
|
|
|
|
@@ -28509,6 +28540,7 @@ MeshToonMaterial.prototype.copy = function ( source ) {
|
|
|
* wireframe: <boolean>,
|
|
|
* wireframeLinewidth: <float>
|
|
|
*
|
|
|
+ * skinning: <bool>,
|
|
|
* morphTargets: <bool>,
|
|
|
* morphNormals: <bool>
|
|
|
* }
|
|
|
@@ -28536,6 +28568,7 @@ function MeshNormalMaterial( parameters ) {
|
|
|
this.fog = false;
|
|
|
this.lights = false;
|
|
|
|
|
|
+ this.skinning = false;
|
|
|
this.morphTargets = false;
|
|
|
this.morphNormals = false;
|
|
|
|
|
|
@@ -28565,6 +28598,7 @@ MeshNormalMaterial.prototype.copy = function ( source ) {
|
|
|
this.wireframe = source.wireframe;
|
|
|
this.wireframeLinewidth = source.wireframeLinewidth;
|
|
|
|
|
|
+ this.skinning = source.skinning;
|
|
|
this.morphTargets = source.morphTargets;
|
|
|
this.morphNormals = source.morphNormals;
|
|
|
|
|
|
@@ -28604,6 +28638,7 @@ MeshNormalMaterial.prototype.copy = function ( source ) {
|
|
|
* wireframe: <boolean>,
|
|
|
* wireframeLinewidth: <float>,
|
|
|
*
|
|
|
+ * skinning: <bool>,
|
|
|
* morphTargets: <bool>,
|
|
|
* morphNormals: <bool>
|
|
|
* }
|
|
|
@@ -28643,6 +28678,7 @@ function MeshLambertMaterial( parameters ) {
|
|
|
this.wireframeLinecap = 'round';
|
|
|
this.wireframeLinejoin = 'round';
|
|
|
|
|
|
+ this.skinning = false;
|
|
|
this.morphTargets = false;
|
|
|
this.morphNormals = false;
|
|
|
|
|
|
@@ -28687,6 +28723,7 @@ MeshLambertMaterial.prototype.copy = function ( source ) {
|
|
|
this.wireframeLinecap = source.wireframeLinecap;
|
|
|
this.wireframeLinejoin = source.wireframeLinejoin;
|
|
|
|
|
|
+ this.skinning = source.skinning;
|
|
|
this.morphTargets = source.morphTargets;
|
|
|
this.morphNormals = source.morphNormals;
|
|
|
|
|
|
@@ -31823,6 +31860,7 @@ Object.assign( MaterialLoader.prototype, {
|
|
|
if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth;
|
|
|
if ( json.wireframeLinecap !== undefined ) material.wireframeLinecap = json.wireframeLinecap;
|
|
|
if ( json.wireframeLinejoin !== undefined ) material.wireframeLinejoin = json.wireframeLinejoin;
|
|
|
+ if ( json.skinning !== undefined ) material.skinning = json.skinning;
|
|
|
if ( json.morphTargets !== undefined ) material.morphTargets = json.morphTargets;
|
|
|
|
|
|
// for PointsMaterial
|
|
|
@@ -32353,7 +32391,7 @@ function JSONLoader( manager ) {
|
|
|
|
|
|
Object.assign( JSONLoader.prototype, {
|
|
|
|
|
|
- load: function( url, onLoad, onProgress, onError ) {
|
|
|
+ load: function ( url, onLoad, onProgress, onError ) {
|
|
|
|
|
|
var scope = this;
|
|
|
|
|
|
@@ -42224,20 +42262,6 @@ Object.defineProperties( Uniform.prototype, {
|
|
|
|
|
|
Object.defineProperties( Material.prototype, {
|
|
|
|
|
|
- skinning: {
|
|
|
- get: function () {
|
|
|
-
|
|
|
- console.warn( 'THREE.Material: .skinning has been removed.' );
|
|
|
-
|
|
|
- },
|
|
|
- set: function () {
|
|
|
-
|
|
|
- console.warn( 'THREE.Material: .skinning has been removed.' );
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- },
|
|
|
-
|
|
|
wrapAround: {
|
|
|
get: function () {
|
|
|
|
Mr.doob