Merge pull request #11317 from Corollarium/vat

Baked vertex animation textures
BabylonJS · Nov 4, 2021 · b6c214f · b6c214f
2 parents c380bc7 + 467fe4c
commit b6c214f
Show file tree

Hide file tree

Showing 46 changed files with 836 additions and 166 deletions.
diff --git a/dist/preview release/what's new.md b/dist/preview release/what's new.md
@@ -9,6 +9,7 @@
 - Add support for up to 6 uv sets in the standard, PBR and node materials ([Popov72](https://github.com/Popov72))
 - Added GUI Editor to easily build GUI controls ([msDestiny14](https://github.com/msDestiny14))
 - Added support for Order Independent Transparency on simple scenes. `scene.useOrderIndependentTransparency = true` now makes transparent meshes shade correctly when stacked onto each other. ([CraigFeldspar](https://github.com/CraigFeldspar))
+- Added vertex animation textures with `BakedVertexAnimationManager` ([brunobg](https://github.com/brunobg), [Popov72](https://github.com/Popov72), [raggar](https://github.com/raggar))
 
 ## Updates
 

diff --git a/materialsLibrary/src/cell/cell.vertex.fx b/materialsLibrary/src/cell/cell.vertex.fx
@@ -16,6 +16,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -53,6 +54,7 @@ void main(void) {
 
 #include<instancesVertex>
 #include<bonesVertex>
+#include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/fire/fire.vertex.fx b/materialsLibrary/src/fire/fire.vertex.fx
@@ -13,6 +13,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -53,6 +54,7 @@ void main(void) {
 
 #include<instancesVertex>
 #include<bonesVertex>
+#include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/fur/fur.vertex.fx b/materialsLibrary/src/fur/fur.vertex.fx
@@ -15,6 +15,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 uniform float furLength;
@@ -73,6 +74,7 @@ void main(void) {
 
 	#include<instancesVertex>
     #include<bonesVertex>
+    #include<bakedVertexAnimation>
 
 //FUR
 float r = Rand(position);

diff --git a/materialsLibrary/src/gradient/gradient.vertex.fx b/materialsLibrary/src/gradient/gradient.vertex.fx
@@ -16,6 +16,7 @@ attribute vec2 uv2;
 attribute vec4 color;
 #endif
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -45,7 +46,8 @@ varying vec4 vColor;
 
 void main(void) {
 #include<instancesVertex>
-#include<bonesVertex> 
+#include<bonesVertex>
+#include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/lava/lava.vertex.fx b/materialsLibrary/src/lava/lava.vertex.fx
@@ -21,6 +21,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -166,6 +167,7 @@ void main(void) {
 
 #include<instancesVertex>
 #include<bonesVertex>
+#include<bakedVertexAnimation>
 
 #ifdef NORMAL
     // get a turbulent 3d noise using the normal, normal to high freq

diff --git a/materialsLibrary/src/mix/mix.vertex.fx b/materialsLibrary/src/mix/mix.vertex.fx
@@ -16,6 +16,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -50,6 +51,7 @@ varying vec4 vColor;
 void main(void) {
 	#include<instancesVertex>
     #include<bonesVertex>
+    #include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/normal/normal.vertex.fx b/materialsLibrary/src/normal/normal.vertex.fx
@@ -16,6 +16,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -48,6 +49,7 @@ void main(void) {
 
 #include<instancesVertex>
 #include<bonesVertex>
+#include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/shadowOnly/shadowOnly.vertex.fx b/materialsLibrary/src/shadowOnly/shadowOnly.vertex.fx
@@ -7,6 +7,7 @@ attribute vec3 normal;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -38,6 +39,7 @@ void main(void) {
 
 #include<instancesVertex>
 #include<bonesVertex>
+#include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/simple/simple.vertex.fx b/materialsLibrary/src/simple/simple.vertex.fx
@@ -16,6 +16,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -53,6 +54,7 @@ void main(void) {
 
 #include<instancesVertex>
 #include<bonesVertex>
+#include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/terrain/terrain.vertex.fx b/materialsLibrary/src/terrain/terrain.vertex.fx
@@ -16,6 +16,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -50,6 +51,7 @@ varying vec4 vColor;
 void main(void) {
 	#include<instancesVertex>
     #include<bonesVertex>
+    #include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/triPlanar/triplanar.vertex.fx b/materialsLibrary/src/triPlanar/triplanar.vertex.fx
@@ -10,6 +10,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -55,6 +56,7 @@ void main(void)
 
 	#include<instancesVertex>
     #include<bonesVertex>
+    #include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 

diff --git a/materialsLibrary/src/water/water.vertex.fx b/materialsLibrary/src/water/water.vertex.fx
@@ -16,6 +16,7 @@ attribute vec4 color;
 #endif
 
 #include<bonesDeclaration>
+#include<bakedVertexAnimationDeclaration>
 
 // Uniforms
 #include<instancesDeclaration>
@@ -74,6 +75,7 @@ void main(void) {
 
     #include<instancesVertex>
     #include<bonesVertex>
+    #include<bakedVertexAnimation>
 
 	vec4 worldPos = finalWorld * vec4(position, 1.0);
 	vPositionW = vec3(worldPos);