Merge pull request #1 from IvanMurzak/inverse

IvanMurzak · web-flow · commit 55ece7535097 · 2022-07-12T15:46:00.000+03:00
Added inverseX and inverseY options to targets
diff --git a/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2D.cs b/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2D.cs
@@ -58,6 +58,8 @@ protected virtual void Update()
         public class GyroTarget
 	    {
             public Transform    target;
+            public bool         inverseX    = true; 
+            public bool         inverseY    = true;
             public float        speed       = 1;
             public Vector2      maxOffset   = new Vector2(100, 100);
 
diff --git a/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DAttitude.cs b/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DAttitude.cs
@@ -66,13 +66,13 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli
                     (
                         -maxOffsetX * offsetMultiplier.x,
                         maxOffsetX * offsetMultiplier.x,
-                        gyroEuler.x
+                        target.inverseX ? -gyroEuler.x : gyroEuler.x
                     ),
                     target.OriginalLocalPosition.y + RoundInRange
                     (
                         -maxOffsetY * offsetMultiplier.y,
                         maxOffsetY * offsetMultiplier.y,
-                        gyroEuler.y
+                        target.inverseY ? -gyroEuler.y : gyroEuler.y
                     ),
                     target.OriginalLocalPosition.z
                 ),
diff --git a/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DGravity.cs b/Assets/_PackageRoot/Scripts/Mover2D/GyroMover2DGravity.cs
@@ -50,13 +50,13 @@ protected override void ApplyTransform(GyroTarget target, Vector2 offsetMultipli
                     (
                         -target.maxOffset.x * offsetMultiplier.x,
                         target.maxOffset.x * offsetMultiplier.x,
-                        gravity.x + 0.5f
+                        (target.inverseX ? -gravity.x : gravity.x) + 0.5f
                     ),
                     target.OriginalLocalPosition.y + Mathf.Lerp
                     (
                         -target.maxOffset.y * offsetMultiplier.y,
                         target.maxOffset.y * offsetMultiplier.y,
-                        gravity.y + 0.5f
+                        (target.inverseY ? -gravity.y : gravity.y) + 0.5f
                     ),
                     target.OriginalLocalPosition.z
                 ),
diff --git a/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2D.cs b/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2D.cs
@@ -72,6 +72,8 @@ protected virtual void Update()
         public class GyroTarget
 	    {
             public Transform    target;
+            public bool         inverseX    = true; 
+            public bool         inverseY    = true;
             public float        speed       = 1;
             public Vector2      maxOffset   = new Vector2(100, 100);
             public Axes         axes        = Axes.XY;
diff --git a/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DAttitude.cs b/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DAttitude.cs
@@ -68,7 +68,7 @@ protected override float CalcToX(GyroTarget target, Vector2 offsetMultiplier)
             (
                 -maxOffsetX * offsetMultiplier.x,
                 maxOffsetX * offsetMultiplier.x,
-                gyroEuler.x
+                target.inverseX ? -gyroEuler.x : gyroEuler.x
             );
         }
 
@@ -79,7 +79,7 @@ protected override float CalcToY(GyroTarget target, Vector2 offsetMultiplier)
             (
                 -maxOffsetY * offsetMultiplier.y,
                 maxOffsetY * offsetMultiplier.y,
-                gyroEuler.y
+                target.inverseY ? -gyroEuler.y : gyroEuler.y
             );
         }
 
diff --git a/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DGravity.cs b/Assets/_PackageRoot/Scripts/Rotator2D/GyroRotator2DGravity.cs
@@ -55,7 +55,7 @@ protected override float CalcToX(GyroTarget target, Vector2 offsetMultiplier)
             (
                 -target.maxOffset.x * offsetMultiplier.x,
                 target.maxOffset.x * offsetMultiplier.x,
-                gravity.x + 0.5f
+                (target.inverseX ? -gravity.x : gravity.x) + 0.5f
             );
         }
 
@@ -65,7 +65,7 @@ protected override float CalcToY(GyroTarget target, Vector2 offsetMultiplier)
             (
                 -target.maxOffset.y * offsetMultiplier.y,
                 target.maxOffset.y * offsetMultiplier.y,
-                gravity.y + 0.5f
+                (target.inverseY ? -gravity.y : gravity.y) + 0.5f
             );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ protected virtual void Update()`
`58`	`58`	`public class GyroTarget`
`59`	`59`	`{`
`60`	`60`	`public Transform target;`
	`61`	`+ public bool inverseX = true;`
	`62`	`+ public bool inverseY = true;`
`61`	`63`	`public float speed = 1;`
`62`	`64`	`public Vector2 maxOffset = new Vector2(100, 100);`
`63`	`65`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ protected virtual void Update()`
`72`	`72`	`public class GyroTarget`
`73`	`73`	`{`
`74`	`74`	`public Transform target;`
	`75`	`+ public bool inverseX = true;`
	`76`	`+ public bool inverseY = true;`
`75`	`77`	`public float speed = 1;`
`76`	`78`	`public Vector2 maxOffset = new Vector2(100, 100);`
`77`	`79`	`public Axes axes = Axes.XY;`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected override float CalcToX(GyroTarget target, Vector2 offsetMultiplier)`
`68`	`68`	`(`
`69`	`69`	`-maxOffsetX * offsetMultiplier.x,`
`70`	`70`	`maxOffsetX * offsetMultiplier.x,`
`71`		`- gyroEuler.x`
	`71`	`+ target.inverseX ? -gyroEuler.x : gyroEuler.x`
`72`	`72`	`);`
`73`	`73`	`}`
`74`	`74`
`@@ -79,7 +79,7 @@ protected override float CalcToY(GyroTarget target, Vector2 offsetMultiplier)`
`79`	`79`	`(`
`80`	`80`	`-maxOffsetY * offsetMultiplier.y,`
`81`	`81`	`maxOffsetY * offsetMultiplier.y,`
`82`		`- gyroEuler.y`
	`82`	`+ target.inverseY ? -gyroEuler.y : gyroEuler.y`
`83`	`83`	`);`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected override float CalcToX(GyroTarget target, Vector2 offsetMultiplier)`
`55`	`55`	`(`
`56`	`56`	`-target.maxOffset.x * offsetMultiplier.x,`
`57`	`57`	`target.maxOffset.x * offsetMultiplier.x,`
`58`		`- gravity.x + 0.5f`
	`58`	`+ (target.inverseX ? -gravity.x : gravity.x) + 0.5f`
`59`	`59`	`);`
`60`	`60`	`}`
`61`	`61`
`@@ -65,7 +65,7 @@ protected override float CalcToY(GyroTarget target, Vector2 offsetMultiplier)`
`65`	`65`	`(`
`66`	`66`	`-target.maxOffset.y * offsetMultiplier.y,`
`67`	`67`	`target.maxOffset.y * offsetMultiplier.y,`
`68`		`- gravity.y + 0.5f`
	`68`	`+ (target.inverseY ? -gravity.y : gravity.y) + 0.5f`
`69`	`69`	`);`
`70`	`70`	`}`
`71`	`71`