@quenty/camera 14.20.3 → 14.20.4-canary.11a5dcf.0

package/src/Client/Effects/ImpulseCamera.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Add another layer of effects over any other camera by allowing an "impulse"
 	to be applied. Good for shockwaves, camera shake, and recoil.
@@ -7,6 +8,7 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CameraEffectUtils = require("CameraEffectUtils")
 local CameraState = require("CameraState")
 local Spring = require("Spring")
 local SpringUtils = require("SpringUtils")
@@ -17,11 +19,26 @@ local EPSILON = 1e-6
 local ImpulseCamera = {}
 ImpulseCamera.ClassName = "ImpulseCamera"
 
-function ImpulseCamera.new()
-	local self = setmetatable({
-		_springs = {};
-		_defaultSpring = Spring.new(Vector3.zero);
-	}, ImpulseCamera)
+export type ImpulseCamera = typeof(setmetatable(
+	{} :: {
+		CameraState: CameraState.CameraState,
+		Damper: number,
+		Speed: number,
+		Spring: Spring.Spring<Vector3>,
+		_defaultSpring: Spring.Spring<Vector3>,
+		_springs: { Spring.Spring<Vector3> },
+	},
+	{} :: typeof({ __index = ImpulseCamera })
+)) & CameraEffectUtils.CameraEffect
+
+function ImpulseCamera.new(): ImpulseCamera
+	local self: ImpulseCamera = setmetatable(
+		{
+			_springs = {},
+			_defaultSpring = Spring.new(Vector3.zero),
+		} :: any,
+		ImpulseCamera
+	)
 
 	self._defaultSpring.Damper = 0.5
 	self._defaultSpring.Speed = 20
@@ -32,10 +49,10 @@ end
 --[=[
 	Applies an impulse to the camera, shaking it!
 	@param velocity Vector3
-	@param speed number -- Optional
-	@param damper number -- Optional
+	@param speed number? -- Optional
+	@param damper number? -- Optional
 ]=]
-function ImpulseCamera:Impulse(velocity, speed, damper)
+function ImpulseCamera.Impulse(self: ImpulseCamera, velocity: Vector3, speed: number?, damper: number?): ()
 	assert(typeof(velocity) == "Vector3", "Bad velocity")
 	assert(type(speed) == "number" or speed == nil, "Bad speed")
 	assert(type(damper) == "number" or damper == nil, "Bad damper")
@@ -48,28 +65,27 @@ end
 	Applies a random impulse
 
 	@param velocity Vector3
-	@param speed number -- Optional
-	@param damper number -- Optional
+	@param speed number? -- Optional
+	@param damper number? -- Optional
 ]=]
-function ImpulseCamera:ImpulseRandom(velocity, speed, damper)
+function ImpulseCamera.ImpulseRandom(self: ImpulseCamera, velocity: Vector3, speed: number?, damper: number?): ()
 	assert(typeof(velocity) == "Vector3", "Bad velocity")
 	assert(type(speed) == "number" or speed == nil, "Bad speed")
 	assert(type(damper) == "number" or damper == nil, "Bad damper")
 
-	local randomVector = Vector3.new(
-		2*(math.random() - 0.5),
-		2*(math.random() - 0.5),
-		2*(math.random() - 0.5)
-	)
+	local randomVector = Vector3.new(2 * (math.random() - 0.5), 2 * (math.random() - 0.5), 2 * (math.random() - 0.5))
 
-	return self:Impulse(velocity*randomVector, speed, damper)
+	return self:Impulse(velocity * randomVector, speed, damper)
 end
 
-function ImpulseCamera:_getSpring(speed, damper)
-	if (not speed) and (not damper) then
+function ImpulseCamera._getSpring(self: ImpulseCamera, speed: number?, damper: number?)
+	if (not speed) and not damper then
 		return self._defaultSpring
 	end
 
+	assert(speed ~= nil, "Type checker needs assert")
+	assert(damper ~= nil, "Type checker needs assert")
+
 	speed = speed or self._defaultSpring.Speed
 	damper = damper or self._defaultSpring.Damper
 
@@ -92,10 +108,10 @@ function ImpulseCamera:_getSpring(speed, damper)
 	return newSpring
 end
 
-function ImpulseCamera:_aggregateSprings()
+function ImpulseCamera._aggregateSprings(self: ImpulseCamera): Vector3
 	local position = self._defaultSpring.Position
 
-	for i=#self._springs, 1, -1 do
+	for i = #self._springs, 1, -1 do
 		local spring = self._springs[i]
 		local animating, springPosition = SpringUtils.animating(spring, EPSILON)
 
@@ -108,11 +124,11 @@ function ImpulseCamera:_aggregateSprings()
 	return position
 end
 
-function ImpulseCamera:__add(other)
+function ImpulseCamera.__add(self: ImpulseCamera, other)
 	return SummedCamera.new(self, other)
 end
 
-function ImpulseCamera:__newindex(index, value)
+function ImpulseCamera.__newindex(self: ImpulseCamera, index, value)
 	if index == "Damper" then
 		assert(type(value) == "number", "Bad value")
 		self._defaultSpring.Damper = value
@@ -130,14 +146,14 @@ end
 	@prop CameraState CameraState
 	@within ImpulseCamera
 ]=]
-function ImpulseCamera:__index(index)
+function ImpulseCamera.__index(self: ImpulseCamera, index)
 	if index == "CameraState" then
 		local newState = CameraState.new()
 
 		local position = self:_aggregateSprings()
-		newState.CFrame = CFrame.Angles(0, position.y, 0)
-			* CFrame.Angles(position.x, 0, 0)
-			* CFrame.Angles(0, 0, position.z)
+		newState.CFrame = CFrame.Angles(0, position.Y, 0)
+			* CFrame.Angles(position.X, 0, 0)
+			* CFrame.Angles(0, 0, position.Z)
 
 		return newState
 	elseif index == "Damper" then
@@ -151,4 +167,4 @@ function ImpulseCamera:__index(index)
 	end
 end
 
-return ImpulseCamera
+return ImpulseCamera

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

@@ -2,15 +2,16 @@
 	@class ImpulseCamera.story
 ]]
 
-local require = require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
+local require =
+	require(game:GetService("ServerScriptService"):FindFirstChild("LoaderUtils", true).Parent).bootstrapStory(script)
 
 local RunService = game:GetService("RunService")
 local Workspace = game:GetService("Workspace")
 
-local Maid = require("Maid")
 local CameraStack = require("CameraStack")
-local ImpulseCamera = require("ImpulseCamera")
 local DefaultCamera = require("DefaultCamera")
+local ImpulseCamera = require("ImpulseCamera")
+local Maid = require("Maid")
 
 return function(target)
 	local maid = Maid.new()
@@ -67,9 +68,8 @@ return function(target)
 		maid:GiveTask(button.Activated:Connect(impulse))
 	end
 
-
 	makeShaker("Shake", function()
-		impulseCamera:Impulse(Vector3.new(0, math.random() - 0.5, math.random() - 0.5)*50, 50, 0.2)
+		impulseCamera:Impulse(Vector3.new(0, math.random() - 0.5, math.random() - 0.5) * 50, 50, 0.2)
 	end)
 	makeShaker("SHAKE", function()
 		impulseCamera:ImpulseRandom(Vector3.new(0, 3, 0), 75, 0.1)
@@ -78,4 +78,4 @@ return function(target)
 	return function()
 		maid:DoCleaning()
 	end
-end
+end

package/src/Client/Effects/InverseFader.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Be the inverse of a fading camera (makes scaling in cameras easy).
 	@class InverseFader
@@ -5,13 +6,25 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CameraEffectUtils = require("CameraEffectUtils")
+local CameraState = require("CameraState")
+local FadingCamera = require("FadingCamera")
 local SummedCamera = require("SummedCamera")
 
 local InverseFader = {}
 InverseFader.ClassName = "InverseFader"
 
-function InverseFader.new(camera, fader)
-	local self = setmetatable({}, InverseFader)
+export type InverseFader = typeof(setmetatable(
+	{} :: {
+		CameraState: CameraState.CameraState,
+		_camera: CameraEffectUtils.CameraEffect,
+		_fader: FadingCamera.FadingCamera,
+	},
+	{} :: typeof({ __index = InverseFader })
+)) & CameraEffectUtils.CameraEffect
+
+function InverseFader.new(camera: CameraEffectUtils.CameraEffect, fader: FadingCamera.FadingCamera)
+	local self: InverseFader = setmetatable({} :: any, InverseFader)
 
 	self._camera = camera or error("No camera")
 	self._fader = fader or error("No fader")
@@ -19,16 +32,19 @@ function InverseFader.new(camera, fader)
 	return self
 end
 
-function InverseFader:__add(other)
+function InverseFader.__add(self: InverseFader, other)
 	return SummedCamera.new(self, other)
 end
 
-function InverseFader:__index(index)
+function InverseFader.__index(self: InverseFader, index)
 	if index == "CameraState" then
-		return (self._camera.CameraState or self._camera)*(1-self._fader.Value)
+		local cameraState: CameraState.CameraState = (self._camera.CameraState :: any) or (self._camera :: any)
+
+		-- TODO: I think this is actually wrong
+		return (cameraState :: any) * (1 - self._fader.Value)
 	else
 		return InverseFader[index]
 	end
 end
 
-return InverseFader
+return InverseFader

package/src/Client/Effects/LagPointCamera.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Point a current element but lag behind for a smoother experience
 	@class LagPointCamera
@@ -5,15 +6,30 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CameraEffectUtils = require("CameraEffectUtils")
 local CameraState = require("CameraState")
-local SummedCamera = require("SummedCamera")
 local Spring = require("Spring")
+local SummedCamera = require("SummedCamera")
 
 local LagPointCamera = {}
 LagPointCamera.ClassName = "LagPointCamera"
 LagPointCamera._FocusCamera = nil
 LagPointCamera._OriginCamera = nil
 
+export type LagPointCamera = typeof(setmetatable(
+	{} :: {
+		CameraState: CameraState.CameraState,
+		Origin: CameraState.CameraState,
+		FocusCamera: CameraEffectUtils.CameraEffect,
+		OriginCamera: CameraEffectUtils.CameraEffect,
+		FocusSpring: Spring.Spring<Vector3>,
+		LastFocusUpdate: number,
+		FocusPosition: Vector3,
+		Speed: number,
+	},
+	{} :: typeof({ __index = LagPointCamera })
+)) & CameraEffectUtils.CameraEffect
+
 --[=[
 	Camera that lags behind the actual camera.
 
@@ -21,8 +37,11 @@ LagPointCamera._OriginCamera = nil
 	@param focusCamera CameraEffect -- The Camera to look at.
 	@return LagPointCamera
 ]=]
-function LagPointCamera.new(originCamera, focusCamera)
-	local self = setmetatable({}, LagPointCamera)
+function LagPointCamera.new(
+	originCamera: CameraEffectUtils.CameraEffect,
+	focusCamera: CameraEffectUtils.CameraEffect
+): LagPointCamera
+	local self: LagPointCamera = setmetatable({} :: any, LagPointCamera)
 
 	self.FocusSpring = Spring.new(Vector3.zero)
 	self.OriginCamera = originCamera or error("Must have originCamera")
@@ -32,11 +51,11 @@ function LagPointCamera.new(originCamera, focusCamera)
 	return self
 end
 
-function LagPointCamera:__add(other)
+function LagPointCamera.__add(self: LagPointCamera, other)
 	return SummedCamera.new(self, other)
 end
 
-function LagPointCamera:__newindex(index, value)
+function LagPointCamera.__newindex(self: LagPointCamera, index, value)
 	if index == "FocusCamera" then
 		rawset(self, "_" .. index, value)
 		self.FocusSpring.Target = self.FocusCamera.CameraState.Position
@@ -49,11 +68,11 @@ function LagPointCamera:__newindex(index, value)
 	elseif index == "Speed" or index == "Damper" or index == "Velocity" then
 		self.FocusSpring[index] = value
 	else
-		error(index .. " is not a valid member of LagPointCamera")
+		error(tostring(index) .. " is not a valid member of LagPointCamera")
 	end
 end
 
-function LagPointCamera:__index(index)
+function LagPointCamera.__index(self: LagPointCamera, index): any
 	if index == "CameraState" then
 		local origin, focusPosition = self.Origin, self.FocusPosition
 
@@ -87,4 +106,4 @@ function LagPointCamera:__index(index)
 	end
 end
 
-return LagPointCamera
+return LagPointCamera

package/src/Client/Effects/OverrideDefaultCameraToo.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Allows you to override the default camera with this cameras
 	information. Useful for custom camera controls that the user
@@ -15,12 +16,24 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CameraEffectUtils = require("CameraEffectUtils")
+local CameraState = require("CameraState")
 local SummedCamera = require("SummedCamera")
 local Vector3Utils = require("Vector3Utils")
 
 local OverrideDefaultCameraToo = {}
 OverrideDefaultCameraToo.ClassName = "OverrideDefaultCameraToo"
 
+export type OverrideDefaultCameraToo = typeof(setmetatable(
+	{} :: {
+		CameraState: CameraState.CameraState,
+		BaseCamera: CameraEffectUtils.CameraEffect,
+		DefaultCamera: CameraEffectUtils.CameraEffect,
+		Predicate: ((CameraState.CameraState) -> boolean)?,
+	},
+	{} :: typeof({ __index = OverrideDefaultCameraToo })
+)) & CameraEffectUtils.CameraEffect
+
 --[=[
 	Initializes a new OverrideDefaultCameraToo
 
@@ -28,8 +41,12 @@ OverrideDefaultCameraToo.ClassName = "OverrideDefaultCameraToo"
 	@param defaultCamera DefaultCamera
 	@param predicate Filter on whether to override or not
 ]=]
-function OverrideDefaultCameraToo.new(baseCamera, defaultCamera, predicate)
-	local self = setmetatable({}, OverrideDefaultCameraToo)
+function OverrideDefaultCameraToo.new(
+	baseCamera: CameraEffectUtils.CameraEffect,
+	defaultCamera: CameraEffectUtils.CameraEffect,
+	predicate
+): OverrideDefaultCameraToo
+	local self: OverrideDefaultCameraToo = setmetatable({} :: any, OverrideDefaultCameraToo)
 
 	self.BaseCamera = assert(baseCamera, "No baseCamera")
 	self.DefaultCamera = assert(defaultCamera, "No defaultCamera")
@@ -60,7 +77,12 @@ function OverrideDefaultCameraToo:__index(index)
 				warn("[OverrideDefaultCameraToo] - No predicate set")
 			end
 
-			local angle = math.abs(Vector3Utils.angleBetweenVectors(result.CFrame:VectorToWorldSpace(Vector3.new(0, 0, -1)), Vector3.new(0, 1, 0)))
+			local angle = math.abs(
+				Vector3Utils.angleBetweenVectors(
+					result.CFrame:VectorToWorldSpace(Vector3.new(0, 0, -1)),
+					Vector3.new(0, 1, 0)
+				)
+			)
 
 			-- If the camera is straight up and down then Roblox breaks
 			if angle >= math.rad(0.1) and angle <= math.rad(179.9) then
@@ -76,4 +98,4 @@ function OverrideDefaultCameraToo:__index(index)
 	end
 end
 
-return OverrideDefaultCameraToo
+return OverrideDefaultCameraToo

package/src/Client/Effects/PointCamera.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Point a current element
 	@class PointCamera
@@ -5,20 +6,35 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CameraEffectUtils = require("CameraEffectUtils")
 local CameraState = require("CameraState")
 local SummedCamera = require("SummedCamera")
 
 local PointCamera = {}
 PointCamera.ClassName = "PointCamera"
 
+export type PointCamera = typeof(setmetatable(
+	{} :: {
+		CameraState: CameraState.CameraState,
+		OriginCamera: CameraEffectUtils.CameraEffect,
+		FocusCamera: CameraEffectUtils.CameraEffect,
+		Origin: CameraState.CameraState,
+		Focus: CameraState.CameraState,
+	},
+	{} :: typeof({ __index = PointCamera })
+)) & CameraEffectUtils.CameraEffect
+
 --[=[
 	Initializes a new PointCamera
 
 	@param originCamera Camera -- A camera to use
 	@param focusCamera Camera -- The Camera to look at.
 ]=]
-function PointCamera.new(originCamera, focusCamera)
-	local self = setmetatable({}, PointCamera)
+function PointCamera.new(
+	originCamera: CameraEffectUtils.CameraEffect,
+	focusCamera: CameraEffectUtils.CameraEffect
+): PointCamera
+	local self: PointCamera = setmetatable({} :: any, PointCamera)
 
 	self.OriginCamera = originCamera or error("Must have originCamera")
 	self.FocusCamera = focusCamera or error("Must have focusCamera")
@@ -26,11 +42,11 @@ function PointCamera.new(originCamera, focusCamera)
 	return self
 end
 
-function PointCamera:__add(other)
+function PointCamera.__add(self: PointCamera, other: CameraEffectUtils.CameraEffect): SummedCamera.SummedCamera
 	return SummedCamera.new(self, other)
 end
 
-function PointCamera:__newindex(index, value)
+function PointCamera.__newindex(self: PointCamera, index, value)
 	if index == "OriginCamera" or index == "FocusCamera" then
 		rawset(self, index, value)
 	else
@@ -38,7 +54,7 @@ function PointCamera:__newindex(index, value)
 	end
 end
 
-function PointCamera:__index(index)
+function PointCamera.__index(self: PointCamera, index)
 	if index == "CameraState" then
 		local origin, focus = self.Origin, self.Focus
 
@@ -56,4 +72,4 @@ function PointCamera:__index(index)
 	end
 end
 
-return PointCamera
+return PointCamera

package/src/Client/Effects/PushCamera.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Like a rotated camera, except we end up pushing back to a default rotation.
 	This same behavior is seen in Roblox vehicle seats
@@ -7,10 +8,11 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CameraEffectUtils = require("CameraEffectUtils")
 local CameraState = require("CameraState")
-local getRotationInXZPlane = require("getRotationInXZPlane")
 local Math = require("Math")
 local SummedCamera = require("SummedCamera")
+local getRotationInXZPlane = require("getRotationInXZPlane")
 
 local PushCamera = {}
 PushCamera.ClassName = "PushCamera"
@@ -25,24 +27,43 @@ PushCamera.DefaultAngleXZ0 = 0
 PushCamera._lastUpdateTime = -1
 PushCamera.PushBackAfter = 0.5
 
+export type PushCamera = typeof(setmetatable(
+	{} :: {
+		CameraState: CameraState.CameraState,
+		AngleX: number,
+		AngleY: number,
+		AngleXZ: number,
+		LastUpdateTime: number,
+		MinX: number,
+		MinY: number,
+		MaxY: number,
+		Rotation: CFrame,
+		CFrame: CFrame,
+		PushBackDelta: number,
+		PercentFaded: number,
+		PercentFadedCurved: number,
+	},
+	{} :: typeof({ __index = PushCamera })
+)) & CameraEffectUtils.CameraEffect
+
 --[=[
 	Constructs a new PushCamera
 	@return PushCamera
 ]=]
-function PushCamera.new()
-	local self = setmetatable({}, PushCamera)
+function PushCamera.new(): PushCamera
+	local self: PushCamera = setmetatable({} :: any, PushCamera)
 
 	return self
 end
 
-function PushCamera:__add(other)
+function PushCamera.__add(self: PushCamera, other)
 	return SummedCamera.new(self, other)
 end
 
 --[=[
 	@param xzrotVector Vector2 -- The delta rotation to apply
 ]=]
-function PushCamera:RotateXY(xzrotVector)
+function PushCamera.RotateXY(self: PushCamera, xzrotVector)
 	self.AngleX = self.AngleX + xzrotVector.x
 	self.AngleY = self.AngleY + xzrotVector.y
 end
@@ -51,29 +72,29 @@ end
 	Prevents the rotation back. You need to call this
 	every frame you want to prevent rotation.
 ]=]
-function PushCamera:StopRotateBack()
+function PushCamera.StopRotateBack(self: PushCamera)
 	self.CFrame = self.CFrame
 end
 
 --[=[
 	Resets to default position automatically
 ]=]
-function PushCamera:Reset()
+function PushCamera.Reset(self: PushCamera)
 	self.LastUpdateTime = 0
 end
 
-function PushCamera:__newindex(index, value)
+function PushCamera.__newindex(self: PushCamera, index, value)
 	if index == "CFrame" then
 		local xzrot = getRotationInXZPlane(value)
-		self.AngleXZ = math.atan2(xzrot.lookVector.x, xzrot.lookVector.z) + math.pi
+		self.AngleXZ = math.atan2(xzrot.LookVector.X, xzrot.LookVector.Z) + math.pi
 
-		local yrot = xzrot:toObjectSpace(value).lookVector.y
+		local yrot = xzrot:ToObjectSpace(value).LookVector.Y
 		self.AngleY = math.asin(yrot)
 	elseif index == "DefaultCFrame" then
 		local xzrot = getRotationInXZPlane(value)
-		self.DefaultAngleXZ0 = math.atan2(xzrot.lookVector.x, xzrot.lookVector.z) + math.pi
+		self.DefaultAngleXZ0 = math.atan2(xzrot.LookVector.X, xzrot.LookVector.Z) + math.pi
 
-		local yrot = xzrot:toObjectSpace(value).lookVector.y
+		local yrot = xzrot:ToObjectSpace(value).LookVector.Y
 		self.AngleY = math.asin(yrot)
 	elseif index == "AngleY" then
 		self._angleY = math.clamp(value, self.MinY, self.MaxY)
@@ -103,7 +124,7 @@ end
 	@prop CameraState CameraState
 	@within PushCamera
 ]=]
-function PushCamera:__index(index)
+function PushCamera.__index(self: PushCamera, index)
 	if index == "CameraState" then
 		local state = CameraState.new()
 		state.CFrame = self.CFrame
@@ -111,7 +132,7 @@ function PushCamera:__index(index)
 	elseif index == "LastUpdateTime" then
 		return self._lastUpdateTime
 	elseif index == "LookVector" then
-		return self.Rotation.lookVector
+		return self.Rotation.LookVector
 	elseif index == "CFrame" then
 		return CFrame.Angles(0, self.AngleXZ, 0) * CFrame.Angles(self.AngleY, 0, 0)
 	elseif index == "AngleY" then

package/src/Client/Effects/RotatedCamera.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Allow freedom of movement around a current place, much like the classic script works now.
 	Not intended to be use with the current character script. This is the rotation component.
@@ -8,13 +9,26 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local CameraEffectUtils = require("CameraEffectUtils")
 local CameraState = require("CameraState")
-local getRotationInXZPlane = require("getRotationInXZPlane")
 local SummedCamera = require("SummedCamera")
+local getRotationInXZPlane = require("getRotationInXZPlane")
 
 local RotatedCamera = {}
 RotatedCamera.ClassName = "RotatedCamera"
 
+export type RotatedCamera = typeof(setmetatable(
+	{} :: {
+		CameraState: CameraState.CameraState,
+		CFrame: CFrame,
+		AngleX: number,
+		AngleY: number,
+		MaxY: number,
+		MinY: number,
+	},
+	{} :: typeof({ __index = RotatedCamera })
+)) & CameraEffectUtils.CameraEffect
+
 -- Max/Min aim up and down
 RotatedCamera._maxY = math.rad(80)
 RotatedCamera._minY = math.rad(-80)
@@ -25,8 +39,8 @@ RotatedCamera._angleY = 0
 	Constructs a new RotatedCamera
 	@return RotatedCamera
 ]=]
-function RotatedCamera.new()
-	local self = setmetatable({}, RotatedCamera)
+function RotatedCamera.new(): RotatedCamera
+	local self: RotatedCamera = setmetatable({} :: any, RotatedCamera)
 
 	return self
 end
@@ -38,17 +52,17 @@ end
 --[=[
 	@param xzrotvector Vector2 -- The delta rotation to apply
 ]=]
-function RotatedCamera:RotateXY(xzrotvector)
-	self.AngleX = self.AngleX + xzrotvector.x
-	self.AngleY = self.AngleY + xzrotvector.y
+function RotatedCamera:RotateXY(xzrotvector: Vector2)
+	self.AngleX = self.AngleX + xzrotvector.X
+	self.AngleY = self.AngleY + xzrotvector.Y
 end
 
 function RotatedCamera:__newindex(index, value)
 	if index == "CFrame" then
 		local zxrot = getRotationInXZPlane(value)
-		self.AngleXZ = math.atan2(zxrot.lookVector.x, zxrot.lookVector.z) + math.pi
+		self.AngleXZ = math.atan2(zxrot.LookVector.X, zxrot.LookVector.Z) + math.pi
 
-		local yrot = zxrot:toObjectSpace(value).lookVector.y
+		local yrot = zxrot:ToObjectSpace(value).LookVector.Y
 		self.AngleY = math.asin(yrot)
 	elseif index == "AngleY" then
 		self._angleY = math.clamp(value, self.MinY, self.MaxY)
@@ -97,4 +111,4 @@ function RotatedCamera:__index(index)
 	end
 end
 
-return RotatedCamera
+return RotatedCamera