Support for keyframe-animated models.

Closes #16

include/flamegpu/visualiser/config/AgentStateConfig.h

@@ -21,7 +21,11 @@ struct AgentStateConfig {
     AgentStateConfig(const AgentStateConfig &other);
     AgentStateConfig &operator=(const AgentStateConfig &other);
 
-    const char *model_path = nullptr;
+    const char* model_path = nullptr;
+    /**
+     * If set, model is treated as 2-frame animated
+     */
+    const char *model_pathB = nullptr;
     const char *model_texture = nullptr;
     float model_scale[3];
     /**

include/flamegpu/visualiser/config/Stock.h

@@ -54,6 +54,18 @@ const Model PYRAMID{ "resources/pyramid.obj", "" };
  * Made with blender by zeyus (https://github.com/zeyus)
  */
 const Model ARROWHEAD{ "resources/arrowhead.obj", "" };
+/**
+ * Path to model files and optional texture within integrated resources
+ */
+struct KeyFrameModel {
+    const char* modelPathA;
+    const char* modelPathB;
+    const char* texturePath;
+};
+/**
+ * Two frame pedestrian model
+ */
+const KeyFrameModel PEDESTRIAN{ "resources/pedestrian_a.obj", "resources/pedestrian_b.obj", "" };
 }  // namespace Models
 }  // namespace Stock
 }  // namespace visualiser

include/flamegpu/visualiser/config/TexBufferConfig.h

@@ -48,6 +48,10 @@ struct TexBufferConfig {
          * (Alternate to individual scale components)
          */
         UniformScale,
+        /**
+         * Keyframe animation lerp variable
+         */
+        AnimationLerp,
         /**
          * Some other use, e.g. custom shaders in future
          */
@@ -80,6 +84,7 @@ struct TexBufferConfig {
         case Scale_xy: return "_scale_x";
         case Scale_xyz: return "_scale_xyz";
         case UniformScale: return "_scale";
+        case AnimationLerp: return "_animation_lerp";
         // These always get name from elsewhere so return empty string
         case Color:
         case Unknown:
@@ -115,6 +120,7 @@ struct TexBufferConfig {
         case Scale_y:
         case Scale_z:
         case UniformScale:
+        case AnimationLerp:
         case Color:
         case Unknown:
         default:

resources/instanced_default_Tcolor_Tpos_Tdir_Tscale.vert

@@ -15,13 +15,15 @@ out vec2 texCoords;
 out vec4 colorOverride;
 flat out int shaderColor;
 
+vec3 getVertex();
+vec3 getNormal();
 vec3 getScale();
 mat3 getDirection();
 vec3 getPosition();
 vec4 calculateColor();
 void main() {
   // Apply model matrix to raw vertex
-  vec4 vert = _modelMat * vec4(_vertex,1.0f);
+  vec4 vert = _modelMat * vec4(getVertex(),1.0f);
   // Apply a user defined scale multiplier
   vert.xyz *= getScale();
   // Apply a user defined rotation
@@ -37,7 +39,7 @@ void main() {
   gl_Position = _projectionMat * vec4(eyeVertex, 1.0f);
 
   // Calc eye normal
-  eyeNormal = normalize(_normalMat * transpose(inverse(directionMat)) * normalize(_normal));
+  eyeNormal = normalize(_normalMat * transpose(inverse(directionMat)) * normalize(getNormal()));
   // Calc tex coords
   texCoords = _texCoords;
   // Get color

resources/instanced_default_Tpos_Tdir_Tscale.vert

@@ -13,13 +13,15 @@ out vec3 eyeVertex;
 out vec3 eyeNormal;
 out vec2 texCoords;
 
+vec3 getVertex();
+vec3 getNormal();
 vec3 getScale();
 mat3 getDirection();
 vec3 getPosition();
 void main()
 {
   // Apply model matrix to raw vertex
-  vec4 vert = _modelMat * vec4(_vertex,1.0f);
+  vec4 vert = _modelMat * vec4(getVertex(),1.0f);
   // Apply a user defined scale multiplier
   vert.xyz *= getScale();
   // Apply a user defined rotation
@@ -35,7 +37,7 @@ void main()
   gl_Position = _projectionMat * vec4(eyeVertex, 1.0f);
 
   // Calc eye normal
-  eyeNormal = normalize(_normalMat * transpose(inverse(directionMat)) * normalize(_normal));
+  eyeNormal = normalize(_normalMat * transpose(inverse(directionMat)) * normalize(getNormal()));
   // Calc tex coords
   texCoords = _texCoords;
 }