Merge pull request #938 from julien-moreau/master

Materials Library: improved rendering of Fur Material

materialsLibrary/dist/babylon.fireMaterial.js

@@ -199,7 +199,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (scene.getCachedMaterial() !== this) {
                 // Textures        

materialsLibrary/dist/babylon.gradientMaterial.js

@@ -321,7 +321,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (scene.getCachedMaterial() !== this) {
                 // Clip plane

materialsLibrary/dist/babylon.lavaMaterial.js

@@ -333,7 +333,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (scene.getCachedMaterial() !== this) {
                 // Textures        

materialsLibrary/dist/babylon.normalMaterial.js

@@ -324,7 +324,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (scene.getCachedMaterial() !== this) {
                 // Textures        

materialsLibrary/dist/babylon.pbrMaterial.js

@@ -672,7 +672,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", this._myScene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (this._myScene.getCachedMaterial() !== this) {
                 if (BABYLON.StandardMaterial.FresnelEnabled) {

materialsLibrary/dist/babylon.simpleMaterial.js

@@ -324,7 +324,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (scene.getCachedMaterial() !== this) {
                 // Textures        

materialsLibrary/dist/babylon.terrainMaterial.js

@@ -340,7 +340,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (scene.getCachedMaterial() !== this) {
                 // Textures        

materialsLibrary/dist/babylon.triPlanarMaterial.js

@@ -341,7 +341,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             this._effect.setFloat("tileSize", this.tileSize);
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/dist/babylon.waterMaterial.js

@@ -410,7 +410,7 @@ var BABYLON;
             this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             if (scene.getCachedMaterial() !== this) {
                 // Textures        

materialsLibrary/materials/fire/babylon.fireMaterial.ts

@@ -253,7 +253,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/materials/fur/babylon.furMaterial.ts

@@ -431,7 +431,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/materials/fur/fur.fragment.fx

@@ -421,7 +421,9 @@ void main(void) {
 		discard;
 	}
 	
-	baseColor = vec4(baseColor.xyz, 1.0 - furOffset);
+    float occlusion = mix(0.0, furTextureColor.b * 1.2, furOffset);
+    
+	baseColor = vec4(baseColor.xyz * occlusion, 1.1 - furOffset);
 	#endif
 
 	// Lighting

materialsLibrary/materials/gradient/babylon.gradientMaterial.ts

@@ -391,7 +391,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/materials/lava/babylon.lavaMaterial.ts

@@ -404,7 +404,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/materials/normal/babylon.normalMaterial.ts

@@ -391,7 +391,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/materials/pbr/babylon.pbrMaterial.ts

@@ -809,7 +809,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (this._myScene.getCachedMaterial() !== (<BABYLON.Material>this)) {

materialsLibrary/materials/simple/babylon.simpleMaterial.ts

@@ -391,7 +391,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/materials/terrain/babylon.terrainMaterial.ts

@@ -417,7 +417,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {

materialsLibrary/materials/triPlanar/babylon.triPlanarMaterial.ts

@@ -419,7 +419,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
             
             this._effect.setFloat("tileSize", this.tileSize);

materialsLibrary/materials/water/babylon.waterMaterial.ts

@@ -487,7 +487,7 @@ module BABYLON {
 
             // Bones
             if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
-                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices());
+                this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
             }
 
             if (scene.getCachedMaterial() !== this) {