Skip to content

Commit e856504

Browse files
authored
Merge pull request #86 from ExtendRealityLtd/feat/remove-malimbe
feat(Malimbe): remove malimbe dependency
2 parents 61bc6d0 + f4990e6 commit e856504

7 files changed

Lines changed: 100 additions & 48 deletions

Editor/Tilia.Input.UnityInputManager.Editor.asmdef

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
"excludePlatforms": [],
1111
"allowUnsafeCode": false,
1212
"overrideReferences": true,
13-
"precompiledReferences": [
14-
"Malimbe.FodyRunner.UnityIntegration.dll"
15-
],
13+
"precompiledReferences": [],
1614
"autoReferenced": true,
1715
"defineConstraints": []
1816
}

FodyWeavers.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

FodyWeavers.xml.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

Runtime/SharedResources/Scripts/UnityInputManagerAxis1DAction.cs

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
namespace Tilia.Input.UnityInputManager
22
{
3-
using Malimbe.PropertySerializationAttribute;
4-
using Malimbe.XmlDocumentationAttribute;
53
using UnityEngine;
64
using Zinnia.Action;
75
using Zinnia.Process;
@@ -11,18 +9,40 @@
119
/// </summary>
1210
public class UnityInputManagerAxis1DAction : FloatAction, IProcessable
1311
{
12+
[Tooltip("The named axis to listen for state changes on.")]
13+
[SerializeField]
14+
private string axisName;
1415
/// <summary>
1516
/// The named axis to listen for state changes on.
1617
/// </summary>
17-
[Serialized]
18-
[field: DocumentedByXml]
19-
public string AxisName { get; set; }
18+
public string AxisName
19+
{
20+
get
21+
{
22+
return axisName;
23+
}
24+
set
25+
{
26+
axisName = value;
27+
}
28+
}
29+
[Tooltip("Multiplies the axis value.")]
30+
[SerializeField]
31+
private float multiplier = 1f;
2032
/// <summary>
2133
/// Multiplies the axis value.
2234
/// </summary>
23-
[Serialized]
24-
[field: DocumentedByXml]
25-
public float Multiplier { get; set; } = 1f;
35+
public float Multiplier
36+
{
37+
get
38+
{
39+
return multiplier;
40+
}
41+
set
42+
{
43+
multiplier = value;
44+
}
45+
}
2646

2747
/// <inheritdoc />
2848
public void Process()

Runtime/SharedResources/Scripts/UnityInputManagerAxis2DAction.cs

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
namespace Tilia.Input.UnityInputManager
22
{
3-
using Malimbe.PropertySerializationAttribute;
4-
using Malimbe.XmlDocumentationAttribute;
53
using UnityEngine;
64
using Zinnia.Action;
75
using Zinnia.Process;
@@ -11,30 +9,74 @@
119
/// </summary>
1210
public class UnityInputManagerAxis2DAction : Vector2Action, IProcessable
1311
{
12+
[Tooltip("The named x axis to listen for state changes on.")]
13+
[SerializeField]
14+
private string xAxisName;
1415
/// <summary>
1516
/// The named x axis to listen for state changes on.
1617
/// </summary>
17-
[Serialized]
18-
[field: DocumentedByXml]
19-
public string XAxisName { get; set; }
18+
public string XAxisName
19+
{
20+
get
21+
{
22+
return xAxisName;
23+
}
24+
set
25+
{
26+
xAxisName = value;
27+
}
28+
}
29+
[Tooltip("The named y axis to listen for state changes on.")]
30+
[SerializeField]
31+
private string yAxisName;
2032
/// <summary>
2133
/// The named y axis to listen for state changes on.
2234
/// </summary>
23-
[Serialized]
24-
[field: DocumentedByXml]
25-
public string YAxisName { get; set; }
35+
public string YAxisName
36+
{
37+
get
38+
{
39+
return yAxisName;
40+
}
41+
set
42+
{
43+
yAxisName = value;
44+
}
45+
}
46+
[Tooltip("Multiplies the x axis value.")]
47+
[SerializeField]
48+
private float xMultiplier = 1f;
2649
/// <summary>
2750
/// Multiplies the x axis value.
2851
/// </summary>
29-
[Serialized]
30-
[field: DocumentedByXml]
31-
public float XMultiplier { get; set; } = 1f;
52+
public float XMultiplier
53+
{
54+
get
55+
{
56+
return xMultiplier;
57+
}
58+
set
59+
{
60+
xMultiplier = value;
61+
}
62+
}
63+
[Tooltip("Multiplies the y axis value.")]
64+
[SerializeField]
65+
private float yMultiplier = 1f;
3266
/// <summary>
3367
/// Multiplies the y axis value.
3468
/// </summary>
35-
[Serialized]
36-
[field: DocumentedByXml]
37-
public float YMultiplier { get; set; } = 1f;
69+
public float YMultiplier
70+
{
71+
get
72+
{
73+
return yMultiplier;
74+
}
75+
set
76+
{
77+
yMultiplier = value;
78+
}
79+
}
3880

3981
/// <inheritdoc />
4082
public void Process()

Runtime/SharedResources/Scripts/UnityInputManagerButtonAction.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
namespace Tilia.Input.UnityInputManager
22
{
3-
using Malimbe.PropertySerializationAttribute;
4-
using Malimbe.XmlDocumentationAttribute;
53
using UnityEngine;
64
using Zinnia.Action;
75
using Zinnia.Process;
@@ -11,12 +9,23 @@
119
/// </summary>
1210
public class UnityInputManagerButtonAction : BooleanAction, IProcessable
1311
{
12+
[Tooltip("The KeyCode to listen for state changes on.")]
13+
[SerializeField]
14+
private KeyCode keyCode;
1415
/// <summary>
1516
/// The <see cref="UnityEngine.KeyCode"/> to listen for state changes on.
1617
/// </summary>
17-
[Serialized]
18-
[field: DocumentedByXml]
19-
public KeyCode KeyCode { get; set; }
18+
public KeyCode KeyCode
19+
{
20+
get
21+
{
22+
return keyCode;
23+
}
24+
set
25+
{
26+
keyCode = value;
27+
}
28+
}
2029

2130
/// <inheritdoc />
2231
public void Process()

Runtime/Tilia.Input.UnityInputManager.Runtime.asmdef

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
"excludePlatforms": [],
99
"allowUnsafeCode": false,
1010
"overrideReferences": true,
11-
"precompiledReferences": [
12-
"Malimbe.PropertySerializationAttribute.dll",
13-
"Malimbe.XmlDocumentationAttribute.dll"
14-
],
11+
"precompiledReferences": [],
1512
"autoReferenced": true,
1613
"defineConstraints": []
1714
}

0 commit comments

Comments
 (0)