diff options
author | WasabiRaptor <ketchupraptor@gmail.com> | 2025-05-18 22:49:02 -0400 |
---|---|---|
committer | WasabiRaptor <ketchupraptor@gmail.com> | 2025-05-18 22:49:02 -0400 |
commit | 5eff2ae0115eb64509480efc0f9ada0f5f199846 (patch) | |
tree | e6b5ca7dfd3ad5db336a9f1902be2298c1e06609 /source/game | |
parent | c5788fd8495406d7e44bc55a8a531431c4afaee8 (diff) |
make next frame property accessible to script
Diffstat (limited to 'source/game')
-rw-r--r-- | source/game/StarNetworkedAnimator.cpp | 3 | ||||
-rw-r--r-- | source/game/StarNetworkedAnimator.hpp | 1 | ||||
-rw-r--r-- | source/game/scripting/StarScriptedAnimatorLuaBindings.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/source/game/StarNetworkedAnimator.cpp b/source/game/StarNetworkedAnimator.cpp index c30a508..45553eb 100644 --- a/source/game/StarNetworkedAnimator.cpp +++ b/source/game/StarNetworkedAnimator.cpp @@ -349,6 +349,9 @@ StringList NetworkedAnimator::partNames() const { Json NetworkedAnimator::stateProperty(String const& stateType, String const& propertyName) const { return m_animatedParts.activeState(stateType).properties.value(propertyName); } +Json NetworkedAnimator::stateNextProperty(String const& stateType, String const& propertyName) const { + return m_animatedParts.activeState(stateType).nextProperties.value(propertyName); +} Json NetworkedAnimator::partProperty(String const& partName, String const& propertyName) const { return m_animatedParts.activePart(partName).properties.value(propertyName); diff --git a/source/game/StarNetworkedAnimator.hpp b/source/game/StarNetworkedAnimator.hpp index f91f526..fd84ec1 100644 --- a/source/game/StarNetworkedAnimator.hpp +++ b/source/game/StarNetworkedAnimator.hpp @@ -95,6 +95,7 @@ public: // AnimatedPartSet for the given state or part. If the property does not // exist, returns null. Json stateProperty(String const& stateType, String const& propertyName) const; + Json stateNextProperty(String const& stateType, String const& propertyName) const; Json partProperty(String const& partName, String const& propertyName) const; // Returns the transformation from flipping and zooming that is applied to diff --git a/source/game/scripting/StarScriptedAnimatorLuaBindings.cpp b/source/game/scripting/StarScriptedAnimatorLuaBindings.cpp index e093360..db0237d 100644 --- a/source/game/scripting/StarScriptedAnimatorLuaBindings.cpp +++ b/source/game/scripting/StarScriptedAnimatorLuaBindings.cpp @@ -22,6 +22,8 @@ LuaCallbacks LuaBindings::makeScriptedAnimatorCallbacks(NetworkedAnimator* netwo callbacks.registerCallbackWithSignature<Json, String, String>( "animationStateProperty", bind(&NetworkedAnimator::stateProperty, networkedAnimator, _1, _2)); + callbacks.registerCallbackWithSignature<Json, String, String>( + "animationStateNextProperty", bind(&NetworkedAnimator::stateNextProperty, networkedAnimator, _1, _2)); callbacks.registerCallbackWithSignature<int, String>( "animationState", bind(&NetworkedAnimator::state, networkedAnimator, _1)); callbacks.registerCallbackWithSignature<int, String>( |