|
@@ -60,6 +60,11 @@ export class SkeletonViewer {
|
|
uniform mat4 worldViewProjection;
|
|
uniform mat4 worldViewProjection;
|
|
|
|
|
|
#include<bonesDeclaration>
|
|
#include<bonesDeclaration>
|
|
|
|
+ #if NUM_BONE_INFLUENCERS == 0
|
|
|
|
+ attribute vec4 matricesIndices;
|
|
|
|
+ attribute vec4 matricesWeights;
|
|
|
|
+ #endif
|
|
|
|
+
|
|
#include<instancesDeclaration>
|
|
#include<instancesDeclaration>
|
|
|
|
|
|
varying vec3 vColor;
|
|
varying vec3 vColor;
|
|
@@ -121,7 +126,7 @@ export class SkeletonViewer {
|
|
fragment: 'boneWeights:' + skeleton.name
|
|
fragment: 'boneWeights:' + skeleton.name
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- attributes: ['position', 'normal'],
|
|
|
|
|
|
+ attributes: ['position', 'normal', 'matricesIndices', 'matricesWeights'],
|
|
uniforms: [
|
|
uniforms: [
|
|
'world', 'worldView', 'worldViewProjection', 'view', 'projection', 'viewProjection',
|
|
'world', 'worldView', 'worldViewProjection', 'view', 'projection', 'viewProjection',
|
|
'colorBase', 'colorZero', 'colorQuarter', 'colorHalf', 'colorFull', 'targetBoneIndex'
|
|
'colorBase', 'colorZero', 'colorQuarter', 'colorHalf', 'colorFull', 'targetBoneIndex'
|
|
@@ -195,6 +200,10 @@ export class SkeletonViewer {
|
|
uniform float colorMap[` + ((skeleton.bones.length) * 4) + `];
|
|
uniform float colorMap[` + ((skeleton.bones.length) * 4) + `];
|
|
|
|
|
|
#include<bonesDeclaration>
|
|
#include<bonesDeclaration>
|
|
|
|
+ #if NUM_BONE_INFLUENCERS == 0
|
|
|
|
+ attribute vec4 matricesIndices;
|
|
|
|
+ attribute vec4 matricesWeights;
|
|
|
|
+ #endif
|
|
#include<instancesDeclaration>
|
|
#include<instancesDeclaration>
|
|
|
|
|
|
varying vec3 vColor;
|
|
varying vec3 vColor;
|
|
@@ -242,7 +251,7 @@ export class SkeletonViewer {
|
|
`
|
|
`
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- attributes: ['position', 'normal'],
|
|
|
|
|
|
+ attributes: ['position', 'normal', 'matricesIndices', 'matricesWeights'],
|
|
uniforms: [
|
|
uniforms: [
|
|
'world', 'worldView', 'worldViewProjection', 'view', 'projection', 'viewProjection',
|
|
'world', 'worldView', 'worldViewProjection', 'view', 'projection', 'viewProjection',
|
|
'colorMap'
|
|
'colorMap'
|