Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMCL-1618: Fix default GameController mapping + zoom input functionality #1034

Merged
merged 16 commits into from
Jan 17, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore the legacy inputs in the prefabs and scenes
glabute committed Jan 17, 2025
commit a1e8d6ae96eed6fafd8ad98f7e2bb505f6a094c0
54 changes: 33 additions & 21 deletions com.unity.cinemachine/Samples~/3D Samples/Lock-on Target.unity
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -319,13 +318,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 737942603}
serializedVersion: 2
m_LocalRotation: {x: 0.037952796, y: 0.0000000021492599, z: -8.1629224e-11, w: 0.99927956}
m_LocalPosition: {x: 0, y: 2.25, z: -29}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &838339814
GameObject:
@@ -364,7 +363,7 @@ MonoBehaviour:
m_Value: 0
OutputChannel: 1
StandbyUpdate: 2
m_StreamingVersion: 20230301
m_StreamingVersion: 20241001
m_LegacyPriority: 10
Target:
TrackingTarget: {fileID: 1519050427}
@@ -397,13 +396,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 838339814}
serializedVersion: 2
m_LocalRotation: {x: 0.037952796, y: 0.0000000021492599, z: -8.1629224e-11, w: 0.99927956}
m_LocalPosition: {x: 0, y: 2.25, z: -29}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &838339820
MonoBehaviour:
@@ -417,13 +416,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3}
m_Name:
m_EditorClassIdentifier:
TargetOffset: {x: 0, y: 1, z: 0}
Lookahead:
Enabled: 0
Time: 0
Smoothing: 0
IgnoreY: 0
Damping: {x: 0.5, y: 0.5}
Composition:
ScreenPosition: {x: 0, y: 0.2}
DeadZone:
@@ -434,6 +426,13 @@ MonoBehaviour:
Size: {x: 0.8, y: 0.8}
Offset: {x: 0, y: 0}
CenterOnActivate: 1
TargetOffset: {x: 0, y: 1, z: 0}
Damping: {x: 0.5, y: 0.5}
Lookahead:
Enabled: 0
Time: 0
Smoothing: 0
IgnoreY: 0
--- !u!114 &838339821
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -448,6 +447,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
ScanRecursively: 1
SuppressInputWhileBlending: 1
IgnoreTimeScale: 0
m_ControllerManager:
Controllers:
- Name: Look Orbit X
@@ -503,6 +503,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3b5d7c088409d9a40b7b09aa707777f8, type: 3}
m_Name:
m_EditorClassIdentifier:
TargetOffset: {x: 0, y: 0, z: 0}
TrackerSettings:
BindingMode: 4
PositionDamping: {x: 1, y: 1, z: 1}
@@ -622,13 +623,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1106812490}
serializedVersion: 2
m_LocalRotation: {x: 0.018435882, y: -0.000000018095653, z: 3.3366604e-10, w: 0.99983007}
m_LocalPosition: {x: 0, y: 2.75, z: -29}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1106812495
MonoBehaviour:
@@ -642,13 +643,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3}
m_Name:
m_EditorClassIdentifier:
TargetOffset: {x: 0, y: 0, z: 0}
Lookahead:
Enabled: 0
Time: 0
Smoothing: 0
IgnoreY: 0
Damping: {x: 0.5, y: 0.5}
Composition:
ScreenPosition: {x: 0, y: 0.05}
DeadZone:
@@ -659,6 +653,13 @@ MonoBehaviour:
Size: {x: 0.1, y: 0.2}
Offset: {x: 0, y: 0}
CenterOnActivate: 1
TargetOffset: {x: 0, y: 0, z: 0}
Damping: {x: 0.5, y: 0.5}
Lookahead:
Enabled: 0
Time: 0
Smoothing: 0
IgnoreY: 0
--- !u!114 &1106812496
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -671,13 +672,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3}
m_Name:
m_EditorClassIdentifier:
FollowOffset: {x: 0, y: 2, z: -4}
TrackerSettings:
BindingMode: 1
PositionDamping: {x: 0.5, y: 0.5, z: 0.5}
AngularDampingMode: 1
RotationDamping: {x: 1, y: 1, z: 1}
QuaternionDamping: 0.5
FollowOffset: {x: 0, y: 2, z: -4}
--- !u!4 &1445711055 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 358930478696116476, guid: a93965bc906a245c49b8905bf8b48fec, type: 3}
@@ -849,13 +850,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2072584704}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.4285714, z: 0}
m_LocalScale: {x: 0.57142854, y: 0.57142854, z: 0.57142854}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1519050427}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2072584706
MonoBehaviour:
@@ -966,3 +967,14 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a93965bc906a245c49b8905bf8b48fec, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 2064093838}
- {fileID: 443530339}
- {fileID: 737942607}
- {fileID: 1519050426}
- {fileID: 3813926105656355491}
- {fileID: 838339818}
- {fileID: 1106812492}
59 changes: 21 additions & 38 deletions com.unity.cinemachine/Samples~/3D Samples/SplitScreenCar.unity
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -270,13 +269,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3}
m_Name:
m_EditorClassIdentifier:
TargetOffset: {x: 0, y: 0, z: 0}
Lookahead:
Enabled: 1
Time: 0.6
Smoothing: 5
IgnoreY: 0
Damping: {x: 0.5, y: 0.5}
Composition:
ScreenPosition: {x: 0, y: 0.1}
DeadZone:
@@ -287,6 +279,13 @@ MonoBehaviour:
Size: {x: 0.38, y: 0.47}
Offset: {x: 0, y: -0.68}
CenterOnActivate: 1
TargetOffset: {x: 0, y: 0, z: 0}
Damping: {x: 0.5, y: 0.5}
Lookahead:
Enabled: 1
Time: 0.6
Smoothing: 5
IgnoreY: 0
--- !u!114 &491555737
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -299,13 +298,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3}
m_Name:
m_EditorClassIdentifier:
FollowOffset: {x: 0, y: 2.06, z: -6.71}
TrackerSettings:
BindingMode: 5
PositionDamping: {x: 1, y: 1, z: 1}
AngularDampingMode: 0
RotationDamping: {x: 1, y: 1, z: 1}
QuaternionDamping: 1
FollowOffset: {x: 0, y: 2.06, z: -6.71}
--- !u!114 &491555738
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -323,7 +322,7 @@ MonoBehaviour:
m_Value: 0
OutputChannel: 4
StandbyUpdate: 2
m_StreamingVersion: 20230301
m_StreamingVersion: 20241001
m_LegacyPriority: 10
Target:
TrackingTarget: {fileID: 598891875}
@@ -498,23 +497,23 @@ PrefabInstance:
objectReference: {fileID: -5630151704836100654, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyInput
value:
value: Mouse X
objectReference: {fileID: 0}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.InputAction
value:
objectReference: {fileID: 1120369429361536294, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyInput
value:
value: Fire1
objectReference: {fileID: 0}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.InputAction
value:
objectReference: {fileID: -1608118824973676762, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyInput
value:
value: Fire2
objectReference: {fileID: 0}
- target: {fileID: 1570214454041857243, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_Materials.Array.data[0]
@@ -831,13 +830,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3}
m_Name:
m_EditorClassIdentifier:
TargetOffset: {x: 0, y: 0, z: 0}
Lookahead:
Enabled: 1
Time: 0.6
Smoothing: 5
IgnoreY: 0
Damping: {x: 0.5, y: 0.5}
Composition:
ScreenPosition: {x: 0, y: 0.1}
DeadZone:
@@ -848,6 +840,13 @@ MonoBehaviour:
Size: {x: 0.38, y: 0.47}
Offset: {x: 0, y: -0.68}
CenterOnActivate: 1
TargetOffset: {x: 0, y: 0, z: 0}
Damping: {x: 0.5, y: 0.5}
Lookahead:
Enabled: 1
Time: 0.6
Smoothing: 5
IgnoreY: 0
--- !u!114 &1967210316
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -860,13 +859,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3}
m_Name:
m_EditorClassIdentifier:
FollowOffset: {x: 0, y: 2.06, z: -6.71}
TrackerSettings:
BindingMode: 5
PositionDamping: {x: 1, y: 1, z: 1}
AngularDampingMode: 0
RotationDamping: {x: 1, y: 1, z: 1}
QuaternionDamping: 1
FollowOffset: {x: 0, y: 2.06, z: -6.71}
--- !u!114 &1967210317
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -884,7 +883,7 @@ MonoBehaviour:
m_Value: 0
OutputChannel: 2
StandbyUpdate: 2
m_StreamingVersion: 20230301
m_StreamingVersion: 20241001
m_LegacyPriority: 10
Target:
TrackingTarget: {fileID: 1868264081772963616}
@@ -981,22 +980,6 @@ PrefabInstance:
propertyPath: m_Name
value: RedCar
objectReference: {fileID: 0}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyInput
value:
objectReference: {fileID: 0}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyInput
value:
objectReference: {fileID: 0}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.InputAction
value:
objectReference: {fileID: 6539296782897260151, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3}
- target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3}
propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyInput
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Loading