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.

Sign up for GitHub

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

Jump to bottom

Chore(bug) updates for better upm package dependency flow #1173

Closed
wants to merge 8 commits into from
Closed

Chore(bug) updates for better upm package dependency flow #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6125d4b
fixed compiler warnings
StephenHodgson Dec 10, 2021
d04cac6
fixed unit tests following into dependencies
StephenHodgson Dec 10, 2021
5b04d50
fixed package.json formatting
StephenHodgson Dec 10, 2021
7cf3821
removed test fixture from circular object buffer test
StephenHodgson Dec 10, 2021
7414ed3
Merge branch 'develop' into fix/warnings
StephenHodgson Dec 10, 2021
37a23d7
Delete empty.txt.meta
StephenHodgson Dec 10, 2021
4373393
Delete empty.txt
StephenHodgson Dec 10, 2021
d01b838
revert changes to gitigore
StephenHodgson Dec 10, 2021
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
3 changes: 2 additions & 1 deletion Packages/Tracking Preview/UI Input/Runtime/Scripts/PointerElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public class PointerElement : MonoBehaviour
#region Properties

public event Action<PointerElement, Hand> OnPointerStateChanged;
public event Action<bool> On;

//public event Action<bool> On;
StephenHodgson marked this conversation as resolved.
Show resolved Hide resolved

private Camera mainCamera;
private LeapProvider leapDataProvider;
Expand Down
21 changes: 10 additions & 11 deletions Packages/Tracking Preview/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"name": "com.ultraleap.tracking.preview",
"version": "5.0.0",
"version": "5.0.1",
StephenHodgson marked this conversation as resolved.
Show resolved Hide resolved
"description": "Ultraleap Tracking Preview",
"displayName": "Ultraleap Tracking Preview",
"unity": "2019.4",
"license": "Apache-2.0",
"dependencies" :
{
"com.ultraleap.tracking" : "5.0.0"
"dependencies": {
"com.ultraleap.tracking": "5.0.1"
},
"keywords": [
"ultraleap",
Expand All @@ -21,11 +20,11 @@
"email": "contact@ultraleap.com",
"url": "https://www.ultraleap.com"
},
"samples": [
{
"displayName": "Examples",
"description": "",
"path": "Examples~"
}
]
"samples": [
{
"displayName": "Examples",
"description": "",
"path": "Examples~"
}
]
}
1 change: 0 additions & 1 deletion Packages/Tracking/Core/Runtime/Plugins/LeapCSharp/Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ static Connection()
private Thread _polster;

//Policy and enabled features
private UInt64 _requestedPolicies = 0;
Craig-J marked this conversation as resolved.
Show resolved Hide resolved
private UInt64 _activePolicies = 0;

//Config change status
Expand Down
3 changes: 3 additions & 0 deletions Packages/Tracking/Core/Runtime/Plugins/LeapCSharp/Controller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ public SynchronizationContext EventContext
}

private bool _hasConnected = false;

public bool HasConnected => _hasConnected;

private EventHandler<ConnectionEventArgs> _connect;

/// <summary>
Expand Down
1 change: 0 additions & 1 deletion Packages/Tracking/Core/Tests/Scripts/CircularObjectBufferTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class TestObjectType
public TestObjectType(int t) { id = t; }
}

[TestFixture]
public class CircularObjectBufferTests
{
[Test]
Expand Down
1 change: 0 additions & 1 deletion Packages/Tracking/Core/Tests/Scripts/DeviceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

namespace Leap.LeapCSharp.Tests
{
[TestFixture()]
public class DeviceTests
{
Controller controller;
Expand Down
3 changes: 0 additions & 3 deletions Packages/Tracking/Core/Tests/Scripts/HandFactoryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
namespace Leap.Unity.Tests
{

[TestFixture(Category = "TestHandFactory")]
public class HandFactoryTwoHands : FrameValidator
{
protected override Frame createFrame()
Expand All @@ -27,7 +26,6 @@ public void CorrectHandCount()
}
}

[TestFixture(Category = "TestHandFactory")]
public class HandFactoryLeft : FrameValidator
{
protected override Frame createFrame()
Expand All @@ -42,7 +40,6 @@ public void CorrectHandCount()
}
}

[TestFixture(Category = "TestHandFactory")]
public class HandFactoryRight : FrameValidator
{
protected override Frame createFrame()
Expand Down
5 changes: 2 additions & 3 deletions Packages/Tracking/Core/Tests/Scripts/LeapCStressTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@

namespace Leap.LeapCSharp.Tests
{
[TestFixture()]
public class LeapCStressTests
{
[Test()]
[Test]
public void TestCreateDestroy()
{
IntPtr connHandle = IntPtr.Zero;
Expand All @@ -31,7 +30,7 @@ public void TestCreateDestroy()
}
}

[Test()]
[Test]
public void TestCreateDestroyWithConfigRequest()
{
IntPtr connHandle = IntPtr.Zero;
Expand Down
9 changes: 5 additions & 4 deletions Packages/Tracking/Core/Tests/Scripts/ObjectEquality.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@

namespace Leap.LeapCSharp.Tests
{
[TestFixture()]
public class ObjectEquality
{
[Test()]
[Test]
public void Vector_ints()
{
Vector thisVector = new Leap.Vector(1, 2, 3);
Expand All @@ -22,7 +21,8 @@ public void Vector_ints()
//Assert.True (thisVector == thatVector, "this == that Vector");

}
[Test()]

[Test]
public void Vector_floats()
{
Vector thisVector = new Leap.Vector(1.111111111111111f, 2.222222222222222f, 3.333333333333333f);
Expand All @@ -31,7 +31,8 @@ public void Vector_floats()
//Assert.True (thisVector == thatVector, "this == that Vector");

}
[Test()]

[Test]
public void Vector_more_floats()
{
Vector thisVector = new Vector(0.199821f, -0.845375f, 0.495392f);
Expand Down
1 change: 0 additions & 1 deletion Packages/Tracking/Core/Tests/Scripts/StructMarshalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ struct TestMarshaledStruct
public TestMarshaledStruct(int t) { id = t; }
}

[TestFixture()]
public class StructMarshalTests
{
public const int ARRAY_SIZE = 5;
Expand Down
Loading