@quenty/animationgroup 10.2.0 → 10.3.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [10.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/animationgroup@10.2.0...@quenty/animationgroup@10.3.0) (2024-05-09)
+
+
+### Bug Fixes
+
+* Fix .package-lock.json replicating in packages ([75d0efe](https://github.com/Quenty/NevermoreEngine/commit/75d0efeef239f221d93352af71a5b3e930ec23c5))
+
+
+### Features
+
+* Allow tracks to be set in the AnimationGroup ([b51619a](https://github.com/Quenty/NevermoreEngine/commit/b51619add82097b5bc7449a21a9fd202374cd7bb))
+
+
+
+
+
 # [10.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/animationgroup@10.1.0...@quenty/animationgroup@10.2.0) (2024-04-27)
 
 **Note:** Version bump only for package @quenty/animationgroup

package/default.project.json

@@ -1,5 +1,6 @@
 {
   "name": "animationgroup",
+  "globIgnorePaths": [ "**/.package-lock.json" ],
   "tree": {
     "$path": "src"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/animationgroup",
-  "version": "10.2.0",
+  "version": "10.3.0",
   "description": "A group of weighted tracks that can be played back with weighted probability. The closest example to this is the idle animation that looks around at a 1:10 ratio when you're standing still in default Roblox animation script.",
   "keywords": [
     "Roblox",
@@ -26,13 +26,13 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/animationtrackutils": "^2.1.1",
-    "@quenty/baseobject": "^10.2.0",
-    "@quenty/loader": "^10.2.0",
-    "@quenty/maid": "^3.1.0"
+    "@quenty/animationtrackutils": "^2.2.0",
+    "@quenty/baseobject": "^10.3.0",
+    "@quenty/loader": "^10.3.0",
+    "@quenty/maid": "^3.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5c9eab1eac73f0d54953cca5017b7be968182f72"
+  "gitHead": "3fd5cdca3128bf34c8d9dfae1e92d62533b6e6f5"
 }

package/src/Shared/AnimationGroup.lua

@@ -23,10 +23,10 @@ AnimationGroup.__index = AnimationGroup
 function AnimationGroup.new(weightedTracks)
 	local self = setmetatable(BaseObject.new(), AnimationGroup)
 
-	self._weightedTracks = weightedTracks or error("No tracksWithWeight")
-	for _, animation in pairs(self._weightedTracks) do
-		assert(animation.track, "Bad animation.track")
-		assert(animation.weight, "Bad animation.weight")
+	self._weightedTracks = {}
+
+	if weightedTracks then
+		self:SetWeightedTracks(weightedTracks)
 	end
 
 	self._maid:GiveTask(function()
@@ -41,17 +41,41 @@ end
 	@param transitionTime number
 ]=]
 function AnimationGroup:Play(transitionTime)
+	assert(type(transitionTime) == "number" or transitionTime == nil, "Bad transitionTime")
+
 	if self._currentTrack and self._currentTrack.IsPlaying then
 		return
 	end
 
 	self:_playNewTrack(transitionTime)
 end
+
+--[=[
+	@param weightedTracks { WeightedTrack }
+	@param transitionTime number | nil
+]=]
+function AnimationGroup:SetWeightedTracks(weightedTracks, transitionTime)
+	assert(type(weightedTracks) == "table", "Bad weightedTracks")
+	assert(type(transitionTime) == "number" or transitionTime == nil, "Bad transitionTime")
+
+	for _, animation in pairs(weightedTracks) do
+		assert(animation.track, "Bad animation.track")
+		assert(animation.weight, "Bad animation.weight")
+	end
+
+	self._weightedTracks = weightedTracks
+
+	self:Stop(transitionTime)
+	self:Play(transitionTime)
+end
+
 --[=[
 	Stops the animations
 	@param transitionTime number
 ]=]
 function AnimationGroup:Stop(transitionTime)
+	assert(type(transitionTime) == "number" or transitionTime == nil, "Bad transitionTime")
+
 	if self._currentTrack then
 		self._currentTrack:Stop(transitionTime)
 		self._currentTrack = nil
@@ -59,7 +83,13 @@ function AnimationGroup:Stop(transitionTime)
 end
 
 function AnimationGroup:_playNewTrack(transitionTime)
+	assert(type(transitionTime) == "number" or transitionTime == nil, "Bad transitionTime")
+
 	local trackData = AnimationGroupUtils.selectFromWeightedTracks(self._weightedTracks)
+	if not trackData then
+		return
+	end
+
 	local track = trackData.track or error("No track")
 
 	if self._currentTrack == track and self._currentTrack.IsPlaying then

package/src/Shared/AnimationGroupUtils.lua

@@ -36,6 +36,7 @@ function AnimationGroupUtils.createdWeightedTracks(animatorOrHumanoid, weightedA
 	assert(weightedAnimationList, "Bad weightedAnimationList")
 
 	local tracks = {}
+
 	for _, weightedAnimation in pairs(weightedAnimationList) do
 		assert(weightedAnimation.animationId, "Bad weightedAnimation.animationId")
 		assert(weightedAnimation.weight, "Bad weightedAnimation.weight")
@@ -44,6 +45,7 @@ function AnimationGroupUtils.createdWeightedTracks(animatorOrHumanoid, weightedA
 			AnimationTrackUtils.loadAnimationFromId(animatorOrHumanoid, weightedAnimation.animationId),
 			weightedAnimation.weight))
 	end
+
 	return tracks
 end