Feat: advanced debug menu

Explorer/Assets/DCL/AuthenticationScreenFlow/LoginFromDebugPanelSystem.cs

@@ -21,7 +21,7 @@ public partial class LoginFromDebugPanelSystem : BaseUnityLoopSystem
         private readonly IWeb3VerifiedAuthenticator web3Authenticator;
         private readonly IMVCManager mvcManager;
         private readonly IRealmData realmData;
-        private readonly DebugWidgetVisibilityBinding widgetVisibility;
+        private readonly DebugWidgetVisibilityBinding? widgetVisibility;
         private CancellationTokenSource? cancellationTokenSource;
 
         public LoginFromDebugPanelSystem(World world,
@@ -35,16 +35,16 @@ public LoginFromDebugPanelSystem(World world,
             this.mvcManager = mvcManager;
             this.realmData = realmData;
 
-            debugContainerBuilder.AddWidget("Web3 Authentication")
-                                 .SetVisibilityBinding(widgetVisibility = new DebugWidgetVisibilityBinding(false))
+            debugContainerBuilder.TryAddWidget("Web3 Authentication")
+                                ?.SetVisibilityBinding(widgetVisibility = new DebugWidgetVisibilityBinding(false))
                                  .AddSingleButton("Login", Login)
                                  .AddSingleButton("Open Auth UI", OpenAuthenticationFlow)
                                  .AddSingleButton("Logout", Logout);
         }
 
         protected override void Update(float t)
         {
-            widgetVisibility.SetVisible(realmData.Configured);
+            widgetVisibility?.SetVisible(realmData.Configured);
         }
 
         private void Logout()

Explorer/Assets/DCL/AvatarRendering/AvatarShape/Systems/OwnAvatarLoaderFromDebugMenuSystem.cs

@@ -21,7 +21,7 @@ public partial class OwnAvatarLoaderFromDebugMenuSystem : BaseUnityLoopSystem
     {
         private readonly Entity ownPlayerEntity;
         private readonly IRealmData realmData;
-        private readonly DebugWidgetVisibilityBinding widgetVisibility;
+        private readonly DebugWidgetVisibilityBinding? widgetVisibility;
 
         private CancellationTokenSource? fetchProfileCancellationToken;
 
@@ -35,14 +35,14 @@ public OwnAvatarLoaderFromDebugMenuSystem(
             this.ownPlayerEntity = ownPlayerEntity;
             this.realmData = realmData;
 
-            debugContainerBuilder.AddWidget("Profile: Avatar Shape")
-                                 .SetVisibilityBinding(widgetVisibility = new DebugWidgetVisibilityBinding(false))
+            debugContainerBuilder.TryAddWidget("Profile: Avatar Shape")
+                                 ?.SetVisibilityBinding(widgetVisibility = new DebugWidgetVisibilityBinding(false))
                                  .AddStringFieldWithConfirmation("0x..", "Set Address", UpdateProfileForOwnAvatar);
         }
 
         protected override void Update(float t)
         {
-            widgetVisibility.SetVisible(realmData.Configured);
+            widgetVisibility?.SetVisible(realmData.Configured);
         }
 
         private void UpdateProfileForOwnAvatar(string profileId)

Explorer/Assets/DCL/AvatarRendering/DemoScripts/Systems/InstantiateRandomAvatarsSystem.cs

@@ -58,7 +58,7 @@ public partial class InstantiateRandomAvatarsSystem : BaseUnityLoopSystem
         private readonly IEntityParticipantTable entityParticipantTable;
         private readonly IComponentPool<Transform> transformPool;
 
-        private readonly DebugWidgetVisibilityBinding debugVisibilityBinding;
+        private readonly DebugWidgetVisibilityBinding? debugVisibilityBinding;
         private readonly ElementBinding<ulong> totalAvatarsInstantiated;
 
         private SingleInstanceEntity camera;
@@ -86,17 +86,17 @@ AvatarRandomizerAsset avatarRandomizerAsset
             transformPool = componentPools;
             this.avatarRandomizerAsset = avatarRandomizerAsset;
 
-            debugBuilder.AddWidget("Avatar Debug")
-                        .SetVisibilityBinding(debugVisibilityBinding = new DebugWidgetVisibilityBinding(false))
+            debugBuilder.TryAddWidget("Avatar Debug")
+                        ?.SetVisibilityBinding(debugVisibilityBinding = new DebugWidgetVisibilityBinding(false))
                         .AddIntFieldWithConfirmation(30, "Instantiate", AddRandomAvatar)
                         .AddSingleButton("Instantiate Self Replica", AddRandomSelfReplicaAvatar)
                         .AddControl(new DebugConstLabelDef("Total Avatars"), new DebugLongMarkerDef(totalAvatarsInstantiated = new ElementBinding<ulong>(0), DebugLongMarkerDef.Unit.NoFormat))
                         .AddSingleButton("Destroy All Avatars", DestroyAllAvatars)
                         .AddSingleButton("Destroy Random Amount of Avatars", DestroyRandomAmountOfAvatars)
                         .AddSingleButton("Randomize Wearables of Avatars", RandomizeWearablesOfAvatars);
 
-            debugBuilder.AddWidget("Avatar Creator")
-                .AddStringFieldsWithConfirmation(3, "Instantiate Male", InstantiateMaleAvatar)
+            debugBuilder.TryAddWidget("Avatar Creator")
+                ?.AddStringFieldsWithConfirmation(3, "Instantiate Male", InstantiateMaleAvatar)
                 .AddStringFieldsWithConfirmation(3, "Instantiate Female", InstantiateFemaleAvatar);
         }
 
@@ -125,7 +125,7 @@ private void InstantiateFemaleAvatar(string[] urn)
 
         private void SetDebugViewActivity()
         {
-            debugVisibilityBinding.SetVisible(realmData.Configured && defaultWearableState.GetDefaultWearablesState(World).ResolvedState == DefaultWearablesComponent.State.Success);
+            debugVisibilityBinding?.SetVisible(realmData.Configured && defaultWearableState.GetDefaultWearablesState(World).ResolvedState == DefaultWearablesComponent.State.Success);
         }
 
         private void RandomizeWearablesOfAvatars()

Explorer/Assets/DCL/AvatarRendering/DemoScripts/csc.rsp

@@ -0,0 +1 @@
+-nullable:enable

Explorer/Assets/DCL/Character/CharacterCamera/Systems/ApplyCinemachineCameraInputSystem.cs

@@ -19,8 +19,9 @@ namespace DCL.CharacterCamera.Systems
     public partial class ApplyCinemachineCameraInputSystem : BaseUnityLoopSystem
     {
         private readonly DCLInput input;
+        private bool isFreeCameraAllowed;
 
-        internal ApplyCinemachineCameraInputSystem(World world, DCLInput input) : base(world)
+        internal ApplyCinemachineCameraInputSystem(World world, DCLInput input, bool isFreeCameraAllowed) : base(world)
         {
             this.input = input;
         }
@@ -65,7 +66,7 @@ private void Apply([Data] float dt, ref CameraComponent camera, ref CameraInput
                     break;
             }
 
-            cameraInput.SetFreeFly = input.Camera.ToggleFreeFly!.WasPressedThisFrame();
+            cameraInput.SetFreeFly = isFreeCameraAllowed && input.Camera.ToggleFreeFly!.WasPressedThisFrame();
             cameraInput.SwitchState = input.Camera.SwitchState!.WasPressedThisFrame();
             cameraInput.ChangeShoulder = input.Camera.ChangeShoulder!.WasPressedThisFrame();
 
@@ -108,11 +109,9 @@ private static void ApplyFreeCameraMovement(float dt, in CameraComponent camera,
             Transform cameraTransform = camera.Camera.transform;
 
             cinemachineTransform.localPosition += ((cameraTransform.forward * cameraInput.FreeMovement.y) +
-                                                    (cameraTransform.up * cameraInput.FreePanning.y) +
-                                                    (cameraTransform.right * cameraInput.FreeMovement.x))
-                                                    * cinemachinePreset.FreeCameraData.Speed * dt;
-
-
+                                                   (cameraTransform.up * cameraInput.FreePanning.y) +
+                                                   (cameraTransform.right * cameraInput.FreeMovement.x))
+                                                  * cinemachinePreset.FreeCameraData.Speed * dt;
         }
 
         private static void ApplyPOV(CinemachinePOV cinemachinePOV, in CameraInput cameraInput)

Explorer/Assets/DCL/Character/CharacterCamera/Systems/ApplyCinemachineSettingsSystem.cs

@@ -28,8 +28,8 @@ public ApplyCinemachineSettingsSystem(World world, IDebugContainerBuilder debugB
             sensitivitySlider = new ElementBinding<float>(currentSens);
             noiseSlider = new ElementBinding<float>(0.5f);
 
-            debugBuilder.AddWidget("Camera")
-                        .AddFloatSliderField("Sensitivity", sensitivitySlider, 0.01f, 100f)
+            debugBuilder.TryAddWidget("Camera")
+                        ?.AddFloatSliderField("Sensitivity", sensitivitySlider, 0.01f, 100f)
                         .AddToggleField("Enable Noise", OnNoiseChange, false)
                         .AddFloatSliderField("Noise Value", noiseSlider, 0, 20);
         }

Explorer/Assets/DCL/Character/CharacterMotion/Systems/CalculateCharacterVelocitySystem.cs

@@ -27,37 +27,37 @@ public partial class CalculateCharacterVelocitySystem : BaseUnityLoopSystem
         private SingleInstanceEntity fixedTick;
         private SingleInstanceEntity entitySettings;
 
-        private readonly ElementBinding<float> cameraRunFov;
-        private readonly ElementBinding<float> cameraFovSpeed;
-        private readonly ElementBinding<float> walkSpeed;
-        private readonly ElementBinding<float> jogSpeed;
-        private readonly ElementBinding<float> runSpeed;
-        private readonly ElementBinding<float> jogJumpHeight;
-        private readonly ElementBinding<float> runJumpHeight;
-        private readonly ElementBinding<float> jumpHold;
-        private readonly ElementBinding<float> jumpHoldGravity;
-        private readonly ElementBinding<float> gravity;
-        private readonly ElementBinding<float> airAcc;
-        private readonly ElementBinding<float> maxAirAcc;
-        private readonly ElementBinding<float> airDrag;
-        private readonly ElementBinding<float> stopTime;
+        private readonly ElementBinding<float> cameraRunFov = new (0);
+        private readonly ElementBinding<float> cameraFovSpeed = new (0);
+        private readonly ElementBinding<float> walkSpeed = new (0);
+        private readonly ElementBinding<float> jogSpeed = new (0);
+        private readonly ElementBinding<float> runSpeed = new (0);
+        private readonly ElementBinding<float> jogJumpHeight = new (0);
+        private readonly ElementBinding<float> runJumpHeight = new (0);
+        private readonly ElementBinding<float> jumpHold = new (0);
+        private readonly ElementBinding<float> jumpHoldGravity = new (0);
+        private readonly ElementBinding<float> gravity = new (0);
+        private readonly ElementBinding<float> airAcc = new (0);
+        private readonly ElementBinding<float> maxAirAcc = new (0);
+        private readonly ElementBinding<float> airDrag = new (0);
+        private readonly ElementBinding<float> stopTime = new (0);
 
         public CalculateCharacterVelocitySystem(World world, IDebugContainerBuilder debugBuilder) : base(world)
         {
-            debugBuilder.AddWidget("Locomotion: Base")
-                        .AddFloatField("Camera Run FOV", cameraRunFov = new ElementBinding<float>(0))
-                        .AddFloatField("Walk Speed", walkSpeed = new ElementBinding<float>(0))
-                        .AddFloatField("Jog Speed", jogSpeed = new ElementBinding<float>(0))
-                        .AddFloatField("Run Speed", runSpeed = new ElementBinding<float>(0))
-                        .AddFloatField("Jog Jump Height", jogJumpHeight = new ElementBinding<float>(0))
-                        .AddFloatField("Run Jump Height", runJumpHeight = new ElementBinding<float>(0))
-                        .AddFloatField("Jump Hold Time", jumpHold = new ElementBinding<float>(0))
-                        .AddFloatField("Jump Hold Gravity Scale", jumpHoldGravity = new ElementBinding<float>(0))
-                        .AddFloatField("Gravity", gravity = new ElementBinding<float>(0))
-                        .AddFloatField("Air Acceleration", airAcc = new ElementBinding<float>(0))
-                        .AddFloatField("Max Air Acceleration", maxAirAcc = new ElementBinding<float>(0))
-                        .AddFloatField("Air Drag", airDrag = new ElementBinding<float>(0))
-                        .AddFloatField("Grounded Stop Time", stopTime = new ElementBinding<float>(0))
+            debugBuilder.TryAddWidget("Locomotion: Base")
+                       ?.AddFloatField("Camera Run FOV", cameraRunFov)
+                        .AddFloatField("Walk Speed", walkSpeed)
+                        .AddFloatField("Jog Speed", jogSpeed)
+                        .AddFloatField("Run Speed", runSpeed)
+                        .AddFloatField("Jog Jump Height", jogJumpHeight)
+                        .AddFloatField("Run Jump Height", runJumpHeight)
+                        .AddFloatField("Jump Hold Time", jumpHold)
+                        .AddFloatField("Jump Hold Gravity Scale", jumpHoldGravity)
+                        .AddFloatField("Gravity", gravity)
+                        .AddFloatField("Air Acceleration", airAcc)
+                        .AddFloatField("Max Air Acceleration", maxAirAcc)
+                        .AddFloatField("Air Drag", airDrag)
+                        .AddFloatField("Grounded Stop Time", stopTime)
                 ;
         }
 

Explorer/Assets/DCL/Character/CharacterMotion/Systems/FeetIKSystem.cs

@@ -33,14 +33,21 @@ public partial class FeetIKSystem : BaseUnityLoopSystem
 
         private FeetIKSystem(World world, IDebugContainerBuilder debugBuilder) : base(world)
         {
-            debugBuilder.AddWidget("Locomotion: Feet IK")
-                        .AddToggleField("Enabled", evt => { feetIkIsEnabled = evt.newValue; }, true)
-                        .AddFloatField("IK Change Speed", ikWeightChangeSpeed = new ElementBinding<float>(0))
-                        .AddFloatField("IK Position Speed", ikPositionChangeSpeed = new ElementBinding<float>(0))
-                        .AddFloatField("IK Distance", ikDistance = new ElementBinding<float>(0))
-                        .AddFloatField("Spherecast Width", spherecastWidth = new ElementBinding<float>(0))
-                        .AddFloatField("Twist Limit X", twistLimitX = new ElementBinding<float>(0))
-                        .AddFloatField("Twist Limit Y", twistLimitY = new ElementBinding<float>(0));
+            ikWeightChangeSpeed = new ElementBinding<float>(0);
+            ikPositionChangeSpeed = new ElementBinding<float>(0);
+            ikDistance = new ElementBinding<float>(0);
+            spherecastWidth = new ElementBinding<float>(0);
+            twistLimitX = new ElementBinding<float>(0);
+            twistLimitY = new ElementBinding<float>(0);
+
+            debugBuilder.TryAddWidget("Locomotion: Feet IK")
+                       ?.AddToggleField("Enabled", evt => { feetIkIsEnabled = evt.newValue; }, true)
+                        .AddFloatField("IK Change Speed", ikWeightChangeSpeed)
+                        .AddFloatField("IK Position Speed", ikPositionChangeSpeed)
+                        .AddFloatField("IK Distance", ikDistance)
+                        .AddFloatField("Spherecast Width", spherecastWidth)
+                        .AddFloatField("Twist Limit X", twistLimitX)
+                        .AddFloatField("Twist Limit Y", twistLimitY);
         }
 
         public override void Initialize()
@@ -89,6 +96,7 @@ in CharacterPlatformComponent platformComponent
             // Debug stuff and enable/disable mechanic
             UpdateToggleStatus(ref feetIKComponent, avatarBase);
             if (feetIKComponent.IsDisabled) return;
+
             if (!feetIKComponent.Initialized)
                 InitializeFeetComponent(ref feetIKComponent, avatarBase);
 
@@ -182,6 +190,7 @@ private static void ApplyLegIK(
             if (Physics.SphereCast(rayOrigin, settings.FeetIKSphereSize, rayDirection, out RaycastHit hitInfo, rayDistance, PhysicsLayers.CHARACTER_ONLY_MASK))
             {
                 Vector3 targetPosition = hitInfo.point + positionOffset;
+
                 // lerp towards the target position
                 legIKTarget.position = Vector3.MoveTowards(legIKTarget.position, targetPosition, settings.IKPositionSpeed * dt);
                 var rotationCorrection = Quaternion.FromToRotation(Vector3.up, hitInfo.normal);

Explorer/Assets/DCL/Character/CharacterMotion/Systems/HandsIKSystem.cs

@@ -30,10 +30,13 @@ public partial class HandsIKSystem : BaseUnityLoopSystem
 
         private HandsIKSystem(World world, IDebugContainerBuilder debugBuilder) : base(world)
         {
-            debugBuilder.AddWidget("Locomotion: Hands IK")
-                        .AddToggleField("Enabled", evt => { handsIkSystemIsEnabled = evt.newValue; }, true)
-                        .AddFloatField("Wall Distance", wallDistance = new ElementBinding<float>(0))
-                        .AddFloatField("IK Weight Speed", ikWeightSpeed = new ElementBinding<float>(0));
+            wallDistance = new ElementBinding<float>(0);
+            ikWeightSpeed = new ElementBinding<float>(0);
+
+            debugBuilder.TryAddWidget("Locomotion: Hands IK")
+                       ?.AddToggleField("Enabled", evt => { handsIkSystemIsEnabled = evt.newValue; }, true)
+                        .AddFloatField("Wall Distance", wallDistance)
+                        .AddFloatField("IK Weight Speed", ikWeightSpeed);
         }
 
         public override void Initialize()
@@ -106,6 +109,7 @@ private static void ApplyHandIK(
             var targetWeight = 0;
 
             Debug.DrawRay(rayOrigin, rayDirection * rayDistance, Color.blue, dt);
+
             if (Physics.SphereCast(rayOrigin, settings.FeetIKSphereSize, rayDirection, out RaycastHit hitInfo, rayDistance, PhysicsLayers.CHARACTER_ONLY_MASK))
             {
                 handIKTarget.position = Vector3.MoveTowards(handIKTarget.position, hitInfo.point, settings.IKPositionSpeed * dt);

Explorer/Assets/DCL/Character/CharacterMotion/Systems/HeadIKSystem.cs

@@ -32,12 +32,17 @@ public partial class HeadIKSystem : BaseUnityLoopSystem
 
         private HeadIKSystem(World world, IDebugContainerBuilder builder) : base(world)
         {
-            builder.AddWidget("Locomotion: Head IK")
-                   .AddToggleField("Enabled", (evt) => { headIKIsEnabled = evt.newValue; }, true)
-                   .AddFloatField("Vertical Limit", verticalLimit = new ElementBinding<float>(0))
-                   .AddFloatField("Horizontal Limit", horizontalLimit = new ElementBinding<float>(0))
-                   .AddFloatField("Horizontal Reset", horizontalReset = new ElementBinding<float>(0))
-                   .AddFloatField("Rotation Speed", speed = new ElementBinding<float>(0));
+            verticalLimit = new ElementBinding<float>(0);
+            horizontalLimit = new ElementBinding<float>(0);
+            horizontalReset = new ElementBinding<float>(0);
+            speed = new ElementBinding<float>(0);
+
+            builder.TryAddWidget("Locomotion: Head IK")
+                  ?.AddToggleField("Enabled", (evt) => { headIKIsEnabled = evt.newValue; }, true)
+                   .AddFloatField("Vertical Limit", verticalLimit)
+                   .AddFloatField("Horizontal Limit", horizontalLimit)
+                   .AddFloatField("Horizontal Reset", horizontalReset)
+                   .AddFloatField("Rotation Speed", speed);
         }
 
         public override void Initialize()

Explorer/Assets/DCL/Chat/MessageBus/IChatMessagesBus.cs

@@ -27,7 +27,7 @@ void CreateTestChatEntry()
                 messagesBus.Send(StringUtils.GenerateRandomString(UnityEngine.Random.Range(1, 250)));
             }
 
-            debugContainerBuilder.AddWidget("Chat")!.AddControl(new DebugButtonDef("Create chat message", CreateTestChatEntry), null!);
+            debugContainerBuilder.TryAddWidget("Chat")?.AddControl(new DebugButtonDef("Create chat message", CreateTestChatEntry), null!);
 
             return messagesBus;
         }

Explorer/Assets/DCL/CommandLine/CommandLineArgs.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace DCL.CommandLine
+{
+    public class CommandLineArgs : ICommandLineArgs
+    {
+        private readonly IReadOnlyList<string> parsedValues;
+        private static readonly HashSet<string> ALWAYS_IN_EDITOR = new ()
+        {
+            ICommandLineArgs.DEBUG_FLAG
+        };
+
+        public CommandLineArgs()
+        {
+            parsedValues = Environment.GetCommandLineArgs();
+
+            if (Application.isEditor)
+                parsedValues = parsedValues.Union(ALWAYS_IN_EDITOR).ToList();
+        }
+
+        public bool HasFlag(string flagName) =>
+            parsedValues.Contains(flagName);
+    }
+}