@quenty/camera 14.4.0 → 14.5.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.5.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/camera@14.4.0...@quenty/camera@14.5.0) (2024-05-09)
+
+
+### Bug Fixes
+
+* Bootstrap specifically to loader ([7f4d4f9](https://github.com/Quenty/NevermoreEngine/commit/7f4d4f9cd4a6602af8daaf04983bb349dafc7e95))
+* Fix .package-lock.json replicating in packages ([75d0efe](https://github.com/Quenty/NevermoreEngine/commit/75d0efeef239f221d93352af71a5b3e930ec23c5))
+* Fix camera stack return in CameraStackService ([a3b8c67](https://github.com/Quenty/NevermoreEngine/commit/a3b8c6779420143d2aa2ccc979259bb23a130703))
+
+
+### Features
+
+* Adjust camera state tweener to support camera stack ([677b621](https://github.com/Quenty/NevermoreEngine/commit/677b6210bcfe2adfb85a1cadf1006a4642be1ba3))
+
+
+
+
+
 # [14.4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/camera@14.3.0...@quenty/camera@14.4.0) (2024-05-03)
 
 **Note:** Version bump only for package @quenty/camera

package/default.project.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/camera",
-  "version": "14.4.0",
+  "version": "14.5.0",
   "description": "Quenty's camera system for Roblox",
   "keywords": [
     "Roblox",
@@ -25,25 +25,25 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/acceltween": "^2.3.0",
-    "@quenty/baseobject": "^10.2.0",
-    "@quenty/cframeutils": "^5.4.0",
-    "@quenty/cubicspline": "^10.2.0",
-    "@quenty/ducktype": "^5.2.0",
-    "@quenty/inputobjectutils": "^4.3.0",
-    "@quenty/loader": "^10.2.0",
-    "@quenty/maid": "^3.1.0",
-    "@quenty/math": "^2.6.0",
-    "@quenty/qframe": "^10.2.0",
-    "@quenty/servicebag": "^11.3.0",
-    "@quenty/spring": "^10.2.0",
-    "@quenty/vector3utils": "^10.2.0"
+    "@quenty/acceltween": "^2.4.0",
+    "@quenty/baseobject": "^10.3.0",
+    "@quenty/cframeutils": "^5.5.0",
+    "@quenty/cubicspline": "^10.3.0",
+    "@quenty/ducktype": "^5.3.0",
+    "@quenty/inputobjectutils": "^4.4.0",
+    "@quenty/loader": "^10.3.0",
+    "@quenty/maid": "^3.2.0",
+    "@quenty/math": "^2.7.0",
+    "@quenty/qframe": "^10.3.0",
+    "@quenty/servicebag": "^11.4.0",
+    "@quenty/spring": "^10.3.0",
+    "@quenty/vector3utils": "^10.3.0"
   },
   "devDependencies": {
-    "@quenty/camerastoryutils": "^10.2.0"
+    "@quenty/camerastoryutils": "^10.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "afbb66378d568ebb9450db13de0b4fe61113a2f1"
+  "gitHead": "3fd5cdca3128bf34c8d9dfae1e92d62533b6e6f5"
 }

package/src/Client/CameraStack.lua

@@ -8,11 +8,17 @@ local HttpService = game:GetService("HttpService")
 
 local BaseObject = require("BaseObject")
 local CustomCameraEffect = require("CustomCameraEffect")
+local DuckTypeUtils = require("DuckTypeUtils")
 
 local CameraStack = setmetatable({}, BaseObject)
 CameraStack.ClassName = "CameraStack"
 CameraStack.__index = CameraStack
 
+--[=[
+	Constructs a new camera stack
+
+	@return CameraStack
+]=]
 function CameraStack.new()
 	local self = setmetatable(BaseObject.new(), CameraStack)
 
@@ -22,6 +28,14 @@ function CameraStack.new()
 	return self
 end
 
+--[=[
+	@param value any
+	@return boolean
+]=]
+function CameraStack.isCameraStack(value)
+	return DuckTypeUtils.isImplementation(CameraStack, value)
+end
+
 --[=[
 	Pushes a disable state onto the camera stack
 	@return function -- Function to cancel disable

package/src/Client/CameraStackService.lua

@@ -218,14 +218,14 @@ function CameraStackService:GetRawStack()
 end
 
 --[=[
-	Gets the current camera stack
+	Gets the global camera stack for this service
 
 	@return CameraStack
 ]=]
 function CameraStackService:GetCameraStack()
 	assert(self._cameraStack, "Not initialized")
 
-	return self._cameraStack:GetStack()
+	return self._cameraStack
 end
 
 --[=[

package/src/Client/CameraUtils.story.lua

@@ -2,7 +2,7 @@
 	@class CameraUtils.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
+local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
 local Maid = require("Maid")
 

package/src/Client/Effects/ImpulseCamera.story.lua

@@ -2,7 +2,7 @@
 	@class ImpulseCamera.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
+local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
 local RunService = game:GetService("RunService")
 local Workspace = game:GetService("Workspace")

package/src/Client/Utility/CameraFrame.story.lua

@@ -2,7 +2,7 @@
 	@class CameraFrame.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).load(script)
+local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
 local CameraFrame = require("CameraFrame")
 local CameraStoryUtils = require("CameraStoryUtils")

package/src/Client/Utility/CameraStateTweener.lua

@@ -12,6 +12,7 @@ local CameraStackService = require("CameraStackService")
 local FadeBetweenCamera3 = require("FadeBetweenCamera3")
 local ServiceBag = require("ServiceBag")
 local BaseObject = require("BaseObject")
+local CameraStack = require("CameraStack")
 
 local CameraStateTweener = setmetatable({}, BaseObject)
 CameraStateTweener.ClassName = "CameraStateTweener"
@@ -20,33 +21,41 @@ CameraStateTweener.__index = CameraStateTweener
 --[=[
 	Constructs a new camera state tweener
 
-	@param serviceBag ServiceBag -- Service bag to find the CameraStackService in
+	@param serviceBagOrCameraStack ServiceBag | CameraStack -- Service bag to find the CameraStackService in
 	@param cameraEffect CameraLike -- A camera effect
 	@param speed number? -- Speed that the camera tweener tweens at. Defaults to 20
 	@return CameraStateTweener
 ]=]
-function CameraStateTweener.new(serviceBag, cameraEffect, speed)
+function CameraStateTweener.new(serviceBagOrCameraStack, cameraEffect, speed)
 	local self = setmetatable(BaseObject.new(), CameraStateTweener)
 
-	assert(ServiceBag.isServiceBag(serviceBag), "No serviceBag")
 	assert(cameraEffect, "No cameraEffect")
 
-	self._cameraStackService = serviceBag:GetService(CameraStackService)
-	local cameraBelow, assign = self._cameraStackService:GetNewStateBelow()
+	if ServiceBag.isServiceBag(serviceBagOrCameraStack) then
+		self._cameraStack = serviceBagOrCameraStack:GetService(CameraStackService):GetCameraStack()
+	elseif CameraStack.isCameraStack(serviceBagOrCameraStack) then
+		self._cameraStack = serviceBagOrCameraStack
+	else
+		error("Bad serviceBagOrCameraStack")
+	end
+
+	assert(self._cameraStack, "No CameraStack")
+
+	local cameraBelow, assign = self._cameraStack:GetNewStateBelow()
 
 	self._cameraEffect = cameraEffect
 	self._cameraBelow = cameraBelow
 	self._fadeBetween = FadeBetweenCamera3.new(cameraBelow, cameraEffect)
 	assign(self._fadeBetween)
 
-	self._cameraStackService:Add(self._fadeBetween)
+	self._cameraStack:Add(self._fadeBetween)
 
 	self._fadeBetween.Speed = speed or 20
 	self._fadeBetween.Target = 0
 	self._fadeBetween.Value = 0
 
 	self._maid:GiveTask(function()
-		self._cameraStackService:Remove(self._fadeBetween)
+		self._cameraStack:Remove(self._fadeBetween)
 	end)
 
 	return self