@quenty/camera 14.20.0 → 14.20.1

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.
 
+## [14.20.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/camera@14.20.0...@quenty/camera@14.20.1) (2025-04-05)
+
+
+### Bug Fixes
+
+* Add types to packages ([2374fb2](https://github.com/Quenty/NevermoreEngine/commit/2374fb2b043cfbe0e9b507b3316eec46a4e353a0))
+
+
+
+
+
 # [14.20.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/camera@14.19.2...@quenty/camera@14.20.0) (2025-04-02)
 
 **Note:** Version bump only for package @quenty/camera

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/camera",
-  "version": "14.20.0",
+  "version": "14.20.1",
   "description": "Quenty's camera system for Roblox",
   "keywords": [
     "Roblox",
@@ -25,26 +25,26 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/acceltween": "^2.5.0",
-    "@quenty/baseobject": "^10.8.0",
-    "@quenty/cframeutils": "^5.5.1",
-    "@quenty/cubicspline": "^10.8.0",
-    "@quenty/ducktype": "^5.8.1",
-    "@quenty/inputobjectutils": "^4.18.0",
-    "@quenty/loader": "^10.8.0",
-    "@quenty/maid": "^3.4.0",
-    "@quenty/math": "^2.7.1",
-    "@quenty/qframe": "^10.10.1",
-    "@quenty/servicebag": "^11.11.1",
-    "@quenty/spring": "^10.8.1",
-    "@quenty/valueobject": "^13.17.0",
-    "@quenty/vector3utils": "^10.8.1"
+    "@quenty/acceltween": "^2.5.1",
+    "@quenty/baseobject": "^10.8.1",
+    "@quenty/cframeutils": "^5.5.2",
+    "@quenty/cubicspline": "^10.8.1",
+    "@quenty/ducktype": "^5.8.2",
+    "@quenty/inputobjectutils": "^4.18.1",
+    "@quenty/loader": "^10.8.1",
+    "@quenty/maid": "^3.4.1",
+    "@quenty/math": "^2.7.2",
+    "@quenty/qframe": "^10.10.2",
+    "@quenty/servicebag": "^11.11.2",
+    "@quenty/spring": "^10.8.2",
+    "@quenty/valueobject": "^13.17.1",
+    "@quenty/vector3utils": "^10.8.2"
   },
   "devDependencies": {
-    "@quenty/camerastoryutils": "^10.10.1"
+    "@quenty/camerastoryutils": "^10.10.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e8ea56930e65322fcffc05a1556d5df988068f0b"
+  "gitHead": "78c3ac0ab08dd18085b6e6e6e4f745e76ed99f68"
 }

package/src/Client/CameraStack.lua

@@ -9,17 +9,27 @@ local HttpService = game:GetService("HttpService")
 local BaseObject = require("BaseObject")
 local CustomCameraEffect = require("CustomCameraEffect")
 local DuckTypeUtils = require("DuckTypeUtils")
+local _Maid = require("Maid")
 
 local CameraStack = setmetatable({}, BaseObject)
 CameraStack.ClassName = "CameraStack"
 CameraStack.__index = CameraStack
 
+export type CameraStack = typeof(setmetatable(
+	{} :: {
+		_maid: _Maid.Maid,
+		_stack: { any },
+		_disabledSet: { [string]: boolean },
+	},
+	{ __index = CameraStack }
+))
+
 --[=[
 	Constructs a new camera stack
 
 	@return CameraStack
 ]=]
-function CameraStack.new()
+function CameraStack.new(): CameraStack
 	local self = setmetatable(BaseObject.new(), CameraStack)
 
 	self._stack = {}
@@ -32,7 +42,7 @@ end
 	@param value any
 	@return boolean
 ]=]
-function CameraStack.isCameraStack(value)
+function CameraStack.isCameraStack(value: any): boolean
 	return DuckTypeUtils.isImplementation(CameraStack, value)
 end
 
@@ -40,7 +50,7 @@ end
 	Pushes a disable state onto the camera stack
 	@return function -- Function to cancel disable
 ]=]
-function CameraStack:PushDisable()
+function CameraStack:PushDisable(): () -> ()
 	assert(self._stack, "Not initialized")
 
 	local disabledKey = HttpService:GenerateGUID(false)
@@ -54,10 +64,10 @@ end
 --[=[
 	Outputs the camera stack. Intended for diagnostics.
 ]=]
-function CameraStack:PrintCameraStack()
+function CameraStack:PrintCameraStack(): ()
 	assert(self._stack, "Stack is not initialized yet")
 
-	for _, value in pairs(self._stack) do
+	for _, value in self._stack do
 		print(tostring(type(value) == "table" and value.ClassName or tostring(value)))
 	end
 end
@@ -80,7 +90,7 @@ function CameraStack:GetTopState()
 	assert(self._stack, "Stack is not initialized yet")
 
 	if next(self._disabledSet) then
-		return
+		return nil
 	end
 
 	if #self._stack > 10 then
@@ -100,6 +110,8 @@ function CameraStack:GetTopState()
 		warn("[CameraStack] - Bad type on top of stack")
 		return nil
 	end
+
+	return nil
 end
 
 --[=[
@@ -116,7 +128,7 @@ function CameraStack:GetNewStateBelow()
 	return CustomCameraEffect.new(function()
 		local index = self:GetIndex(_stateToUse)
 		if index then
-			local below = self._stack[index-1]
+			local below = self._stack[index - 1]
 			if below then
 				return below.CameraState or below
 			else
@@ -127,9 +139,10 @@ function CameraStack:GetNewStateBelow()
 			warn(string.format("[CameraStack] - Could not get state from %q, returning default", tostring(_stateToUse)))
 			return self._stack[1].CameraState
 		end
-	end), function(newStateToUse)
-		_stateToUse = newStateToUse
-	end
+	end),
+		function(newStateToUse)
+			_stateToUse = newStateToUse
+		end
 end
 
 --[=[
@@ -138,14 +151,16 @@ end
 	@return number? -- index
 
 ]=]
-function CameraStack:GetIndex(state)
+function CameraStack:GetIndex(state): number?
 	assert(self._stack, "Stack is not initialized yet")
 
-	for index, value in pairs(self._stack) do
+	for index, value in self._stack do
 		if value == state then
 			return index
 		end
 	end
+
+	return nil
 end
 
 --[=[

package/src/Client/CameraStackService.lua

@@ -26,7 +26,7 @@ CameraStackService.ServiceName = "CameraStackService"
 	Initializes a new camera stack. Should be done via the ServiceBag.
 	@param serviceBag ServiceBag
 ]=]
-function CameraStackService:Init(serviceBag)
+function CameraStackService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(ServiceBag.isServiceBag(serviceBag), "Not a valid service bag")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 

package/src/Client/CameraState.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Data container for the state of a camera.
 	@class CameraState
@@ -12,24 +13,42 @@ local DuckTypeUtils = require("DuckTypeUtils")
 local CameraState = {}
 CameraState.ClassName = "CameraState"
 
+export type CameraState = typeof(setmetatable(
+	{} :: {
+		CameraFrame: CameraFrame.CameraFrame,
+		CameraFrameDerivative: CameraFrame.CameraFrame,
+		CFrame: CFrame,
+		Position: Vector3,
+		Velocity: Vector3,
+		FieldOfView: number,
+	},
+	{ __index = CameraState }
+))
+
 --[=[
 	Constructs a new CameraState
-	@param cameraFrame CameraFrame | Camera
+	@param cameraFrame (CameraFrame | Camera)?
 	@param cameraFrameDerivative CameraFrame?
 	@return CameraState
 ]=]
-function CameraState.new(cameraFrame, cameraFrameDerivative)
-	local self = setmetatable({}, CameraState)
+function CameraState.new(
+	cameraFrame: (CameraFrame.CameraFrame | Camera)?,
+	cameraFrameDerivative: CameraFrame.CameraFrame?
+): CameraState
+	local self = setmetatable({} :: any, CameraState)
 
 	if typeof(cameraFrame) == "Instance" then
 		assert(cameraFrame:IsA("Camera"))
 
-		cameraFrame = CameraFrame.new(QFrame.fromCFrameClosestTo(cameraFrame.CFrame, QFrame.new()), cameraFrame.FieldOfView)
+		cameraFrame =
+			CameraFrame.new(QFrame.fromCFrameClosestTo(cameraFrame.CFrame, QFrame.new()), cameraFrame.FieldOfView)
 	end
 
 	assert(CameraFrame.isCameraFrame(cameraFrame) or type(cameraFrame) == "nil", "Bad cameraFrame")
-	assert(CameraFrame.isCameraFrame(cameraFrameDerivative) or type(cameraFrameDerivative) == "nil",
-		"Bad cameraFrameDerivative")
+	assert(
+		CameraFrame.isCameraFrame(cameraFrameDerivative) or type(cameraFrameDerivative) == "nil",
+		"Bad cameraFrameDerivative"
+	)
 
 	self.CameraFrame = cameraFrame or CameraFrame.new()
 	self.CameraFrameDerivative = cameraFrameDerivative or CameraFrame.new()
@@ -42,7 +61,7 @@ end
 	@param value any
 	@return boolean
 ]=]
-function CameraState.isCameraState(value)
+function CameraState.isCameraState(value: any): boolean
 	return DuckTypeUtils.isImplementation(CameraState, value)
 end
 
@@ -88,7 +107,7 @@ end
 	Set another camera state. Typically used to set Workspace.CurrentCamera's state to match this camera's state
 	@param camera Camera -- A CameraState to set, also accepts a Roblox Camera
 ]=]
-function CameraState:Set(camera)
+function CameraState:Set(camera: Camera)
 	camera.FieldOfView = self.FieldOfView
 	camera.CFrame = self.CFrame
 end

package/src/Client/CameraUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Utility methods for cameras. These are great for viewport frames.
 
@@ -28,8 +29,12 @@ local CameraUtils = {}
 	@param size Vector3
 	@return number
 ]=]
-function CameraUtils.getCubeoidDiameter(size)
-	return math.sqrt(size.x^2 + size.y^2 + size.z^2)
+function CameraUtils.getCubeoidDiameter(size: Vector3): number
+	local x = size.X
+	local y = size.Y
+	local z = size.Z
+
+	return math.sqrt(x * x + y * y + z * z)
 end
 
 --[=[
@@ -41,8 +46,8 @@ end
 	@param aspectRatio number -- Aspect ratio of the screen
 	@return number -- Distance to move the camera back from the bounding box
 ]=]
-function CameraUtils.fitBoundingBoxToCamera(size, fovDeg, aspectRatio)
-	local radius = CameraUtils.getCubeoidDiameter(size)/2
+function CameraUtils.fitBoundingBoxToCamera(size: Vector3, fovDeg: number, aspectRatio: number): number
+	local radius = CameraUtils.getCubeoidDiameter(size) / 2
 	return CameraUtils.fitSphereToCamera(radius, fovDeg, aspectRatio)
 end
 
@@ -55,7 +60,7 @@ end
 	@param aspectRatio number -- Aspect ratio of the screen
 	@return number -- Distance to move the camera back from the bounding box
 ]=]
-function CameraUtils.fitSphereToCamera(radius, fovDeg, aspectRatio)
+function CameraUtils.fitSphereToCamera(radius: number, fovDeg: number, aspectRatio: number): number
 	local halfFov = 0.5 * math.rad(fovDeg)
 	if aspectRatio < 1 then
 		halfFov = math.atan(aspectRatio * math.tan(halfFov))
@@ -71,7 +76,7 @@ end
 	@param position Vector3
 	@return boolean
 ]=]
-function CameraUtils.isOnScreen(camera, position)
+function CameraUtils.isOnScreen(camera: Camera, position: Vector3): boolean
 	local _, onScreen = camera:WorldToScreenPoint(position)
 	return onScreen
 end

package/src/Client/CameraUtils.story.lua

@@ -8,24 +8,22 @@ local Maid = require("Maid")
 
 local CameraUtils = require("CameraUtils")
 
-return function(target)
+return function(target: Instance)
 	local maid = Maid.new()
 
-	local viewportFrame = Instance.new("ViewportFrame")
+	local viewportFrame = maid:Add(Instance.new("ViewportFrame"))
 	viewportFrame.BorderSizePixel = 0
 	viewportFrame.BackgroundColor3 = Color3.new(0.7, 0.7, 0.7)
 	viewportFrame.Size = UDim2.new(1, 0, 1, 0)
-	maid:GiveTask(viewportFrame)
 
-	local camera = Instance.new("Camera")
+	local camera: Camera = maid:Add(Instance.new("Camera"))
 	camera.FieldOfViewMode = Enum.FieldOfViewMode.Diagonal
 	camera.FieldOfView = 70
 	viewportFrame.CurrentCamera = camera
-	maid:GiveTask(camera)
 
 	local radius = 5
 
-	local ball = Instance.new("Part")
+	local ball: Part = maid:Add(Instance.new("Part"))
 	ball.Color = Color3.new(1, 0.5, 0.5)
 	ball.Size = Vector3.new(2*radius, 2*radius, 2*radius)
 	ball.Shape = Enum.PartType.Ball

package/src/Client/Controls/CameraControls.lua

@@ -70,17 +70,17 @@ end
 	Sets the gamepad rotation acceleration
 	@param acceleration number
 ]=]
-function CameraControls:SetGamepadRotationAcceleration(acceleration)
+function CameraControls:SetGamepadRotationAcceleration(acceleration: number)
 	assert(type(acceleration) == "number", "Bad acceleration")
 
 	self._gamepadRotateModel:SetAcceleration(acceleration)
 end
 
-function CameraControls:GetKey()
+function CameraControls:GetKey(): string
 	return self._key
 end
 
-function CameraControls:IsEnabled()
+function CameraControls:IsEnabled(): boolean
 	return self._enabled
 end
 

package/src/Client/Controls/GamepadRotateModel.lua

@@ -40,7 +40,7 @@ end
 
 	@param acceleration number
 ]=]
-function GamepadRotateModel:SetAcceleration(acceleration)
+function GamepadRotateModel:SetAcceleration(acceleration: number)
 	assert(type(acceleration) == "number", "Bad acceleration")
 
 	self._rampVelocityX.a = acceleration

package/src/Client/Effects/DefaultCamera.lua

@@ -18,6 +18,8 @@ local Maid = require("Maid")
 local CFrameUtils = require("CFrameUtils")
 local CameraFrame = require("CameraFrame")
 local ValueObject = require("ValueObject")
+local _Rx = require("Rx")
+local _Observable = require("Observable")
 
 local EPSILON = 0.001
 
@@ -73,7 +75,7 @@ DefaultCamera.OverrideCameraState = DefaultCamera.SetRobloxCameraState
 
 	@param cframe CFrame
 ]=]
-function DefaultCamera:SetRobloxCFrame(cframe)
+function DefaultCamera:SetRobloxCFrame(cframe: CFrame)
 	self._cameraState.CFrame = cframe
 end
 
@@ -91,7 +93,7 @@ end
 
 	@param cameraFrame CameraState | nil
 ]=]
-function DefaultCamera:SetLastSetCameraFrame(cameraFrame)
+function DefaultCamera:SetLastSetCameraFrame(cameraFrame: CameraFrame.CameraFrame)
 	self._lastCameraFrame = CameraFrame.new(cameraFrame.QFrame, cameraFrame.FieldOfView)
 end
 
@@ -107,7 +109,7 @@ end
 
 	@return Observable<boolean>
 ]=]
-function DefaultCamera:ObserveIsFirstPerson()
+function DefaultCamera:ObserveIsFirstPerson(): _Observable.Observable<boolean>
 	return self._isFirstPerson:Observe()
 end
 
@@ -117,7 +119,7 @@ end
 	@param predicate ((inFirstPerson: boolean) -> boolean)?
 	@return Observable<Brio<boolean>>
 ]=]
-function DefaultCamera:ObserveIsFirstPersonBrio(predicate)
+function DefaultCamera:ObserveIsFirstPersonBrio(predicate: _Rx.Predicate<boolean>?)
 	return self._isFirstPerson:Observe(predicate)
 end
 

package/src/Client/Effects/ImpulseCamera.lua

@@ -73,7 +73,7 @@ function ImpulseCamera:_getSpring(speed, damper)
 	speed = speed or self._defaultSpring.Speed
 	damper = damper or self._defaultSpring.Damper
 
-	for _, spring in pairs(self._springs) do
+	for _, spring in self._springs do
 		if math.abs(spring.Speed - speed) <= EPSILON and math.abs(spring.Damper - damper) <= EPSILON then
 			return spring
 		end

package/src/Client/Utility/CameraFrame.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Represents a camera state at a certain point. Can perform math on this state.
 	@class CameraFrame
@@ -12,14 +13,43 @@ local CameraFrame = {}
 CameraFrame.ClassName = "CameraFrame"
 CameraFrame.__index = CameraFrame
 
+export type CameraFrame = typeof(setmetatable(
+	{} :: {
+		--[=[
+			@prop CFrame CFrame
+			@within CameraFrame
+		]=]
+		CFrame: CFrame,
+
+		--[=[
+			@prop Position Vector3
+			@within CameraFrame
+		]=]
+		Position: Vector3,
+
+		--[=[
+			@prop FieldOfView number
+			@within CameraFrame
+		]=]
+		FieldOfView: number,
+
+		--[=[
+			@prop QFrame QFrame
+			@within CameraFrame
+		]=]
+		QFrame: QFrame.QFrame,
+	},
+	{ __index = CameraFrame }
+))
+
 --[=[
 	Constructs a new CameraFrame
 	@param qFrame QFrame
 	@param fieldOfView number
 	@return CameraFrame
 ]=]
-function CameraFrame.new(qFrame, fieldOfView)
-	local self = setmetatable({}, CameraFrame)
+function CameraFrame.new(qFrame: QFrame.QFrame?, fieldOfView: number?): CameraFrame
+	local self: CameraFrame = setmetatable({} :: any, CameraFrame)
 
 	self.QFrame = qFrame or QFrame.new()
 	self.FieldOfView = fieldOfView or 0
@@ -32,36 +62,11 @@ end
 	@param value any
 	@return boolean
 ]=]
-function CameraFrame.isCameraFrame(value)
+function CameraFrame.isCameraFrame(value: any): boolean
 	return DuckTypeUtils.isImplementation(CameraFrame, value)
 end
 
---[=[
-	@prop CFrame CFrame
-	@within CameraFrame
-]=]
-
---[=[
-	@prop Position Vector3
-	@within CameraFrame
-]=]
-
---[=[
-	@prop FieldOfView number
-	@within CameraFrame
-]=]
-
---[=[
-	@prop QFrame QFrame
-	@within CameraFrame
-]=]
-
---[=[
-	@prop QFrame QFrame
-	@within CameraFrame
-]=]
-
-function CameraFrame:__index(index)
+(CameraFrame :: any).__index = function(self, index): any
 	if index == "CFrame" then
 		local result = QFrame.toCFrame(self.QFrame)
 		if not result then
@@ -95,7 +100,7 @@ function CameraFrame:__newindex(index, value)
 		assert(typeof(value) == "Vector3", "Bad value")
 
 		local q = self.QFrame
-		rawset(self, "QFrame", QFrame.new(value.x, value.y, value.z, q.W, q.X, q.Y, q.Z))
+		rawset(self, "QFrame", QFrame.new(value.X, value.Y, value.Z, q.W, q.X, q.Y, q.Z))
 	elseif index == "FieldOfView" or index == "QFrame" then
 		rawset(self, index, value)
 	else
@@ -109,9 +114,8 @@ end
 	@param b CameraFrame
 	@return CameraFrame
 ]=]
-function CameraFrame.__add(a, b)
-	assert(CameraFrame.isCameraFrame(a) and CameraFrame.isCameraFrame(b),
-		"CameraFrame + non-CameraFrame attempted")
+function CameraFrame.__add(a: CameraFrame, b: CameraFrame): CameraFrame
+	assert(CameraFrame.isCameraFrame(a) and CameraFrame.isCameraFrame(b), "CameraFrame + non-CameraFrame attempted")
 
 	return CameraFrame.new(a.QFrame + b.QFrame, a.FieldOfView + b.FieldOfView)
 end
@@ -122,9 +126,8 @@ end
 	@param b CameraFrame
 	@return CameraFrame
 ]=]
-function CameraFrame.__sub(a, b)
-	assert(CameraFrame.isCameraFrame(a) and CameraFrame.isCameraFrame(b),
-		"CameraFrame - non-CameraFrame attempted")
+function CameraFrame.__sub(a: CameraFrame, b: CameraFrame): CameraFrame
+	assert(CameraFrame.isCameraFrame(a) and CameraFrame.isCameraFrame(b), "CameraFrame - non-CameraFrame attempted")
 
 	return CameraFrame.new(a.QFrame - b.QFrame, a.FieldOfView - b.FieldOfView)
 end
@@ -134,7 +137,7 @@ end
 	@param a CameraFrame
 	@return CameraFrame
 ]=]
-function CameraFrame.__unm(a)
+function CameraFrame.__unm(a: CameraFrame): CameraFrame
 	return CameraFrame.new(-a.QFrame, -a.FieldOfView)
 end
 
@@ -144,13 +147,13 @@ end
 	@param b CameraFrame | number
 	@return CameraFrame
 ]=]
-function CameraFrame.__mul(a, b)
+function CameraFrame.__mul(a: CameraFrame | number, b: CameraFrame | number): CameraFrame
 	if type(a) == "number" and CameraFrame.isCameraFrame(b) then
-		return CameraFrame.new(a*b.QFrame, a*b.FieldOfView)
+		return CameraFrame.new(a * (b :: CameraFrame).QFrame, a * (b :: CameraFrame).FieldOfView)
 	elseif CameraFrame.isCameraFrame(b) and type(b) == "number" then
-		return CameraFrame.new(a.QFrame*b, a.FieldOfView*b)
+		return CameraFrame.new((a :: CameraFrame).QFrame * b, (a :: CameraFrame).FieldOfView * b)
 	elseif CameraFrame.isCameraFrame(a) and CameraFrame.isCameraFrame(b) then
-		return CameraFrame.new(a.QFrame*b.QFrame, a.FieldOfView*b.FieldOfView)
+		return CameraFrame.new((a :: CameraFrame).QFrame * b.QFrame, (a :: CameraFrame).FieldOfView * b.FieldOfView)
 	else
 		error("CameraFrame * non-CameraFrame attempted")
 	end
@@ -162,9 +165,9 @@ end
 	@param b number
 	@return CameraFrame
 ]=]
-function CameraFrame.__div(a, b)
+function CameraFrame.__div(a: CameraFrame, b: CameraFrame): CameraFrame
 	if CameraFrame.isCameraFrame(a) and type(b) == "number" then
-		return CameraFrame.new(a.QFrame/b, a.FieldOfView/b)
+		return CameraFrame.new(a.QFrame / b, a.FieldOfView / b)
 	else
 		error("CameraFrame * non-CameraFrame attempted")
 	end
@@ -176,9 +179,9 @@ end
 	@param b number
 	@return CameraFrame
 ]=]
-function CameraFrame.__pow(a, b)
+function CameraFrame.__pow(a: CameraFrame, b: number): CameraFrame
 	if CameraFrame.isCameraFrame(a) and type(b) == "number" then
-		return CameraFrame.new(a.QFrame^b, a.FieldOfView^b)
+		return CameraFrame.new(a.QFrame ^ b, a.FieldOfView ^ b)
 	else
 		error("CameraFrame ^ non-CameraFrame attempted")
 	end
@@ -190,7 +193,7 @@ end
 	@param b CameraFrame
 	@return boolean
 ]=]
-function CameraFrame.__eq(a, b)
+function CameraFrame.__eq(a: CameraFrame, b: CameraFrame): boolean
 	return a.QFrame == b.QFrame and a.FieldOfView == b.FieldOfView
 end
 

package/src/Client/Utility/CameraStateTweener.lua

@@ -26,7 +26,7 @@ CameraStateTweener.__index = CameraStateTweener
 	@param speed number? -- Speed that the camera tweener tweens at. Defaults to 20
 	@return CameraStateTweener
 ]=]
-function CameraStateTweener.new(serviceBagOrCameraStack, cameraEffect, speed)
+function CameraStateTweener.new(serviceBagOrCameraStack, cameraEffect, speed: number?)
 	local self = setmetatable(BaseObject.new(), CameraStateTweener)
 
 	assert(cameraEffect, "No cameraEffect")
@@ -65,7 +65,7 @@ end
 	Returns percent visible, from 0 to 1.
 	@return number
 ]=]
-function CameraStateTweener:GetPercentVisible()
+function CameraStateTweener:GetPercentVisible(): number
 	return self._fadeBetween.Value
 end
 
@@ -73,7 +73,7 @@ end
 	Shows the camera to fade in.
 	@param doNotAnimate? boolean -- Optional, defaults to animating
 ]=]
-function CameraStateTweener:Show(doNotAnimate)
+function CameraStateTweener:Show(doNotAnimate: boolean?)
 	self:SetTarget(1, doNotAnimate)
 end
 
@@ -81,7 +81,7 @@ end
 	Hides the camera to fade in.
 	@param doNotAnimate? boolean -- Optional, defaults to animating
 ]=]
-function CameraStateTweener:Hide(doNotAnimate)
+function CameraStateTweener:Hide(doNotAnimate: boolean?)
 	self:SetTarget(0, doNotAnimate)
 end
 
@@ -89,7 +89,7 @@ end
 	Returns true if we're done hiding
 	@return boolean
 ]=]
-function CameraStateTweener:IsFinishedHiding()
+function CameraStateTweener:IsFinishedHiding(): boolean
 	return self._fadeBetween.HasReachedTarget and self._fadeBetween.Target == 0
 end
 
@@ -97,7 +97,7 @@ end
 	Returns true if we're done showing
 	@return boolean
 ]=]
-function CameraStateTweener:IsFinishedShowing()
+function CameraStateTweener:IsFinishedShowing(): boolean
 	return self._fadeBetween.HasReachedTarget and self._fadeBetween.Target == 1
 end
 
@@ -107,7 +107,7 @@ end
 	@param doNotAnimate boolean? -- Optional, defaults to animating
 	@param callback function
 ]=]
-function CameraStateTweener:Finish(doNotAnimate, callback)
+function CameraStateTweener:Finish(doNotAnimate: boolean?, callback: () -> ())
 	assert(type(callback) == "function", "Bad callback")
 
 	self:Hide(doNotAnimate)
@@ -146,7 +146,7 @@ end
 	@param doNotAnimate boolean? -- Optional, defaults to animating
 	@return CameraStateTweener -- self
 ]=]
-function CameraStateTweener:SetTarget(target, doNotAnimate)
+function CameraStateTweener:SetTarget(target: number, doNotAnimate: boolean?)
 	self._fadeBetween.Target = target or error("No target")
 	if doNotAnimate then
 		self._fadeBetween.Value = self._fadeBetween.Target
@@ -160,7 +160,7 @@ end
 	@param speed number
 	@return CameraStateTweener -- self
 ]=]
-function CameraStateTweener:SetSpeed(speed)
+function CameraStateTweener:SetSpeed(speed: number)
 	assert(type(speed) == "number", "Bad speed")
 
 	self._fadeBetween.Speed = speed
@@ -173,7 +173,7 @@ end
 	@param isVisible boolean
 	@param doNotAnimate boolean? -- Optional, defaults to animating
 ]=]
-function CameraStateTweener:SetVisible(isVisible, doNotAnimate)
+function CameraStateTweener:SetVisible(isVisible: number, doNotAnimate: boolean?)
 	if isVisible then
 		self:Show(doNotAnimate)
 	else

package/src/Client/Utility/FieldOfViewUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Utility functions involving field of view.
 	@class FieldOfViewUtils
@@ -14,8 +15,8 @@ local FieldOfViewUtils = {}
 	@param fov number
 	@return number
 ]=]
-function FieldOfViewUtils.fovToHeight(fov)
-    return 2*math.tan(math.rad(fov)/2)
+function FieldOfViewUtils.fovToHeight(fov: number): number
+	return 2 * math.tan(math.rad(fov) / 2)
 end
 
 --[=[
@@ -23,8 +24,8 @@ end
 	@param height number
 	@return number
 ]=]
-function FieldOfViewUtils.heightToFov(height)
-    return 2*math.deg(math.atan(height/2))
+function FieldOfViewUtils.heightToFov(height: number): number
+	return 2 * math.deg(math.atan(height / 2))
 end
 
 --[=[
@@ -33,10 +34,10 @@ end
 	@param linearAt number
 	@return number
 ]=]
-function FieldOfViewUtils.safeLog(height, linearAt)
+function FieldOfViewUtils.safeLog(height: number, linearAt: number): number
 	if height < linearAt then
-		local slope = 1/linearAt
-		return slope*(height - linearAt) + math.log(linearAt)
+		local slope = 1 / linearAt
+		return slope * (height - linearAt) + math.log(linearAt)
 	else
 		return math.log(height)
 	end
@@ -49,11 +50,11 @@ end
 	@param linearAt number
 	@return number
 ]=]
-function FieldOfViewUtils.safeExp(logHeight, linearAt)
+function FieldOfViewUtils.safeExp(logHeight: number, linearAt: number): number
 	local transitionAt = math.log(linearAt)
 
 	if logHeight <= transitionAt then
-		return linearAt*(logHeight - transitionAt) + linearAt
+		return linearAt * (logHeight - transitionAt) + linearAt
 	else
 		return math.exp(logHeight)
 	end
@@ -66,7 +67,7 @@ end
 	@param percent number
 	@return number -- Fov in degrees
 ]=]
-function FieldOfViewUtils.lerpInHeightSpace(fov0, fov1, percent)
+function FieldOfViewUtils.lerpInHeightSpace(fov0: number, fov1: number, percent: number): number
 	local height0 = FieldOfViewUtils.fovToHeight(fov0)
 	local height1 = FieldOfViewUtils.fovToHeight(fov1)