Wire up view-only mode to freepaint tool. Rename "toggle" methods to "set"

andybak · andybak · commit c3fbe417b905 · 2025-04-06T16:02:34.000+01:00
diff --git a/Assets/Editor/MultiplayerManagerEditor.cs b/Assets/Editor/MultiplayerManagerEditor.cs
@@ -154,7 +154,7 @@ public override void OnInspectorGUI()
                 if (GUILayout.Button(viewButtonLabel))
                 {
                     bool newViewState = !currentViewState;
-                    multiplayerManager.ToggleUserViewOnlyMode(newViewState, playerId);
+                    multiplayerManager.SetUserViewOnlyMode(newViewState, playerId);
                     viewOnlyStates[playerId] = newViewState;
                     EditorUtility.SetDirty(target);
                 }
diff --git a/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs b/Assets/Scripts/GUI/MultiplayerRoomOptionsPopUpWindow.cs
@@ -187,7 +187,7 @@ public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOpti
                     MultiplayerManager.m_Instance.RoomOwnershipTransferToUser(button.playerId);
                     break;
                 case SketchControlsScript.GlobalCommands.MultiplayerToggleUserViewEditMode:
-                    MultiplayerManager.m_Instance.ToggleUserViewOnlyMode(button.GetToggleState(), button.playerId);
+                    MultiplayerManager.m_Instance.SetUserViewOnlyMode(button.GetToggleState(), button.playerId);
                     break;
                 case SketchControlsScript.GlobalCommands.MultiplayerKickPlayerOut:
                     MultiplayerManager.m_Instance.KickPlayerOut(button.playerId);
@@ -211,7 +211,7 @@ public void OnMultiplayerRoomOptionsPopUpWindowButtonPressed(MultiplayerRoomOpti
                 case SketchControlsScript.GlobalCommands.MultiplayerToggleAllUserViewEditMode:
                     foreach (var remotePlayer in m_RemotePlayers.List)
                     {
-                        MultiplayerManager.m_Instance.ToggleUserViewOnlyMode(button.GetToggleState(), remotePlayer.PlayerId);
+                        MultiplayerManager.m_Instance.SetUserViewOnlyMode(button.GetToggleState(), remotePlayer.PlayerId);
                         PlayerListItemPrefab playerComponent = GetGameobjectWithPlayerId(remotePlayer.PlayerId);
                         if (playerComponent) playerComponent.SetViewOnlyToggleState(button.GetToggleState());
                     }
diff --git a/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs b/Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs
@@ -46,7 +46,7 @@ public interface IDataConnectionHandler : IConnectionHandler
         Task<bool> RedoCommand(BaseCommand command);
         Task<bool> RpcSyncToSharedAnchor(string uuid);
         Task<bool> RpcTransferRoomOwnership(int playerId);
-        Task<bool> RpcToggleUserViewOnlyMode(bool value, int playerId);
+        Task<bool> RpcSetUserViewOnlyMode(bool value, int playerId);
         Task<bool> RpcKickPlayerOut(int playerId);
         bool RpcMutePlayer(bool mute, int playerId);
 
diff --git a/Assets/Scripts/Multiplayer/MultiplayerManager.cs b/Assets/Scripts/Multiplayer/MultiplayerManager.cs
@@ -106,6 +106,18 @@ private bool isUserRoomOwner
             }
         }
 
+        private bool _isViewOnly;
+        public bool IsViewOnly
+        {
+            get
+            {
+                // Room owners are never in view-only mode
+                if (isUserRoomOwner) return false;
+                return _isViewOnly;
+            }
+            set => _isViewOnly = value;
+        }
+
         void Awake()
         {
             m_Instance = this;
@@ -325,10 +337,10 @@ public void MutePlayerForAll(bool mute, int playerId)
             m_Manager.RpcMutePlayer(mute, playerId);
         }
 
-        public void ToggleUserViewOnlyMode(bool value, int playerId)
+        public void SetUserViewOnlyMode(bool value, int playerId)
         {
             if (!isUserRoomOwner) return;
-            m_Manager.RpcToggleUserViewOnlyMode(value, playerId);
+            m_Manager.RpcSetUserViewOnlyMode(value, playerId);
         }
 
         public void KickPlayerOut(int playerId)
diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs b/Assets/Scripts/Multiplayer/Photon/PhotonManager.cs
@@ -366,11 +366,11 @@ public async Task<bool> RpcTransferRoomOwnership(int playerId)
             return true;
         }
 
-        public async Task<bool> RpcToggleUserViewOnlyMode(bool value,int playerId)
+        public async Task<bool> RpcSetUserViewOnlyMode(bool value,int playerId)
         {
             PlayerRef targetPlayer = PlayerRef.FromEncoded(playerId);
             PhotonRPCBatcher.EnqueueRPC(() =>
-            { PhotonRPC.RPC_ToggleUserViewOnlyMode(m_Runner,value, targetPlayer); });
+            { PhotonRPC.RPC_SetUserViewOnlyMode(m_Runner,value, targetPlayer); });
             return true;
         }
 
diff --git a/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs b/Assets/Scripts/Multiplayer/Photon/PhotonRPC.cs
@@ -409,10 +409,9 @@ private static void TransferRoomOwnership()
             MultiplayerManager.m_Instance.RoomOwnershipReceived();
         }
 
-        private static void ToggleDrawing(bool isEnabled)
+        private static void SetViewOnly(bool isEnabled)
         {
-            PointerManager.m_Instance.EnableLine(isEnabled);
-            PointerManager.m_Instance.EnablePointerStrokeGeneration(isEnabled);
+            MultiplayerManager.m_Instance.IsViewOnly = isEnabled;
         }
 
         #region RPCS
@@ -583,9 +582,9 @@ public static void RPC_TransferRoomOwnership(NetworkRunner runner, [RpcTarget] P
         }
 
         [Rpc(InvokeLocal = false)]
-        public static void RPC_ToggleUserViewOnlyMode(NetworkRunner runner, bool value, [RpcTarget] PlayerRef targetPlayer)
+        public static void RPC_SetUserViewOnlyMode(NetworkRunner runner, bool value, [RpcTarget] PlayerRef targetPlayer)
         {
-            ToggleDrawing(value);
+            SetViewOnly(value);
         }
 
         [Rpc(InvokeLocal = false)]
diff --git a/Assets/Scripts/Tools/FreePaintTool.cs b/Assets/Scripts/Tools/FreePaintTool.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using OpenBrush.Multiplayer;
 using UnityEngine;
 
 namespace TiltBrush
@@ -121,8 +122,18 @@ override public void UpdateTool()
 
             m_PaintingActive = !m_EatInput && !m_ToolHidden && (m_brushTrigger || (m_PaintingActive && !m_RevolverActive && m_LazyInputActive && m_BimanualTape && m_wandTrigger));
 
-            // Allow API command to override painting mode
-            m_PaintingActive = m_PaintingActive || ApiManager.Instance.ForcePaintingOn;
+            // Allow Multiplayer to override painting mode
+            if (MultiplayerManager.m_Instance.IsViewOnly)
+            {
+                m_PaintingActive = false;
+            }
+            else
+            {
+                // Allow API command to override painting mode
+                // (ignored if multiplayer is in view-only mode)
+                m_PaintingActive = m_PaintingActive || ApiManager.Instance.ForcePaintingOn;
+            }
+
 
             if (m_BimanualTape)
             {

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public override void OnInspectorGUI()`
`154`	`154`	`if (GUILayout.Button(viewButtonLabel))`
`155`	`155`	`{`
`156`	`156`	`bool newViewState = !currentViewState;`
`157`		`- multiplayerManager.ToggleUserViewOnlyMode(newViewState, playerId);`
	`157`	`+ multiplayerManager.SetUserViewOnlyMode(newViewState, playerId);`
`158`	`158`	`viewOnlyStates[playerId] = newViewState;`
`159`	`159`	`EditorUtility.SetDirty(target);`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,18 @@ private bool isUserRoomOwner`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ private bool _isViewOnly;`
	`110`	`+ public bool IsViewOnly`
	`111`	`+ {`
	`112`	`+ get`
	`113`	`+ {`
	`114`	`+ // Room owners are never in view-only mode`
	`115`	`+ if (isUserRoomOwner) return false;`
	`116`	`+ return _isViewOnly;`
	`117`	`+ }`
	`118`	`+ set => _isViewOnly = value;`
	`119`	`+ }`
	`120`	`+`
`109`	`121`	`void Awake()`
`110`	`122`	`{`
`111`	`123`	`m_Instance = this;`
`@@ -325,10 +337,10 @@ public void MutePlayerForAll(bool mute, int playerId)`
`325`	`337`	`m_Manager.RpcMutePlayer(mute, playerId);`
`326`	`338`	`}`
`327`	`339`
`328`		`- public void ToggleUserViewOnlyMode(bool value, int playerId)`
	`340`	`+ public void SetUserViewOnlyMode(bool value, int playerId)`
`329`	`341`	`{`
`330`	`342`	`if (!isUserRoomOwner) return;`
`331`		`- m_Manager.RpcToggleUserViewOnlyMode(value, playerId);`
	`343`	`+ m_Manager.RpcSetUserViewOnlyMode(value, playerId);`
`332`	`344`	`}`
`333`	`345`
`334`	`346`	`public void KickPlayerOut(int playerId)`
Original file line number	Diff line number	Diff line change
`@@ -366,11 +366,11 @@ public async Task<bool> RpcTransferRoomOwnership(int playerId)`
`366`	`366`	`return true;`
`367`	`367`	`}`
`368`	`368`
`369`		`- public async Task<bool> RpcToggleUserViewOnlyMode(bool value,int playerId)`
	`369`	`+ public async Task<bool> RpcSetUserViewOnlyMode(bool value,int playerId)`
`370`	`370`	`{`
`371`	`371`	`PlayerRef targetPlayer = PlayerRef.FromEncoded(playerId);`
`372`	`372`	`PhotonRPCBatcher.EnqueueRPC(() =>`
`373`		`- { PhotonRPC.RPC_ToggleUserViewOnlyMode(m_Runner,value, targetPlayer); });`
	`373`	`+ { PhotonRPC.RPC_SetUserViewOnlyMode(m_Runner,value, targetPlayer); });`
`374`	`374`	`return true;`
`375`	`375`	`}`
`376`	`376`
Original file line number	Diff line number	Diff line change
`@@ -409,10 +409,9 @@ private static void TransferRoomOwnership()`
`409`	`409`	`MultiplayerManager.m_Instance.RoomOwnershipReceived();`
`410`	`410`	`}`
`411`	`411`
`412`		`- private static void ToggleDrawing(bool isEnabled)`
	`412`	`+ private static void SetViewOnly(bool isEnabled)`
`413`	`413`	`{`
`414`		`- PointerManager.m_Instance.EnableLine(isEnabled);`
`415`		`- PointerManager.m_Instance.EnablePointerStrokeGeneration(isEnabled);`
	`414`	`+ MultiplayerManager.m_Instance.IsViewOnly = isEnabled;`
`416`	`415`	`}`
`417`	`416`
`418`	`417`	`#region RPCS`
`@@ -583,9 +582,9 @@ public static void RPC_TransferRoomOwnership(NetworkRunner runner, [RpcTarget] P`
`583`	`582`	`}`
`584`	`583`
`585`	`584`	`[Rpc(InvokeLocal = false)]`
`586`		`- public static void RPC_ToggleUserViewOnlyMode(NetworkRunner runner, bool value, [RpcTarget] PlayerRef targetPlayer)`
	`585`	`+ public static void RPC_SetUserViewOnlyMode(NetworkRunner runner, bool value, [RpcTarget] PlayerRef targetPlayer)`
`587`	`586`	`{`
`588`		`- ToggleDrawing(value);`
	`587`	`+ SetViewOnly(value);`
`589`	`588`	`}`
`590`	`589`
`591`	`590`	`[Rpc(InvokeLocal = false)]`