|
@@ -22,10 +22,7 @@ THREE.ShaderSkin = {
|
|
|
|
|
|
'skinSimple' : {
|
|
|
|
|
|
- uniforms: THREE.UniformsUtils.merge( [
|
|
|
-
|
|
|
- THREE.UniformsLib[ "fog" ],
|
|
|
- THREE.UniformsLib[ "lights" ],
|
|
|
+ uniforms: Object.assign(
|
|
|
|
|
|
{
|
|
|
|
|
@@ -51,9 +48,12 @@ THREE.ShaderSkin = {
|
|
|
|
|
|
"uWrapRGB": { value: new THREE.Vector3( 0.75, 0.375, 0.1875 ) }
|
|
|
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
+ THREE.UniformsLib[ "fog" ],
|
|
|
+ THREE.UniformsLib[ "lights" ]
|
|
|
|
|
|
- ] ),
|
|
|
+ ),
|
|
|
|
|
|
fragmentShader: [
|
|
|
|
|
@@ -305,10 +305,7 @@ THREE.ShaderSkin = {
|
|
|
|
|
|
'skin' : {
|
|
|
|
|
|
- uniforms: THREE.UniformsUtils.merge( [
|
|
|
-
|
|
|
- THREE.UniformsLib[ "fog" ],
|
|
|
- THREE.UniformsLib[ "lights" ],
|
|
|
+ uniforms: Object.assign(
|
|
|
|
|
|
{
|
|
|
|
|
@@ -333,9 +330,12 @@ THREE.ShaderSkin = {
|
|
|
"uRoughness": { value: 0.15 },
|
|
|
"uSpecularBrightness": { value: 0.75 }
|
|
|
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
+ THREE.UniformsLib[ "fog" ],
|
|
|
+ THREE.UniformsLib[ "lights" ]
|
|
|
|
|
|
- ] ),
|
|
|
+ ),
|
|
|
|
|
|
fragmentShader: [
|
|
|
|