@quenty/flipbook 2.0.1 → 2.0.2

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.
 
+## [2.0.2](https://github.com/Quenty/NevermoreEngine/compare/@quenty/flipbook@2.0.1...@quenty/flipbook@2.0.2) (2023-03-06)
+
+
+### Bug Fixes
+
+* Fix flipbook playback on odd row/column scenarios ([fc60b33](https://github.com/Quenty/NevermoreEngine/commit/fc60b33bf451ac2d9cd0195ebd3a620d2f6c7907))
+
+
+
+
+
 ## [2.0.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/flipbook@2.0.0...@quenty/flipbook@2.0.1) (2023-03-06)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/flipbook",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Handles playing back animated spritesheets",
   "keywords": [
     "Roblox",
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0b66085e66e5bc98bc62f9b10ba73ba80889477f"
+  "gitHead": "4af2ad938d63749844c14c9a6bf80a2804ae9b1d"
 }

package/src/Client/Flipbook.lua

@@ -37,7 +37,7 @@ function Flipbook.new(data)
 		self:SetFrameCount(data.frameCount)
 	else
 		assert(data.columns, "Bad columns")
-		assert(data.columns, "Bad rows")
+		assert(data.rows, "Bad rows")
 
 		self:SetFrameCount(data.rows*data.columns)
 	end
@@ -48,10 +48,10 @@ function Flipbook.new(data)
 
 	do
 		local image = assert(data.image, "Bad image")
-		local rows = assert(data.rows, "Bad rows")
+		local columns = assert(data.columns, "Bad columns")
 		local imageRectSize = assert(data.imageRectSize, "Bad imageRectSize")
 
-		self:_loadFrames(image, rows, imageRectSize)
+		self:_loadFrames(image, columns, imageRectSize)
 	end
 
 	return self
@@ -61,15 +61,15 @@ function Flipbook.isFlipbook(value)
 	return type(value) == "table" and getmetatable(value) == Flipbook
 end
 
-function Flipbook:_loadFrames(image, rows, imageRectSize)
-	assert(type(rows) == "number", "Bad rows")
+function Flipbook:_loadFrames(image, columns, imageRectSize)
+	assert(type(columns) == "number", "Bad columns")
 	assert(typeof(imageRectSize) == "Vector2", "Bad imageRectSize")
 
 	self:SetImageRectSize(imageRectSize)
 
 	for i=0, self._frameCount do
-		local x = i % rows
-		local y = math.floor(i / rows)
+		local x = i % columns
+		local y = math.floor(i / columns)
 		local position = imageRectSize*Vector2.new(x, y)
 
 		local index = i + 1

package/src/Client/Player/FlipbookPlayer.story.lua

@@ -111,19 +111,21 @@ return function(target)
 
 	makeLabel(maid, Flipbook.new({
 		image = "rbxassetid://9234616869";
-		rows = 6;
-		columns = 6;
+		rows = 10;
+		columns = 10;
+		frameCount = 92;
 		imageRectSize = Vector2.new(102, 102);
 		frameRate = 50;
-	}), container, true)
+	}), container, false)
 
 	makeButton(maid, Flipbook.new({
 		image = "rbxassetid://9234616869";
-		rows = 6;
-		columns = 6;
+		rows = 10;
+		columns = 10;
+		frameCount = 92;
 		imageRectSize = Vector2.new(102, 102);
 		frameRate = 60;
-	}), container, true)
+	}), container, false)
 
 	makeButton(maid, Flipbook.new({
 		image = "rbxassetid://5085366281";
@@ -134,6 +136,33 @@ return function(target)
 		frameRate = 20;
 	}), container, true)
 
+	makeLabel(maid, Flipbook.new({
+		image = "rbxassetid://9234616869";
+		rows = 10;
+		columns = 10;
+		frameCount = 92;
+		imageRectSize = Vector2.new(102, 102);
+		frameRate = 50;
+	}), container, false)
+
+	makeLabel(maid, Flipbook.new({
+		image = "rbxassetid://12273540121";
+		rows = 7;
+		columns = 7;
+		frameCount = 45;
+		imageRectSize = Vector2.new(146, 146);
+		frameRate = 30;
+	}), container, false)
+
+	makeLabel(maid, Flipbook.new({
+		image = "rbxassetid://9234650028";
+		columns = 9;
+		rows = 8;
+		frameCount = 66;
+		imageRectSize = Vector2.new(113, 113);
+		frameRate = 60;
+	}), container, false)
+
 	return function()
 		maid:DoCleaning()
 	end