Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Animation branch #44

Merged
merged 23 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8ade56a
Worked on reworking the animation system
Cooltomten Jul 1, 2023
9646915
Added an icon to animOutput pins, added some animations and a charact…
Cooltomten Aug 2, 2023
9df8a74
Relevant animation nodes now work
Cooltomten Aug 27, 2023
b9db201
Fixed a bug where links would not get removed when multiple pins were…
Cooltomten Aug 31, 2023
b30c018
Started Work on converting Animation state to instead be StateMachine…
Cooltomten Sep 6, 2023
061fc5f
Started adding some utilities for creating enums and worked some on t…
Cooltomten Sep 8, 2023
0f96224
Added Enum define and worked on animation graph
Cooltomten Sep 28, 2023
45eac0b
Can Now save and load newly created animation graphs
Cooltomten Sep 28, 2023
bb32ebf
Merge branch 'main' into Animation-Branch
Cooltomten Sep 28, 2023
6c3bcd5
Upgraded project to 0.1.1
Cooltomten Oct 1, 2023
2e46372
Fixed a bug causing a crash when upgrading the project
Cooltomten Oct 1, 2023
7b955d2
Fixed a bug in imgui node editor causing states not being able to be …
Cooltomten Oct 10, 2023
ab89c01
Fixed the actual bug and reverted the previous false fix
Cooltomten Oct 10, 2023
a39e54d
Fixed a crash when the level saved in user settings fails to load
Cooltomten Oct 11, 2023
f6f59f6
The alias states now work in the state machine
Cooltomten Oct 11, 2023
0c1d46e
Upgrade function for animation graphs to 0.1.2
Cooltomten Oct 17, 2023
3f944b1
Merge remote-tracking branch 'origin/development' into Animation-Branch
Cooltomten Oct 18, 2023
2b7f22a
Started work on Weave
Cooltomten Nov 1, 2023
4cdace7
Move animation graph upgrade to the correct spot
Cooltomten Nov 2, 2023
c8fd620
Merge branch 'development' of https://github.com/ChunkTreasure1/Volt …
Cooltomten Dec 13, 2023
ce9a214
Merge branch 'development' into Animation-Branch
Cooltomten Dec 13, 2023
edf3c51
Merge branch 'Animation-Branch' into development
Cooltomten Dec 13, 2023
3ae4ca5
Fixed some compilation errors
Cooltomten Dec 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Engine/Editor/Textures/Icons/icon_graph_pin_anim_pose.dds
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Metadata:
assetHandle: 5946711586121204777
filePath: Editor/Textures/Icons/icon_graph_pin_anim_pose.dds
type: 16
Dependencies:
[]
Properties:
{}
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Metadata:
assetHandle: 564425915908266328
filePath: Editor/Textures/Icons/icon_graph_pin_anim_pose_filled.dds
type: 16
Dependencies:
[]
Properties:
{}
Git LFS file not shown
Git LFS file not shown
20 changes: 19 additions & 1 deletion Engine/Volt-ScriptCore/Source/Volt/Math/Mathf.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,33 @@ public static Vector3 Clamp(Vector3 value, Vector3 min, Vector3 max)
public static float Abs(float value) => Math.Abs(value);
public static int Abs(int value) => Math.Abs(value);

public static float Pow(float value, float power) => (float)Math.Pow(value, power);




public static Vector3 Abs(Vector3 value)
{
return new Vector3(Math.Abs(value.x), Math.Abs(value.y), Math.Abs(value.z));
}

public static float Lerp(float p1, float p2, float t) => Interpolate.Linear(p1, p2, t);
//lerp angle
public static float LerpAngle(float p1, float p2, float t)
{
float num = Repeat(p2 - p1, 360.0f);
if (num > 180.0f)
{
num -= 360.0f;
}
return p1 + num * Clamp(t, 0.0f, 1.0f);
}

public static float Repeat(float t, float length) => t - Floor(t / length) * length;


public static float BounceOut(float p1, float p2, float t, float duration) => Interpolate.BounceOut(t, p1, p2, duration);
public static float BounceIn(float p1, float p2, float t, float duration)
public static float BounceIn(float p1, float p2, float t, float duration)
{
return p2 - BounceOut(p1, p2, duration - t, duration);
}
Expand Down
Loading