Added thumbstick axis duplication

Now users have the option of "LeftRightStickX" and "LeftRightStickY". Effectively locks the two thumbsticks' axes together. The main scene now uses "Left Right Stick Y" as the default mapping for both thumbsticks' Y axis.
2017-07-12 15:26:11 -07:00 · 2017-07-12 15:26:11 -07:00 · 3dfbf8ece5
--- a/Assets/MRDesignLab_LunarModule/Scenes/Main.unity
+++ b/Assets/MRDesignLab_LunarModule/Scenes/Main.unity
@ -2865,6 +2865,31 @@ Prefab:
      propertyPath: startButton
      value: 
      objectReference: {fileID: 969698696}
+    - target: {fileID: 114492949870519812, guid: aba327c4bc2da354f9f67a3ceb67e8e5,
+        type: 2}
+      propertyPath: GamepadXAxis
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 114492949870519812, guid: aba327c4bc2da354f9f67a3ceb67e8e5,
+        type: 2}
+      propertyPath: GamepadYAxis
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114492949870519812, guid: aba327c4bc2da354f9f67a3ceb67e8e5,
+        type: 2}
+      propertyPath: GamepadXAxisInvert
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114492949870519812, guid: aba327c4bc2da354f9f67a3ceb67e8e5,
+        type: 2}
+      propertyPath: GamepadYAxisInvert
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114492949870519812, guid: aba327c4bc2da354f9f67a3ceb67e8e5,
+        type: 2}
+      propertyPath: DuplicateThumbstickYAxis
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: aba327c4bc2da354f9f67a3ceb67e8e5, type: 2}
  m_IsPrefabParent: 0
@ -6693,7 +6718,7 @@ Transform:
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 709546996}
-  m_LocalRotation: {x: 0.0033615762, y: -0.9987285, z: -0.003039844, w: -0.05020736}
+  m_LocalRotation: {x: 0.0033615765, y: -0.99872863, z: -0.0030398446, w: -0.05020737}
  m_LocalPosition: {x: 0.017499998, y: 0.226, z: 0.0415}
  m_LocalScale: {x: 0.12, y: 0.12, z: 0.12}
  m_Children:
@ -18089,6 +18114,11 @@ Prefab:
      propertyPath: fitBox
      value: 
      objectReference: {fileID: 321250636}
+    - target: {fileID: 114807440581642608, guid: 9019f06e67b297f46bc879c5dedab4e6,
+        type: 2}
+      propertyPath: currentRoom
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: 9019f06e67b297f46bc879c5dedab4e6, type: 2}
  m_IsPrefabParent: 0
--- a/Assets/MRDesignLab_LunarModule/Scripts/Lander/LanderInput.cs
+++ b/Assets/MRDesignLab_LunarModule/Scripts/Lander/LanderInput.cs
@ -16,6 +16,8 @@ namespace MRDL
            LeftStickY,
            RightStickX,
            RightStickY,
+            LeftRightStickX,
+            LeftRightStickY
        }

        [Header ("Input mapping")]
@ -23,6 +25,7 @@ namespace MRDL
        public JoystickAxisEnum GamepadXAxis;
        public JoystickAxisEnum GamepadZAxis;

+
        public bool GamepadYAxisInvert = false;
        public bool GamepadXAxisInvert = false;
        public bool GamepadZAxisInvert = false;
@ -230,6 +233,30 @@ namespace MRDL
                            frameRotation.x = InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
                            break;

+                        case JoystickAxisEnum.LeftRightStickX:
+                            frameRotation.x = InputSources.Instance.hidGamepad.leftJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            if (GamepadXAxisInvert)
+                            {
+                                frameRotation.x -= InputSources.Instance.hidGamepad.rightJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            else
+                            {
+                                frameRotation.x += InputSources.Instance.hidGamepad.rightJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            break;
+
+                        case JoystickAxisEnum.LeftRightStickY:
+                            frameRotation.x = InputSources.Instance.hidGamepad.leftJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            if (GamepadXAxisInvert)
+                            {
+                                frameRotation.x -= InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            else
+                            {
+                                frameRotation.x += InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            break;
+
                    }

                    switch (GamepadYAxis)
@ -251,6 +278,30 @@ namespace MRDL
                            frameRotation.y = InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
                            break;

+                        case JoystickAxisEnum.LeftRightStickX:
+                            frameRotation.y = InputSources.Instance.hidGamepad.leftJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            if (GamepadYAxisInvert)
+                            {
+                                frameRotation.y -= InputSources.Instance.hidGamepad.rightJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            else
+                            {
+                                frameRotation.y += InputSources.Instance.hidGamepad.rightJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            break;
+
+                        case JoystickAxisEnum.LeftRightStickY:
+                            frameRotation.y = InputSources.Instance.hidGamepad.leftJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            if (GamepadYAxisInvert)
+                            {
+                                frameRotation.y -= InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            else
+                            {
+                                frameRotation.y += InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            break;
+
                    }

                    switch (GamepadZAxis)
@ -272,6 +323,30 @@ namespace MRDL
                            frameRotation.z = InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
                            break;

+                        case JoystickAxisEnum.LeftRightStickX:
+                            frameRotation.z = InputSources.Instance.hidGamepad.leftJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            if (GamepadZAxisInvert)
+                            {
+                                frameRotation.z -= InputSources.Instance.hidGamepad.rightJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            else
+                            {
+                                frameRotation.z += InputSources.Instance.hidGamepad.rightJoyVector.x * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            break;
+
+                        case JoystickAxisEnum.LeftRightStickY:
+                            frameRotation.z = InputSources.Instance.hidGamepad.leftJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            if (GamepadZAxisInvert)
+                            {
+                                frameRotation.z -= InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            else
+                            {
+                                frameRotation.z += InputSources.Instance.hidGamepad.rightJoyVector.y * GamepadTrackingSpeed * Time.deltaTime;
+                            }
+                            break;
+                            
                    }

                    frameRotation.x *= (GamepadXAxisInvert ? -1 : 1);
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -269,6 +269,7 @@ PlayerSettings:
  switchSocketMemoryPoolSize: 6144
  switchSocketAllocatorPoolSize: 128
  switchSocketConcurrencyLimit: 14
+  switchScreenResolutionBehavior: 2
  switchUseCPUProfiler: 0
  switchApplicationID: 0x0005000C10000001
  switchNSODependencies: 
@ -284,9 +285,6 @@ PlayerSettings:
  switchTitleNames_9: 
  switchTitleNames_10: 
  switchTitleNames_11: 
-  switchTitleNames_12: 
-  switchTitleNames_13: 
-  switchTitleNames_14: 
  switchPublisherNames_0: 
  switchPublisherNames_1: 
  switchPublisherNames_2: 
@ -299,9 +297,6 @@ PlayerSettings:
  switchPublisherNames_9: 
  switchPublisherNames_10: 
  switchPublisherNames_11: 
-  switchPublisherNames_12: 
-  switchPublisherNames_13: 
-  switchPublisherNames_14: 
  switchIcons_0: {fileID: 0}
  switchIcons_1: {fileID: 0}
  switchIcons_2: {fileID: 0}
@ -314,9 +309,6 @@ PlayerSettings:
  switchIcons_9: {fileID: 0}
  switchIcons_10: {fileID: 0}
  switchIcons_11: {fileID: 0}
-  switchIcons_12: {fileID: 0}
-  switchIcons_13: {fileID: 0}
-  switchIcons_14: {fileID: 0}
  switchSmallIcons_0: {fileID: 0}
  switchSmallIcons_1: {fileID: 0}
  switchSmallIcons_2: {fileID: 0}
@ -329,9 +321,6 @@ PlayerSettings:
  switchSmallIcons_9: {fileID: 0}
  switchSmallIcons_10: {fileID: 0}
  switchSmallIcons_11: {fileID: 0}
-  switchSmallIcons_12: {fileID: 0}
-  switchSmallIcons_13: {fileID: 0}
-  switchSmallIcons_14: {fileID: 0}
  switchManualHTML: 
  switchAccessibleURLs: 
  switchLegalInformation: 
@ -347,7 +336,7 @@ PlayerSettings:
  switchApplicationErrorCodeCategory: 
  switchUserAccountSaveDataSize: 0
  switchUserAccountSaveDataJournalSize: 0
-  switchAttribute: 0
+  switchApplicationAttribute: 0
  switchCardSpecSize: 4
  switchCardSpecClock: 25
  switchRatingsMask: 0
@ -374,6 +363,15 @@ PlayerSettings:
  switchParentalControl: 0
  switchAllowsScreenshot: 1
  switchDataLossConfirmation: 0
+  switchSupportedNpadStyles: 3
+  switchSocketConfigEnabled: 0
+  switchTcpInitialSendBufferSize: 32
+  switchTcpInitialReceiveBufferSize: 64
+  switchTcpAutoSendBufferSizeMax: 256
+  switchTcpAutoReceiveBufferSizeMax: 256
+  switchUdpSendBufferSize: 9
+  switchUdpReceiveBufferSize: 42
+  switchSocketBufferEfficiency: 4
  ps4NPAgeRating: 12
  ps4NPTitleSecret: 
  ps4NPTrophyPackPath: