@quenty/camera 7.0.0 → 7.1.1-canary.270.0fe7bd3.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.1-canary.270.0fe7bd3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/camera@7.1.0...@quenty/camera@7.1.1-canary.270.0fe7bd3.0) (2022-07-02)
+
+
+### Bug Fixes
+
+* Can clean up services properly ([eb45e03](https://github.com/Quenty/NevermoreEngine/commit/eb45e03ce2897b18f1ae460974bf2bbb9e27cb97))
+
+
+
+
+
+# [7.1.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/camera@7.0.0...@quenty/camera@7.1.0) (2022-06-21)
+
+
+### Bug Fixes
+
+* Delay CameraStackService starting until start method so that configuration has time to be set ([02d68d1](https://github.com/Quenty/NevermoreEngine/commit/02d68d1d8fbba5b9685c29c503520796c55fa3fa))
+
+
+
+
+
 # [7.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/camera@6.3.0...@quenty/camera@7.0.0) (2022-05-21)
 
 **Note:** Version bump only for package @quenty/camera

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/camera",
-  "version": "7.0.0",
+  "version": "7.1.1-canary.270.0fe7bd3.0",
   "description": "Quenty's camera system for Roblox",
   "keywords": [
     "Roblox",
@@ -25,23 +25,23 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/acceltween": "^2.2.0",
-    "@quenty/baseobject": "^5.0.0",
-    "@quenty/cframeutils": "^4.0.0",
-    "@quenty/cubicspline": "^5.0.0",
-    "@quenty/inputobjectutils": "^3.0.0",
-    "@quenty/loader": "^5.0.0",
-    "@quenty/maid": "^2.3.0",
-    "@quenty/math": "^2.2.0",
-    "@quenty/qframe": "^5.0.0",
-    "@quenty/servicebag": "^5.0.0",
-    "@quenty/spring": "^5.0.0"
+    "@quenty/acceltween": "2.2.0",
+    "@quenty/baseobject": "5.0.0",
+    "@quenty/cframeutils": "4.0.0",
+    "@quenty/cubicspline": "5.0.0",
+    "@quenty/inputobjectutils": "3.0.0",
+    "@quenty/loader": "5.0.0",
+    "@quenty/maid": "2.3.0",
+    "@quenty/math": "2.2.0",
+    "@quenty/qframe": "5.1.0",
+    "@quenty/servicebag": "5.0.0",
+    "@quenty/spring": "5.0.0"
   },
   "devDependencies": {
-    "@quenty/camerastoryutils": "^5.0.0"
+    "@quenty/camerastoryutils": "5.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9f7eaea7543c33c89d2e32c38491b13f9271f4f7"
+  "gitHead": "0fe7bd3216177265038ff7d3f83d1d47e748141c"
 }

package/src/Client/CameraStackService.lua

@@ -15,6 +15,7 @@ local CustomCameraEffect = require("CustomCameraEffect")
 local DefaultCamera = require("DefaultCamera")
 local ImpulseCamera = require("ImpulseCamera")
 local ServiceBag = require("ServiceBag")
+local Maid = require("Maid")
 
 assert(RunService:IsClient(), "[CameraStackService] - Only require CameraStackService on client")
 
@@ -27,29 +28,23 @@ local CameraStackService = {}
 function CameraStackService:Init(serviceBag)
 	assert(ServiceBag.isServiceBag(serviceBag), "Not a valid service bag")
 
+	self._maid = Maid.new()
+	self._key = HttpService:GenerateGUID(false)
+
 	self._stack = {}
 	self._disabledSet = {}
 
 	-- Initialize default cameras
 	self._rawDefaultCamera = DefaultCamera.new()
+	self._maid:GiveTask(self._rawDefaultCamera)
+
 	self._impulseCamera = ImpulseCamera.new()
 	self._defaultCamera = (self._rawDefaultCamera + self._impulseCamera):SetMode("Relative")
 
-	if self._doNotUseDefaultCamera then
-		Workspace.CurrentCamera.CameraType = Enum.CameraType.Scriptable
-
-		-- TODO: Handle camera deleted too!
-		Workspace.CurrentCamera:GetPropertyChangedSignal("CameraType"):Connect(function()
-			Workspace.CurrentCamera.CameraType = Enum.CameraType.Scriptable
-		end)
-	else
-		self._rawDefaultCamera:BindToRenderStep()
-	end
-
 	-- Add camera to stack
 	self:Add(self._defaultCamera)
 
-	RunService:BindToRenderStep("CameraStackUpdateInternal", Enum.RenderPriority.Camera.Value + 75, function()
+	RunService:BindToRenderStep("CameraStackUpdateInternal" .. self._key, Enum.RenderPriority.Camera.Value + 75, function()
 		debug.profilebegin("CameraStackUpdate")
 
 		if next(self._disabledSet) then
@@ -63,6 +58,26 @@ function CameraStackService:Init(serviceBag)
 
 		debug.profileend()
 	end)
+
+	self._maid:GiveTask(function()
+		RunService:UnbindFromRenderStep("CameraStackUpdateInternal" .. self._key)
+	end)
+end
+
+function CameraStackService:Start()
+	self._started = true
+
+	-- TODO: Allow rebinding
+	if self._doNotUseDefaultCamera then
+		Workspace.CurrentCamera.CameraType = Enum.CameraType.Scriptable
+
+		-- TODO: Handle camera deleted too!
+		Workspace.CurrentCamera:GetPropertyChangedSignal("CameraType"):Connect(function()
+			Workspace.CurrentCamera.CameraType = Enum.CameraType.Scriptable
+		end)
+	else
+		self._rawDefaultCamera:BindToRenderStep()
+	end
 end
 
 --[=[
@@ -70,7 +85,7 @@ end
 	@param doNotUseDefaultCamera boolean
 ]=]
 function CameraStackService:SetDoNotUseDefaultCamera(doNotUseDefaultCamera)
-	assert(not self._stack, "Already initialized")
+	assert(not self._started, "Already started")
 
 	self._doNotUseDefaultCamera = doNotUseDefaultCamera
 end
@@ -266,4 +281,8 @@ function CameraStackService:Add(state)
 	table.insert(self._stack, state)
 end
 
+function CameraStackService:Destroy()
+	self._maid:DoCleaning()
+end
+
 return CameraStackService

package/src/Client/Effects/DefaultCamera.lua

@@ -10,6 +10,7 @@ local require = require(script.Parent.loader).load(script)
 
 local RunService = game:GetService("RunService")
 local Workspace = game:GetService("Workspace")
+local HttpService = game:GetService("HttpService")
 
 local CameraState = require("CameraState")
 local SummedCamera = require("SummedCamera")
@@ -25,6 +26,7 @@ DefaultCamera.ClassName = "DefaultCamera"
 function DefaultCamera.new()
 	local self = setmetatable({}, DefaultCamera)
 
+	self._key = HttpService:GenerateGUID(false)
 	self._cameraState = CameraState.new(Workspace.CurrentCamera)
 
 	return self
@@ -54,11 +56,11 @@ end
 	:::
 ]=]
 function DefaultCamera:BindToRenderStep()
-	RunService:BindToRenderStep("DefaultCamera_Preupdate", Enum.RenderPriority.Camera.Value-2, function()
+	RunService:BindToRenderStep("DefaultCamera_Preupdate" .. self._key, Enum.RenderPriority.Camera.Value-2, function()
 		self._cameraState:Set(Workspace.CurrentCamera)
 	end)
 
-	RunService:BindToRenderStep("DefaultCamera_PostUpdate", Enum.RenderPriority.Camera.Value+2, function()
+	RunService:BindToRenderStep("DefaultCamera_PostUpdate" .. self._key, Enum.RenderPriority.Camera.Value+2, function()
 		self._cameraState = CameraState.new(Workspace.CurrentCamera)
 	end)
 
@@ -69,8 +71,15 @@ end
 	Unbinds the camera from the RunService
 ]=]
 function DefaultCamera:UnbindFromRenderStep()
-	RunService:UnbindFromRenderStep("DefaultCamera_Preupdate")
-	RunService:UnbindFromRenderStep("DefaultCamera_PostUpdate")
+	RunService:UnbindFromRenderStep("DefaultCamera_Preupdate" .. self._key)
+	RunService:UnbindFromRenderStep("DefaultCamera_PostUpdate" .. self._key)
+end
+
+--[=[
+	Cleans up the binding
+]=]
+function DefaultCamera:Destroy()
+	self:UnbindFromRenderStep()
 end
 
 --[=[