Merge branch 'develop' into stable

Author: jamesmcgill

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.4.3
+//     version 1.4.4
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.4.3
+//     version 1.4.4
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/Visualizers/GamepadVisualizer.unity

@@ -38,12 +38,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -94,16 +94,17 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ShowResolutionOverlay: 1
     m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 1162315431}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -116,7 +117,9 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
@@ -160,9 +163,17 @@ Camera:
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -199,22 +210,154 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &989925709 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
+    type: 3}
+  m_PrefabInstance: {fileID: 5430831075364511436}
+  m_PrefabAsset: {fileID: 0}
+--- !u!850595691 &1162315431
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Settings.lighting
+  serializedVersion: 6
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 1
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentImportanceSampling: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
+  m_NumRaysToShootPerTexel: -1
+--- !u!1 &1615874397
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1615874398}
+  - component: {fileID: 1615874399}
+  m_Layer: 0
+  m_Name: DeviceCurrent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1615874398
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1615874397}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -955.3655, y: -464.9797, z: 160.45508}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 989925709}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1615874399
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1615874397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 50c7363fac4d24ae8a679e3e8f1fa838, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Label: Gamepad.current
+  m_HistorySamples: 0
+  m_TimeWindow: 3
+  m_Rect:
+    serializedVersion: 2
+    x: 650
+    y: 50
+    width: 200
+    height: 50
+  m_Visualization: 8
+  m_ControlPath: <Gamepad>/buttonEast
+  m_ControlIndex: 0
 --- !u!1001 &5430831075364511436
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 5430831075476541849, guid: b8429651427a640919754290f3704312,
         type: 3}
       propertyPath: m_Name
       value: GamepadVis
       objectReference: {fileID: 0}
+    - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -230,6 +373,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: -160.45508
       objectReference: {fileID: 0}
+    - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
         type: 3}
       propertyPath: m_LocalRotation.x
@@ -245,16 +393,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -271,4 +409,11 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 5430831075476541851, guid: b8429651427a640919754290f3704312,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1615874398}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b8429651427a640919754290f3704312, type: 3}

Assets/Samples/Visualizers/InputControlVisualizer.cs

@@ -243,6 +243,12 @@ private void SetupVisualizer()
                     break;
                 }
 
+                case Mode.DeviceCurrent:
+                {
+                    m_Visualizer = new VisualizationHelpers.CurrentDeviceVisualizer();
+                    break;
+                }
+
                 default:
                     throw new NotImplementedException();
             }
@@ -284,11 +290,11 @@ private static void OnEvent(InputEventPtr eventPtr, InputDevice device)
                 if (component.m_Control?.device != device || component.m_Visualizer == null)
                     continue;
 
-                component.OnEventImpl(eventPtr);
+                component.OnEventImpl(eventPtr, device);
             }
         }
 
-        private unsafe void OnEventImpl(InputEventPtr eventPtr)
+        private unsafe void OnEventImpl(InputEventPtr eventPtr, InputDevice device)
         {
             switch (m_Visualization)
             {
@@ -341,6 +347,12 @@ private unsafe void OnEventImpl(InputEventPtr eventPtr)
                         new Vector2(0, Mathf.Max(value, visualizer.limitsY.y));
                     break;
                 }
+
+                case Mode.DeviceCurrent:
+                {
+                    m_Visualizer.AddSample(device, eventPtr.time);
+                    break;
+                }
             }
         }
 
@@ -354,6 +366,7 @@ public enum Mode
             Events = 4,
             MaximumLag = 6,
             Bytes = 7,
+            DeviceCurrent = 8,
         }
     }
 }

Assets/Samples/Visualizers/VisualizationHelpers.cs

@@ -138,6 +138,37 @@ private static unsafe float Divide(TValue left, TValue right)
             }
         }
 
+        // Visualizes .current device value
+        public class CurrentDeviceVisualizer : Visualizer
+        {
+            private InputDevice m_CurrentDevice = null;
+
+            public override void OnDraw(Rect rect)
+            {
+                // For now, only draw the current value.
+                DrawRectangle(rect, new Color(1, 1, 1, 0.1f));
+
+                var name = m_CurrentDevice != null ? m_CurrentDevice.name : "null";
+                DrawText(name, new Vector2(rect.xMin + 4, (rect.yMin + rect.yMax) / 2.0f), ValueTextStyle);
+            }
+
+            public override void AddSample(object value, double time)
+            {
+                var device = (InputDevice)value;
+                if (device is Gamepad)
+                    m_CurrentDevice = Gamepad.current;
+                else if (device is Mouse)
+                    m_CurrentDevice = Mouse.current;
+                else if (device is Pen)
+                    m_CurrentDevice = Pen.current;
+                else if (device is Pointer) // should be last, because it's a base class for Mouse and Pen
+                    m_CurrentDevice = Pointer.current;
+                else
+                    throw new ArgumentException(
+                        $"Expected device type that implements .current, but got '{device.name}' (deviceId: {device.deviceId}) instead ");
+            }
+        }
+
         ////TODO: allow asymmetric center (i.e. center not being a midpoint of rectangle)
         ////TODO: enforce proper proportion between X and Y; it's confusing that X and Y can have different units yet have the same length
         public class Vector2Visualizer : ValueVisualizer<Vector2>