Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'bugfixes' of git://github.com/intolerantape/FlaxEngine into intolerantape-bugfixes

Browse Source
This commit is contained in:
Wojciech Figat
2021-01-20 13:18:46 +01:00
parent ef5e98efaa 75d197cb84
commit 214ae3c440
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/Surface/AnimGraphSurface.cs
+2 -2
View File
@@ -65,8 +65,8 @@ namespace FlaxEditor.Surface
NodeElementArchetype.Factory.Output(0, "Length", typeof(float), 0),
NodeElementArchetype.Factory.Output(1, "Time", typeof(float), 1),
NodeElementArchetype.Factory.Output(2, "Normalized Time", typeof(float), 2),
NodeElementArchetype.Factory.Output(3, "Reaming Time", typeof(float), 3),
NodeElementArchetype.Factory.Output(4, "Reaming Normalized Time", typeof(float), 4),
NodeElementArchetype.Factory.Output(3, "Remaining Time", typeof(float), 3),
NodeElementArchetype.Factory.Output(4, "Remaining Normalized Time", typeof(float), 4),
}
},
}
Source/Editor/Surface/Archetypes/Animation.cs
+2 -2
View File
@@ -764,8 +764,8 @@ namespace FlaxEditor.Surface.Archetypes
NodeElementArchetype.Factory.Output(0, "Length", typeof(float), 0),
NodeElementArchetype.Factory.Output(1, "Time", typeof(float), 1),
NodeElementArchetype.Factory.Output(2, "Normalized Time", typeof(float), 2),
NodeElementArchetype.Factory.Output(3, "Reaming Time", typeof(float), 3),
NodeElementArchetype.Factory.Output(4, "Reaming Normalized Time", typeof(float), 4),
NodeElementArchetype.Factory.Output(3, "Remaining Time", typeof(float), 3),
NodeElementArchetype.Factory.Output(4, "Remaining Normalized Time", typeof(float), 4),
}
},
new NodeArchetype
Source/Engine/Animations/Graph/AnimGroup.Animation.cpp
+2 -2
View File
@@ -1489,11 +1489,11 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
case 2:
value = transitionsData.Position / transitionsData.Length;
break;
// Reaming Time
// Remaining Time
case 3:
value = transitionsData.Length - transitionsData.Position;
break;
// Reaming Normalized Time
// Remaining Normalized Time
case 4:
value = 1.0f - (transitionsData.Position / transitionsData.Length);
break;