From 4048e211c50af86dc278f13b1b2eb2a9ec00b7bf Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Tue, 3 Jun 2025 08:03:18 +1000 Subject: revert networked animator changes for now --- .../scripting/StarNetworkedAnimatorLuaBindings.cpp | 46 +--------------------- 1 file changed, 2 insertions(+), 44 deletions(-) (limited to 'source/game/scripting/StarNetworkedAnimatorLuaBindings.cpp') diff --git a/source/game/scripting/StarNetworkedAnimatorLuaBindings.cpp b/source/game/scripting/StarNetworkedAnimatorLuaBindings.cpp index 49df283..dfafeb0 100644 --- a/source/game/scripting/StarNetworkedAnimatorLuaBindings.cpp +++ b/source/game/scripting/StarNetworkedAnimatorLuaBindings.cpp @@ -8,25 +8,12 @@ namespace Star { LuaCallbacks LuaBindings::makeNetworkedAnimatorCallbacks(NetworkedAnimator* networkedAnimator) { LuaCallbacks callbacks; - callbacks.registerCallbackWithSignature( - "setAnimationState", bind(&NetworkedAnimator::setState, networkedAnimator, _1, _2, _3, _4)); - callbacks.registerCallbackWithSignature( - "setLocalAnimationState", bind(&NetworkedAnimator::setLocalState, networkedAnimator, _1, _2, _3, _4)); + callbacks.registerCallbackWithSignature( + "setAnimationState", bind(&NetworkedAnimator::setState, networkedAnimator, _1, _2, _3)); callbacks.registerCallbackWithSignature( "animationState", bind(&NetworkedAnimator::state, networkedAnimator, _1)); callbacks.registerCallbackWithSignature( "animationStateProperty", bind(&NetworkedAnimator::stateProperty, networkedAnimator, _1, _2)); - callbacks.registerCallbackWithSignature( - "animationStateNextProperty", bind(&NetworkedAnimator::stateNextProperty, networkedAnimator, _1, _2)); - callbacks.registerCallbackWithSignature( - "animationStateFrame", bind(&NetworkedAnimator::stateFrame, networkedAnimator, _1)); - callbacks.registerCallbackWithSignature( - "animationStateFrameProgress", bind(&NetworkedAnimator::stateFrameProgress, networkedAnimator, _1)); - callbacks.registerCallbackWithSignature( - "animationStateTimer", bind(&NetworkedAnimator::stateTimer, networkedAnimator, _1)); - callbacks.registerCallbackWithSignature( - "animationStateReverse", bind(&NetworkedAnimator::stateReverse, networkedAnimator, _1)); - callbacks.registerCallbackWithSignature( "setGlobalTag", bind(&NetworkedAnimator::setGlobalTag, networkedAnimator, _1, _2)); callbacks.registerCallbackWithSignature( @@ -43,7 +30,6 @@ LuaCallbacks LuaBindings::makeNetworkedAnimatorCallbacks(NetworkedAnimator* netw "currentRotationAngle", bind(&NetworkedAnimator::currentRotationAngle, networkedAnimator, _1)); callbacks.registerCallbackWithSignature( "hasTransformationGroup", bind(&NetworkedAnimator::hasTransformationGroup, networkedAnimator, _1)); - callbacks.registerCallbackWithSignature("translateTransformationGroup", bind(&NetworkedAnimator::translateTransformationGroup, networkedAnimator, _1, _2)); callbacks.registerCallback("rotateTransformationGroup", @@ -62,27 +48,6 @@ LuaCallbacks LuaBindings::makeNetworkedAnimatorCallbacks(NetworkedAnimator* netw bind(&NetworkedAnimator::transformTransformationGroup, networkedAnimator, _1, _2, _3, _4, _5, _6, _7)); callbacks.registerCallbackWithSignature( "resetTransformationGroup", bind(&NetworkedAnimator::resetTransformationGroup, networkedAnimator, _1)); - - callbacks.registerCallbackWithSignature("translateLocalTransformationGroup", - bind(&NetworkedAnimator::translateLocalTransformationGroup, networkedAnimator, _1, _2)); - callbacks.registerCallback("rotateLocalTransformationGroup", - [networkedAnimator](String const& transformationGroup, float rotation, Maybe const& rotationCenter) { - networkedAnimator->rotateLocalTransformationGroup(transformationGroup, rotation, rotationCenter.value()); - }); - callbacks.registerCallback("scaleLocalTransformationGroup", - [networkedAnimator](LuaEngine& engine, String const& transformationGroup, LuaValue scale, Maybe const& scaleCenter) { - if (auto cs = engine.luaMaybeTo(scale)) - networkedAnimator->scaleLocalTransformationGroup(transformationGroup, *cs, scaleCenter.value()); - else - networkedAnimator->scaleLocalTransformationGroup(transformationGroup, engine.luaTo(scale), scaleCenter.value()); - }); - callbacks.registerCallbackWithSignature( - "transformLocalTransformationGroup", - bind(&NetworkedAnimator::transformLocalTransformationGroup, networkedAnimator, _1, _2, _3, _4, _5, _6, _7)); - callbacks.registerCallbackWithSignature( - "resetLocalTransformationGroup", bind(&NetworkedAnimator::resetLocalTransformationGroup, networkedAnimator, _1)); - - callbacks.registerCallbackWithSignature( "setParticleEmitterActive", bind(&NetworkedAnimator::setParticleEmitterActive, networkedAnimator, _1, _2)); callbacks.registerCallbackWithSignature("setParticleEmitterEmissionRate", @@ -140,13 +105,6 @@ LuaCallbacks LuaBindings::makeNetworkedAnimatorCallbacks(NetworkedAnimator* netw return poly; }); - callbacks.registerCallbackWithSignature>( - "addPartDrawables", bind(&NetworkedAnimator::addPartDrawables, networkedAnimator, _1, _2)); - callbacks.registerCallbackWithSignature>( - "setPartDrawables", bind(&NetworkedAnimator::setPartDrawables, networkedAnimator, _1, _2)); - - callbacks.registerCallbackWithSignature( - "applyPartTags", bind(&NetworkedAnimator::applyPartTags, networkedAnimator, _1, _2)); return callbacks; } -- cgit v1.2.3