Fixed legacy InputSystem refrashRate, added Demo-UnityChan

IvanMurzak · IvanMurzak · commit d0462397db74 · 2022-07-04T19:52:21.000+03:00
diff --git a/Assets/Demo/DemoSetup.cs b/Assets/Demo/DemoSetup.cs
@@ -0,0 +1,9 @@
+using UnityEngine;
+
+public class DemoSetup : MonoBehaviour
+{
+    void Start()
+    {
+        Application.targetFrameRate = Screen.currentResolution.refreshRate;
+    }
+}
diff --git a/Assets/Demo/DemoSetup.cs.meta b/Assets/Demo/DemoSetup.cs.meta
diff --git a/Assets/Demo/Scenes/Demo.unity b/Assets/Demo/Scenes/Demo.unity
@@ -152,10 +152,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 539ef21bcb7d8894fb48cfaa403fcac5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  speedMultiplier: 10
   offsetMultiplier: {x: 1, y: 1}
   targets:
   - target: {fileID: 1275941634}
-    speed: 10
+    speed: 1
     maxOffset: {x: 1.5, y: 20}
     axes: 4
 --- !u!4 &201139855
@@ -170,7 +171,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &342336930
 GameObject:
@@ -336,6 +337,68 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &556102443
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 556102445}
+  - component: {fileID: 556102444}
+  - component: {fileID: 556102446}
+  m_Layer: 0
+  m_Name: Setup
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &556102444
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 556102443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f248c3e318290944a6b4e5810d22c5e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &556102445
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 556102443}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &556102446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 556102443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21ddeee24e8b0244bb5cb166d5cc88ed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  samplingFrequency: 32
+  useFakeGyroscopeInEditor: 1
+  fakeGyroscopeSettings:
+    hasGyroscope: 1
+    attitude: {x: 0, y: 0, z: 0}
+    gravity: {x: 0, y: 0, z: 1}
 --- !u!1 &575556457
 GameObject:
   m_ObjectHideFlags: 0
@@ -731,7 +794,7 @@ Transform:
   - {fileID: 575556458}
   - {fileID: 342336931}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1792325250
 GameObject:
@@ -844,26 +907,27 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f3150bb2bd3a52944acc461ffa28af24, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  speedMultiplier: 10
   offsetMultiplier: {x: 1, y: 1}
   targets:
   - target: {fileID: 2022894514}
-    speed: 10
-    maxOffset: {x: 2, y: 1}
+    speed: 1
+    maxOffset: {x: 2, y: 2}
   - target: {fileID: 393434817}
-    speed: 10
-    maxOffset: {x: 1, y: 0.5}
+    speed: 1
+    maxOffset: {x: 1, y: 1}
   - target: {fileID: 1275941634}
-    speed: 10
-    maxOffset: {x: 0.25, y: 0.125}
+    speed: 1
+    maxOffset: {x: 0.25, y: 0.25}
   - target: {fileID: 575556458}
-    speed: 10
-    maxOffset: {x: 0.3, y: 0.15}
+    speed: 1
+    maxOffset: {x: 0.3, y: 0.3}
   - target: {fileID: 342336931}
-    speed: 10
-    maxOffset: {x: 0.4, y: 0.2}
+    speed: 1
+    maxOffset: {x: 0.4, y: 0.4}
   - target: {fileID: 629033410}
-    speed: 10
-    maxOffset: {x: 0.5, y: 0.25}
+    speed: 1
+    maxOffset: {x: 0.5, y: 0.5}
 --- !u!4 &1883056389
 Transform:
   m_ObjectHideFlags: 0
@@ -876,7 +940,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2022894513
 GameObject:
diff --git a/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2D.cs b/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2D.cs
@@ -9,6 +9,7 @@ namespace UnityGyroscope.Parallax
 { 
     public abstract class GyroMover2D : MonoBehaviour
     {
+                                    public          float               speedMultiplier = 1;
                                     public          Vector2             offsetMultiplier = Vector2.one;
         [SerializeField, Required]                  List<GyroTarget>    targets = new List<GyroTarget>();
 
diff --git a/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DAttitude.cs b/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DAttitude.cs
@@ -76,7 +76,7 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli
                     ),
                     target.OriginalLocalPosition.z
                 ),
-                Time.deltaTime * target.speed
+                Time.deltaTime * target.speed * speedMultiplier
             );
         }
     }
diff --git a/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DGravity.cs b/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DGravity.cs
@@ -41,29 +41,26 @@ protected override void OnUpdatePrepeare()
         }
 	    protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultiplier)
 	    {
-            var maxOffsetX = target.maxOffset.x;
-            var maxOffsetY = target.maxOffset.y;
-
             target.target.localPosition = Vector3.Lerp
             (
                 target.target.localPosition,
                 new Vector3
                 (
                     target.OriginalLocalPosition.x + Mathf.Lerp
                     (
-                        -maxOffsetX * offsetMultiplier.x,
-                        maxOffsetX * offsetMultiplier.x,
+                        -target.maxOffset.x * offsetMultiplier.x,
+                        target.maxOffset.x * offsetMultiplier.x,
                         gravity.x + 0.5f
                     ),
                     target.OriginalLocalPosition.y + Mathf.Lerp
                     (
-                        -maxOffsetY * offsetMultiplier.y,
-                        maxOffsetY * offsetMultiplier.y,
+                        -target.maxOffset.y * offsetMultiplier.y,
+                        target.maxOffset.y * offsetMultiplier.y,
                         gravity.y + 0.5f
                     ),
                     target.OriginalLocalPosition.z
                 ),
-                Time.deltaTime * target.speed
+                Time.deltaTime * target.speed * speedMultiplier
             );
         }
     }
diff --git a/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2D.cs b/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2D.cs
@@ -9,6 +9,7 @@ namespace UnityGyroscope.Parallax
 { 
     public abstract class GyroRotator2D : MonoBehaviour
     {
+                                    public          float               speedMultiplier = 1;
                                     public          Vector2             offsetMultiplier = Vector2.one;
         [SerializeField, Required]                  List<GyroTarget>    targets = new List<GyroTarget>();
 
diff --git a/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DAttitude.cs b/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DAttitude.cs
@@ -57,7 +57,7 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli
             (
                 target.target.localRotation,
                 Quaternion.Euler(toX, toY, toZ),
-                Time.deltaTime * target.speed
+                Time.deltaTime * target.speed * speedMultiplier
             );
         }
 
diff --git a/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DGravity.cs b/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DGravity.cs
@@ -45,7 +45,7 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli
             (
                 target.target.localRotation,
                 Quaternion.Euler(toX, toY, toZ),
-                Time.deltaTime * target.speed
+                Time.deltaTime * target.speed * speedMultiplier
             );
         }
 
diff --git a/Assets/_PackageRoot/package.json b/Assets/_PackageRoot/package.json
@@ -7,7 +7,7 @@
     "description": "Unity Parallax based on gyroscope components.",
 	"dependencies": {
 		"com.cysharp.unitask": "2.2.5",
-		"extensions.unity.gyroscope.manager": "1.2.1"
+		"extensions.unity.gyroscope.manager": "1.2.6"
     },
     "scopedRegistries": [
       {
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -5,7 +5,7 @@
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",
-    "extensions.unity.gyroscope.manager": "1.2.1",
+    "extensions.unity.gyroscope.manager": "1.2.6",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -31,7 +31,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.29",
+      "version": "1.1.31",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -63,7 +63,7 @@
       }
     },
     "extensions.unity.gyroscope.manager": {
-      "version": "1.2.1",
+      "version": "1.2.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -150,6 +150,7 @@ PlayerSettings:
   m_ColorGamuts: 00000000
   targetPixelDensity: 30
   resolutionScalingMode: 0
+  resetResolutionOnWindowResize: 0
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
@@ -161,7 +162,7 @@ PlayerSettings:
   overrideDefaultApplicationIdentifier: 0
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 21
-  AndroidTargetSdkVersion: 0
+  AndroidTargetSdkVersion: 33
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 1
@@ -242,7 +243,7 @@ PlayerSettings:
   useCustomBaseGradleTemplate: 0
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 3
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -531,7 +532,9 @@ PlayerSettings:
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
   switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
   switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -631,7 +634,8 @@ PlayerSettings:
     7: ODIN_INSPECTOR;ODIN_INSPECTOR_3
   additionalCompilerArguments: {}
   platformArchitecture: {}
-  scriptingBackend: {}
+  scriptingBackend:
+    Android: 0
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
@@ -674,6 +678,7 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
+  vcxProjDefaultLanguage: 
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.25f1
-m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418)
+m_EditorVersion: 2020.3.36f1
+m_EditorVersionWithRevision: 2020.3.36f1 (71f96b79b9f0)
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -8,6 +8,9 @@ EditorUserSettings:
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f623d28393930
       flags: 0
+    RecentlyUsedScenePath-1:
+      value: 224247031146467f0803036d23205a1e1304570e2925297e38271427fb
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace UnityGyroscope.Parallax`
`9`	`9`	`{`
`10`	`10`	`public abstract class GyroMover2D : MonoBehaviour`
`11`	`11`	`{`
	`12`	`+ public float speedMultiplier = 1;`
`12`	`13`	`public Vector2 offsetMultiplier = Vector2.one;`
`13`	`14`	`[SerializeField, Required] List<GyroTarget> targets = new List<GyroTarget>();`
`14`	`15`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli`
`76`	`76`	`),`
`77`	`77`	`target.OriginalLocalPosition.z`
`78`	`78`	`),`
`79`		`- Time.deltaTime * target.speed`
	`79`	`+ Time.deltaTime * target.speed * speedMultiplier`
`80`	`80`	`);`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,29 +41,26 @@ protected override void OnUpdatePrepeare()`
`41`	`41`	`}`
`42`	`42`	`protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultiplier)`
`43`	`43`	`{`
`44`		`- var maxOffsetX = target.maxOffset.x;`
`45`		`- var maxOffsetY = target.maxOffset.y;`
`46`		`-`
`47`	`44`	`target.target.localPosition = Vector3.Lerp`
`48`	`45`	`(`
`49`	`46`	`target.target.localPosition,`
`50`	`47`	`new Vector3`
`51`	`48`	`(`
`52`	`49`	`target.OriginalLocalPosition.x + Mathf.Lerp`
`53`	`50`	`(`
`54`		`- -maxOffsetX * offsetMultiplier.x,`
`55`		`- maxOffsetX * offsetMultiplier.x,`
	`51`	`+ -target.maxOffset.x * offsetMultiplier.x,`
	`52`	`+ target.maxOffset.x * offsetMultiplier.x,`
`56`	`53`	`gravity.x + 0.5f`
`57`	`54`	`),`
`58`	`55`	`target.OriginalLocalPosition.y + Mathf.Lerp`
`59`	`56`	`(`
`60`		`- -maxOffsetY * offsetMultiplier.y,`
`61`		`- maxOffsetY * offsetMultiplier.y,`
	`57`	`+ -target.maxOffset.y * offsetMultiplier.y,`
	`58`	`+ target.maxOffset.y * offsetMultiplier.y,`
`62`	`59`	`gravity.y + 0.5f`
`63`	`60`	`),`
`64`	`61`	`target.OriginalLocalPosition.z`
`65`	`62`	`),`
`66`		`- Time.deltaTime * target.speed`
	`63`	`+ Time.deltaTime * target.speed * speedMultiplier`
`67`	`64`	`);`
`68`	`65`	`}`
`69`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli`
`57`	`57`	`(`
`58`	`58`	`target.target.localRotation,`
`59`	`59`	`Quaternion.Euler(toX, toY, toZ),`
`60`		`- Time.deltaTime * target.speed`
	`60`	`+ Time.deltaTime * target.speed * speedMultiplier`
`61`	`61`	`);`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli`
`45`	`45`	`(`
`46`	`46`	`target.target.localRotation,`
`47`	`47`	`Quaternion.Euler(toX, toY, toZ),`
`48`		`- Time.deltaTime * target.speed`
	`48`	`+ Time.deltaTime * target.speed * speedMultiplier`
`49`	`49`	`);`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"description": "Unity Parallax based on gyroscope components.",`
`8`	`8`	`"dependencies": {`
`9`	`9`	`"com.cysharp.unitask": "2.2.5",`
`10`		`- "extensions.unity.gyroscope.manager": "1.2.1"`
	`10`	`+ "extensions.unity.gyroscope.manager": "1.2.6"`
`11`	`11`	`},`
`12`	`12`	`"scopedRegistries": [`
`13`	`13`	`{`