DE12842: Fix zooming while panning.

Author: jmargh

PlayerScripts/PlayerScriptsPlace/StarterPlayer/StarterPlayerScripts/CameraScript/RootCamera.rbxmx

@@ -80,6 +80,7 @@ local function CreateCamera()
 	this.Enabled = false
 	local pinchZoomSpeed = 20
 	local isFirstPerson = false
+	local isRightMouseDown = false
 	this.RotateInput = Vector2.new()
 
 	function this:GetShiftLock()
@@ -197,13 +198,21 @@ local function CreateCamera()
 		return isFirstPerson
 	end
 
+	-- there are several cases to consider based on the state of input and camera rotation mode
 	function this:UpdateMouseBehavior()
-		if self:IsInFirstPerson() then
-			pcall(function() GameSettings.RotationType = Enum.RotationType.CameraRelative end)
-			UserInputService.MouseBehavior = Enum.MouseBehavior.LockCenter
-		elseif not self:GetShiftLock() then
+		-- first time transition to first person mode or shiftlock
+		if isFirstPerson or self:GetShiftLock() then
+			if UserInputService.MouseBehavior ~= Enum.MouseBehavior.LockCenter then
+				pcall(function() GameSettings.RotationType = Enum.RotationType.CameraRelative end)
+				UserInputService.MouseBehavior = Enum.MouseBehavior.LockCenter
+			end
+		else
 			pcall(function() GameSettings.RotationType = Enum.RotationType.MovementRelative end)
-			UserInputService.MouseBehavior = Enum.MouseBehavior.Default
+			if isRightMouseDown then
+				UserInputService.MouseBehavior = Enum.MouseBehavior.LockCurrentPosition
+			else
+				UserInputService.MouseBehavior = Enum.MouseBehavior.Default
+			end	
 		end
 	end
 
@@ -365,22 +374,17 @@ local function CreateCamera()
 
 	local function OnMouse2Down(input, processed)
 		if processed then return end
-		-- Check if they are in first-person
-		if UserInputService.MouseBehavior ~= Enum.MouseBehavior.LockCenter then
-			UserInputService.MouseBehavior = Enum.MouseBehavior.LockCurrentPosition
-		end
+		isRightMouseDown = true
+		this:UpdateMouseBehavior()
 		panBeginLook = this:GetCameraLook()
 		startPos = input.Position
 		lastPos = startPos
 		this.UserPanningTheCamera = true
 	end
 
 	local function OnMouse2Up(input, processed)
-		-- Check if they are in first-person
-		if UserInputService.MouseBehavior ~= Enum.MouseBehavior.LockCenter then
-			UserInputService.MouseBehavior = Enum.MouseBehavior.Default
-		end
-
+		isRightMouseDown = false
+		this:UpdateMouseBehavior()
 		panBeginLook = nil
 		startPos = nil
 		lastPos = nil
@@ -565,7 +569,7 @@ local function CreateCamera()
 		return Vector2.new(0,0)
 	end
 
-	local InputBeganConn, InputChangedConn, InputEndedConn = nil, nil, nil
+	local InputBeganConn, InputChangedConn, InputEndedConn, ShiftLockToggleConn = nil, nil, nil, nil
 
 	function this:DisconnectInputEvents()
 		if InputBeganConn then
@@ -580,6 +584,10 @@ local function CreateCamera()
 			InputEndedConn:disconnect()
 			InputEndedConn = nil
 		end
+		if ShiftLockToggleConn then
+			ShiftLockToggleConn:disconnect()
+			ShiftLockToggleConn = nil
+		end
 		this.TurningLeft = false
 		this.TurningRight = false
 		this.LastCameraTransform = nil
@@ -639,6 +647,10 @@ local function CreateCamera()
 				OnKeyUp(input, processed)
 			end
 		end)
+		
+		ShiftLockToggleConn = ShiftLockController.OnShiftLockToggled.Event:connect(function()
+			this:UpdateMouseBehavior()
+		end)
 
 		this.RotateInput = Vector2.new()
 

PlayerScripts/PlayerScriptsPlace/StarterPlayer/StarterPlayerScripts/CameraScript/ShiftLockController.rbxmx

@@ -42,6 +42,9 @@ local IsShiftLocked = false
 local IsActionBound = false
 local IsInFirstPerson = false
 
+-- Toggle Event
+ShiftLockController.OnShiftLockToggled = Instance.new('BindableEvent')
+
 -- wrapping long conditional in function
 local function isShiftLockMode()
 	return LocalPlayer.DevEnableMouseLock and GameSettings.ControlMode == Enum.ControlMode.MouseLockSwitch and
@@ -65,20 +68,11 @@ local function onShiftLockToggled()
 	if IsShiftLocked then
 		ShiftLockIcon.Image = SHIFT_LOCK_ON
 		Mouse.Icon = SHIFT_LOCK_CURSOR
-		UserInputService.MouseBehavior = Enum.MouseBehavior.LockCenter
-		pcall(function()
-			GameSettings.RotationType = Enum.RotationType.CameraRelative
-		end)
 	else
 		ShiftLockIcon.Image = SHIFT_LOCK_OFF
 		Mouse.Icon = ""
-		if not IsInFirstPerson then
-			UserInputService.MouseBehavior = Enum.MouseBehavior.Default
-			pcall(function()
-				GameSettings.RotationType = Enum.RotationType.MovementRelative
-			end)
-		end
 	end
+	ShiftLockController.OnShiftLockToggled:Fire()
 end
 
 local function initialize()
@@ -121,7 +115,6 @@ end
 
 --[[ Input/Settings Changed Events ]]--
 local mouseLockSwitchFunc = function(actionName, inputState, inputObject)
-
 	if IsShiftLockMode then
 		onShiftLockToggled()
 	end
@@ -130,15 +123,13 @@ end
 local function disableShiftLock()
 	if ShiftLockIcon then ShiftLockIcon.Visible = false end
 	IsShiftLockMode = false
-	if not IsInFirstPerson then
-		UserInputService.MouseBehavior = Enum.MouseBehavior.Default
-	end
 	Mouse.Icon = ""
 	if InputCn then
 		InputCn:disconnect()
 		InputCn = nil
 	end
 	IsActionBound = false
+	ShiftLockController.OnShiftLockToggled:Fire()
 end
 
 -- TODO: Remove when we figure out ContextActionService without sinking keys
@@ -159,7 +150,7 @@ local function enableShiftLock()
 		end
 		if IsShiftLocked then
 			Mouse.Icon = SHIFT_LOCK_CURSOR
-			UserInputService.MouseBehavior = Enum.MouseBehavior.LockCenter
+			ShiftLockController.OnShiftLockToggled:Fire()
 		end
 		if not IsActionBound then
 			InputCn = UserInputService.InputBegan:connect(onShiftInputBegan)

PlayerScripts/PlayerScriptsPlace/StarterPlayer/StarterPlayerScripts/ControlScript/MasterControl/KeyboardMovement.rbxmx

@@ -68,14 +68,6 @@ function KeyboardMovement:Enable()
 		MasterControl:AddToPlayerMovement(currentMoveVector)
 	end
 
-	local function isFirstPersonOrShiftLocked()
-		-- Mouse behavior is being set by the camera script. So be warned that if you
-		-- modify that script or implement a new camera, this may not work.
-		if UserInputService.MouseBehavior == Enum.MouseBehavior.LockCenter then
-			return true
-		end
-	end
-	
 	local moveForwardFunc = function(actionName, inputState, inputObject)
 		if inputState == Enum.UserInputState.Begin then
 			forwardValue = -1