|
@@ -4381,8 +4381,6 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
skinning: material.skinning,
|
|
skinning: material.skinning,
|
|
maxBones: maxBones,
|
|
maxBones: maxBones,
|
|
useVertexTexture: _supportsBoneTextures && object && object.useVertexTexture,
|
|
useVertexTexture: _supportsBoneTextures && object && object.useVertexTexture,
|
|
- boneTextureWidth: object && object.boneTextureWidth,
|
|
|
|
- boneTextureHeight: object && object.boneTextureHeight,
|
|
|
|
|
|
|
|
morphTargets: material.morphTargets,
|
|
morphTargets: material.morphTargets,
|
|
morphNormals: material.morphNormals,
|
|
morphNormals: material.morphNormals,
|
|
@@ -4541,6 +4539,18 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if ( p_uniforms.boneTextureWidth !== null ) {
|
|
|
|
+
|
|
|
|
+ _gl.uniform1i( p_uniforms.boneTextureWidth, object.boneTextureWidth );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if ( p_uniforms.boneTextureHeight !== null ) {
|
|
|
|
+
|
|
|
|
+ _gl.uniform1i( p_uniforms.boneTextureHeight, object.boneTextureHeight );
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
} else {
|
|
} else {
|
|
|
|
|
|
if ( p_uniforms.boneGlobalMatrices !== null ) {
|
|
if ( p_uniforms.boneGlobalMatrices !== null ) {
|
|
@@ -5755,8 +5765,6 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
|
|
|
|
parameters.skinning ? "#define USE_SKINNING" : "",
|
|
parameters.skinning ? "#define USE_SKINNING" : "",
|
|
parameters.useVertexTexture ? "#define BONE_TEXTURE" : "",
|
|
parameters.useVertexTexture ? "#define BONE_TEXTURE" : "",
|
|
- parameters.boneTextureWidth ? "#define N_BONE_PIXEL_X " + parameters.boneTextureWidth.toFixed( 1 ) : "",
|
|
|
|
- parameters.boneTextureHeight ? "#define N_BONE_PIXEL_Y " + parameters.boneTextureHeight.toFixed( 1 ) : "",
|
|
|
|
|
|
|
|
parameters.morphTargets ? "#define USE_MORPHTARGETS" : "",
|
|
parameters.morphTargets ? "#define USE_MORPHTARGETS" : "",
|
|
parameters.morphNormals ? "#define USE_MORPHNORMALS" : "",
|
|
parameters.morphNormals ? "#define USE_MORPHNORMALS" : "",
|
|
@@ -5922,6 +5930,8 @@ THREE.WebGLRenderer = function ( parameters ) {
|
|
if ( parameters.useVertexTexture ) {
|
|
if ( parameters.useVertexTexture ) {
|
|
|
|
|
|
identifiers.push( 'boneTexture' );
|
|
identifiers.push( 'boneTexture' );
|
|
|
|
+ identifiers.push( 'boneTextureWidth' );
|
|
|
|
+ identifiers.push( 'boneTextureHeight' );
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
|
|