Merge branch 'dev-3.0.6' into master

Author: kyaoNV

CHANGELOG.md

@@ -1,3 +1,12 @@
+v3.0.6
+------
+- Changed max bones to 256
+
+Bug Fixes:
+- Updated Slang to 0.10.30. Fixes SceneEditor shaders in Vulkan configs
+- Apply scaling transforms in animations
+- Fixed interpolation issues at the end of animations
+
 v3.0.5
 ------
 - Added support for exporting BMP and TGA images.

Framework/Source/Data/HostDeviceSharedMacros.h

@@ -33,7 +33,7 @@
 *******************************************************************/
 
 #define MAX_INSTANCES 64    ///< Max supported instances per draw call
-#define MAX_BONES 128       ///< Max supported bones per model
+#define MAX_BONES 256       ///< Max supported bones per model
 
 /*******************************************************************
                     Glue code for CPU/GPU compilation

Framework/Source/Falcor.h

@@ -160,5 +160,5 @@
 #define FALCOR_MAJOR_VERSION 3
 #define FALCOR_MINOR_VERSION 0
 #define FALCOR_DEV_STAGE ""
-#define FALCOR_DEV_REVISION 5
-#define FALCOR_VERSION_STRING "3.0.5"
+#define FALCOR_DEV_REVISION 6
+#define FALCOR_VERSION_STRING "3.0.6"

Framework/Source/Graphics/Model/Animation.cpp

@@ -100,19 +100,22 @@ namespace Falcor
             assert(ticks >= curKey.time);
             // Interpolate between them
             float diff = nextKey.time - curKey.time;
-            if(diff < 0)
-            {
-                diff += mDuration;
-            }
-            else if(diff == 0)
+
+            if (diff == 0)
             {
                 curValue = curKey.value;
             }
             else
             {
+                if (diff < 0)
+                {
+                    diff += mDuration;
+                }
+
                 float ratio = (ticks - curKey.time) / diff;
                 curValue = interpolate(curKey.value, nextKey.value, ratio);
             }
+            
             channel.lastKeyUsed = curKeyIndex;
         }
         return curValue;
@@ -131,7 +134,7 @@ namespace Falcor
             glm::mat4 scaling;
             if (Key.scaling.keys.size() > 0)
             {
-                glm::scale(calcCurrentKey(Key.scaling, ticks, Key.lastUpdateTime));
+                scaling = glm::scale(calcCurrentKey(Key.scaling, ticks, Key.lastUpdateTime));
             }
 
             glm::quat q = calcCurrentKey(Key.rotation, ticks, Key.lastUpdateTime);

Samples/Effects/NormalMapFiltering/Data/NormalMapFiltering.ps.hlsl

@@ -29,8 +29,8 @@
         <package name="rapidjson" version="1.1.0" />
     </dependency>
     <dependency name="slang" linkPath="Framework/Externals/Slang">
-        <package name="slang" version="0.10.24" remotes="github-slang" />
-        <package name="slang" version="0.10.24" remotes="github-slang-linux" platforms="linux" />
+        <package name="slang" version="0.10.30" remotes="github-slang" />
+        <package name="slang" version="0.10.30" remotes="github-slang-linux" platforms="linux" />
     </dependency>
     <dependency name="glfw" linkPath="Framework/Externals/GLFW">
         <package name="glfw" version="3.2.1" platforms="win" />