@quenty/animations 1.5.0 → 1.5.1-canary.417.052e8ba.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.1-canary.417.052e8ba.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/animations@1.5.0...@quenty/animations@1.5.1-canary.417.052e8ba.0) (2023-10-11)
+
+
+### Features
+
+* Add AnimationSlotPlayer:AdjustSpeed(id, speed) ([bd59858](https://github.com/Quenty/NevermoreEngine/commit/bd598582df448591a71996b6198ac3ba40f03404))
+
+
+
+
+
 # [1.5.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/animations@1.4.0...@quenty/animations@1.5.0) (2023-09-21)
 
 **Note:** Version bump only for package @quenty/animations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/animations",
-  "version": "1.5.0",
+  "version": "1.5.1-canary.417.052e8ba.0",
   "description": "Utility methods for playing back animations on Roblox",
   "keywords": [
     "Roblox",
@@ -25,20 +25,20 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^6.3.0",
-    "@quenty/enumutils": "^3.1.0",
-    "@quenty/humanoidanimatorutils": "^2.2.0",
-    "@quenty/loader": "^6.3.0",
-    "@quenty/maid": "^2.6.0",
-    "@quenty/promise": "^6.8.0",
-    "@quenty/promisemaid": "^1.3.0",
-    "@quenty/rbxasset": "^1.2.0",
-    "@quenty/rx": "^7.16.0",
-    "@quenty/signal": "^2.4.0",
-    "@quenty/valueobject": "^7.24.0"
+    "@quenty/baseobject": "6.3.1-canary.417.052e8ba.0",
+    "@quenty/enumutils": "3.1.0",
+    "@quenty/humanoidanimatorutils": "2.2.1-canary.417.052e8ba.0",
+    "@quenty/loader": "6.3.1-canary.417.052e8ba.0",
+    "@quenty/maid": "2.6.0",
+    "@quenty/promise": "6.8.1-canary.417.052e8ba.0",
+    "@quenty/promisemaid": "1.3.1-canary.417.052e8ba.0",
+    "@quenty/rbxasset": "1.2.1-canary.417.052e8ba.0",
+    "@quenty/rx": "7.16.1-canary.417.052e8ba.0",
+    "@quenty/signal": "2.4.1-canary.417.052e8ba.0",
+    "@quenty/valueobject": "7.24.1-canary.417.052e8ba.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fd634d0ed1918fc14bae8501aff1cc099d0537e7"
+  "gitHead": "052e8ba33437f71398c4c08c8dbcbf076022d388"
 }

package/src/Shared/AnimationSlotPlayer.lua

@@ -9,6 +9,7 @@ local AnimationUtils = require("AnimationUtils")
 local ValueObject = require("ValueObject")
 local Maid = require("Maid")
 local EnumUtils = require("EnumUtils")
+local RbxAssetUtils = require("RbxAssetUtils")
 
 local AnimationSlotPlayer = setmetatable({}, BaseObject)
 AnimationSlotPlayer.ClassName = "AnimationSlotPlayer"
@@ -17,14 +18,10 @@ AnimationSlotPlayer.__index = AnimationSlotPlayer
 function AnimationSlotPlayer.new(animationTarget)
 	local self = setmetatable(BaseObject.new(), AnimationSlotPlayer)
 
-	self._animationTarget = ValueObject.new(nil)
-	self._maid:GiveTask(self._animationTarget)
-
-	self._defaultFadeTime = ValueObject.new(0.1, "number")
-	self._maid:GiveTask(self._defaultFadeTime)
-
-	self._defaultAnimationPriority = ValueObject.new(nil)
-	self._maid:GiveTask(self._defaultAnimationPriority)
+	self._animationTarget = self._maid:Add(ValueObject.new(nil))
+	self._defaultFadeTime = self._maid:Add(ValueObject.new(0.1, "number"))
+	self._defaultAnimationPriority = self._maid:Add(ValueObject.new(nil))
+	self._currentAnimationTrackData = self._maid:Add(ValueObject.new(nil))
 
 	if animationTarget then
 		self:SetAnimationTarget(animationTarget)
@@ -47,6 +44,45 @@ function AnimationSlotPlayer:SetAnimationTarget(animationTarget)
 	self._animationTarget:Mount(animationTarget)
 end
 
+function AnimationSlotPlayer:AdjustSpeed(id, speed)
+	assert(RbxAssetUtils.isConvertableToRbxAsset(id), "Bad id")
+	assert(type(speed) == "number", "Bad number")
+
+	local animationId = RbxAssetUtils.toRbxAssetId(id)
+
+	local topMaid = Maid.new()
+
+	topMaid:GiveTask(self._currentAnimationTrackData:ObserveBrio(function(data)
+		return data and data.animationId == animationId
+	end):Subscribe(function(brio)
+		if brio:IsDead() then
+			return
+		end
+
+		local data = brio:GetValue()
+		local maid = brio:ToMaid()
+
+		data.track:AdjustSpeed(speed)
+
+		-- TODO: Use stack here?
+		-- TODO: Probably need rogue property mechanisms
+		maid:GiveTask(function()
+			if math.abs(data.track.Speed - speed) <= 1e-3 then
+				data.track:AdjustSpeed(data.originalSpeed)
+			end
+		end)
+	end))
+
+	-- TODO: Probably per-a-track instead of global like this
+	self._maid._currentSpeedAdjustment = topMaid
+
+	return function()
+		if self._maid._currentSpeedAdjustment == topMaid then
+			self._maid._currentSpeedAdjustment = nil
+		end
+	end
+end
+
 function AnimationSlotPlayer:Play(id, fadeTime, weight, speed, priority)
 	fadeTime = fadeTime or self._defaultFadeTime.Value
 	priority = priority or self._defaultAnimationPriority.Value
@@ -54,6 +90,8 @@ function AnimationSlotPlayer:Play(id, fadeTime, weight, speed, priority)
 
 	local topMaid = Maid.new()
 
+	local animationId = RbxAssetUtils.toRbxAssetId(id)
+
 	topMaid:GiveTask(self._animationTarget:ObserveBrio(function(target)
 		return target ~= nil
 	end):Subscribe(function(brio)
@@ -64,8 +102,23 @@ function AnimationSlotPlayer:Play(id, fadeTime, weight, speed, priority)
 		local animationTarget = brio:GetValue()
 		local maid = brio:ToMaid()
 
-		local track = AnimationUtils.playAnimation(animationTarget, id, fadeTime, weight, speed, priority)
+		local track = AnimationUtils.playAnimation(animationTarget, animationId, fadeTime, weight, speed, priority)
 		if track then
+			local data = {
+				animationId = animationId;
+				track = track;
+				originalSpeed = speed;
+				originalWeight = weight;
+				originalPriority = priority;
+			}
+
+			self._currentAnimationTrackData.Value = data
+			maid:GiveTask(function()
+				if self._currentAnimationTrackData.Value == data then
+					self._currentAnimationTrackData.Value = nil
+				end
+			end)
+
 			maid:GiveTask(function()
 				track:AdjustWeight(0, fadeTime or self._defaultFadeTime.Value)
 			end)