Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions Editor/Scripts/Inspector/Axis.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public override VisualElement CreateInspectorGUI()

var groupSettings = new PropertyGroup("Settings");
groupSettings.Add(new FloatField("Factor"){bindingPath = "_factor"}.AlignedField());
groupSettings.Add(new FloatField("Offset"){bindingPath = "_offset"}.AlignedField());
groupSettings.Add(new EnumField("Direction"){bindingPath = "_direction"}.AlignedField());
groupSettings.Add(new EnumField("Type"){bindingPath = "_type"}.AlignedField());
groupSettings.Add(new EnumField("Control Mode"){bindingPath = "_controlMode"}.AlignedField());
Expand Down
10 changes: 9 additions & 1 deletion Runtime/Scripts/Components/Axis.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ public float Factor
get => _factor;
}

public float Offset
{
set => _offset = value;
get => _offset;
}

public AxisType Type
{
set
Expand Down Expand Up @@ -48,6 +54,8 @@ public AxisDirection Direction
[Header("Settings")]
[SerializeField]
protected float _factor = 1f;
[SerializeField]
protected float _offset;
[SerializeField]
protected AxisDirection _direction = AxisDirection.X;
[SerializeField]
Expand Down Expand Up @@ -100,7 +108,7 @@ private void LocalUpdate(float deltaTime)
Target.Value = _actor.Value.Value;
}

_value.Value = _target.Value * _factor;
_value.Value = (_target.Value + _offset) * _factor;

switch (_controlMode)
{
Expand Down
17 changes: 13 additions & 4 deletions Samples/Demo/0.1 Devices.unity
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ MonoBehaviour:
_value: 0
_actor: {fileID: 872032856}
_factor: 1
_offset: 0
_direction: 0
_type: 1
_controlMode: 1
Expand Down Expand Up @@ -2172,6 +2173,7 @@ MonoBehaviour:
_value: 0
_actor: {fileID: 1575472970}
_factor: 0.01
_offset: 0
_direction: 0
_type: 0
_controlMode: 0
Expand Down Expand Up @@ -3546,6 +3548,7 @@ MonoBehaviour:
_value: 0
_actor: {fileID: 166511645}
_factor: 1
_offset: 0
_direction: 0
_type: 1
_controlMode: 1
Expand Down Expand Up @@ -5965,6 +5968,7 @@ MonoBehaviour:
_value: 0
_actor: {fileID: 1726639120}
_factor: 0.001
_offset: 0
_direction: 1
_type: 0
_controlMode: 0
Expand Down Expand Up @@ -10484,7 +10488,6 @@ MonoBehaviour:
_isConnected:
_value: 0
_rootName: MAIN
_verbose: 0
_link:
_enable: 0
_isConnected:
Expand All @@ -10498,9 +10501,13 @@ MonoBehaviour:
Control: 0
Status: 0
TimeScale: 0
_autoConnect: 1
_netId: Local
_port: 851
_config:
_name: Client
_reconnect: 1
_netId: Local
_port: 351
_clearBuffer: 1
_verbose: 0
--- !u!1 &2008748801
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -10554,6 +10561,7 @@ MonoBehaviour:
_value: 0
_actor: {fileID: 1207663284}
_factor: 0.001
_offset: 0
_direction: 1
_type: 0
_controlMode: 0
Expand Down Expand Up @@ -11465,6 +11473,7 @@ MonoBehaviour:
_value: 0
_actor: {fileID: 209732355}
_factor: 0.001
_offset: 0
_direction: 1
_type: 0
_controlMode: 0
Expand Down