Skip to content

Commit 8555115

Browse files
Merge branch 'release/5.9.0' into 'main'
Release 5.9.0 See merge request xr/integrations/unityplugin!241
2 parents f091bd7 + a27debc commit 8555115

File tree

85 files changed

+3920
-3473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+3920
-3473
lines changed
+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## This Merge Request Template
2+
3+
This merge request template is the default and should be used when contributing any changes to stable packages.
4+
5+
For contributions to pre-release/preview packages use the lightweight merge request template.
6+
7+
For release merge requests, use the release template.
8+
9+
## Summary
10+
11+
_Summary of the purpose of this merge request._
12+
13+
## Contributor Tasks
14+
15+
_These tasks are for the merge request creator to tick off when creating a merge request._
16+
17+
- [ ] Pair review with a member of the QA team.
18+
- [ ] Add any release testing considerations to the MR for the next release.
19+
- [ ] Check any relevant CHANGELOG files have been updated.
20+
- [ ] Ensure documentation requirements are met e.g., public API is commented.
21+
- [ ] Consider any licensing/other legal implications for this MR e.g. notices required by any new libraries.
22+
- [ ] Add any relevant labels such as `breaking` to this MR.
23+
24+
## Reviewer Tasks
25+
26+
_Add any instructions or tasks for the reviewer such as specific test considerations before this can be merged._
27+
28+
[Use emojis in review threads to communicate intent and help contributors.](../../CONTRIBUTING.md#review-threads)
29+
30+
- [ ] Code reviewed.
31+
- [ ] Non-code assets e.g. Unity assets/scenes reviewed.
32+
- [ ] Documentation has been reviewed. Includes checking documentation requirements are met and not missing e.g., public API is commented.
33+
- [ ] Checked and agree with release testing considerations added to MR for the next release.
34+
35+
## Closes JIRA Issue
36+
37+
_If this MR closes any JIRA issues list them below in the form `Closes PROJECT-#`_
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
## This Merge Request Template
2+
3+
This merge request template is for contributing to pre-release/preview packages and has fewer tasks to complete. The quality threshold for reviewing these merge requests is lower - prioritize a lean review process.
4+
5+
## Summary
6+
7+
_Summary of the purpose of this merge request._
8+
9+
## Contributor Tasks
10+
11+
_These tasks are for the merge request creator to tick off when creating a merge request._
12+
13+
- [ ] Pair review with a member of the QA team.
14+
- [ ] Add any release testing considerations to the MR for the next release.
15+
- [ ] Consider any licensing/other legal implications for this MR e.g. notices required by any new libraries.
16+
17+
## Reviewer Tasks
18+
19+
_Add any instructions or tasks for the reviewer such as specific test considerations before this can be merged._
20+
21+
[Use emojis in review threads to communicate intent and help contributors.](../../CONTRIBUTING.md#review-threads)
22+
23+
- [ ] Code reviewed.
24+
- [ ] Non-code assets e.g. Unity assets/scenes reviewed.
25+
- [ ] Checked and agree with release testing considerations added to MR for the next release.
26+
27+
## Closes JIRA Issue
28+
29+
_If this MR closes any JIRA issues list them below in the form `Closes PROJECT-#`_
+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
## This Merge Request Template
2+
3+
This merge request template is for release merge requests.
4+
5+
## Summary
6+
7+
_Summary of the purpose of this merge request._
8+
9+
## Release Tasks
10+
11+
_These tasks are for the merge request creator to tick off when creating a merge request._
12+
13+
- [ ] Run through the pre-release steps on [Confluence](https://ultrahaptics.atlassian.net/wiki/spaces/SV/pages/3665625233). The rest of the process continues after this merge request is merged.
14+
- [ ] Check any relevant CHANGELOG files have been updated.
15+
- [ ] Ensure documentation requirements are met e.g., public API is commented.
16+
- [ ] Consider any licensing/other legal implications for this MR e.g. notices required by any new libraries.
17+
- [ ] Add any relevant labels such as `breaking` to this MR.
18+
- [ ] Ensure package.json files are updated with new package versions and any changes dependency versions.
19+
- [ ] If this is a major release, action any `Obsolete` items and other breaking considerations.
20+
- [ ] Check that additional release tasks for each MR contributing to this release have been considered.
21+
22+
### Additional Release Tasks
23+
24+
_This task list should be populated from MRs contributing to this release. Can include functionality tests and regression tests such as tests for integration of multiple features as well as any other tasks that should be performed during the release._
25+
26+
- [ ]
27+
28+
## Closes JIRA Issue
29+
30+
_If this MR closes any JIRA issues list them below in the form `Closes PROJECT-#`_

CONTRIBUTING.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Contributing to Unity Plugin
2+
3+
We welcome contributions from the community. Feel free to create an issue or submit a pull request to address problems you've been having or add new functionality that others would be interested in.
4+
5+
## Review Threads
6+
Help the contributor when reviewing by using emoji's to show intent with each thread:
7+
* :eyes: - “Please do this, I want to look at it again once done / discuss it further” - reviewer is responsible for resolving thread
8+
* :see_no_evil: - “Please do this, I don’t need to look at it again once done” - MR submitter is responsible for resolving thread
9+
* :shrug: - “Suggestion, I don’t mind if you do it or not” - MR submitter is responsible for resolving thread
10+
* :+1: - “This is just a positive comment on your code, no changes needed” - MR submitter is responsible for resolving thread
11+
12+
Got ideas for any other emojis that would be helpful? Add them here with an MR :eyes:.

Packages/Tracking Preview/AggregationProviders/AggregationProviderConfidenceInterpolation.cs

-158
This file was deleted.

Packages/Tracking Preview/AggregationProviders/Editor.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/******************************************************************************
2+
* Copyright (C) Ultraleap, Inc. 2011-2021. *
3+
* *
4+
* Use subject to the terms of the Apache License 2.0 available at *
5+
* http://www.apache.org/licenses/LICENSE-2.0, or another agreement *
6+
* between Ultraleap and you, your company or other organization. *
7+
******************************************************************************/
8+
9+
using UnityEditor;
10+
using UnityEngine;
11+
12+
namespace Leap.Unity
13+
{
14+
15+
[CustomEditor(typeof(AggregationProviderConfidenceInterpolation))]
16+
public class AggregationProviderConfidenceInterpolationEditor : CustomEditorBase
17+
{
18+
19+
protected override void OnEnable()
20+
{
21+
base.OnEnable();
22+
23+
specifyCustomDrawer("jointOcclusionFactor", drawJointOcclusionWarning);
24+
}
25+
26+
private void drawJointOcclusionWarning(SerializedProperty property)
27+
{
28+
EditorGUILayout.PropertyField(property, true);
29+
30+
if (property.floatValue != 0)
31+
{
32+
EditorGUILayout.HelpBox("To use jointOcclusion, you must add a Layer for each ServiceProvider named 'JointOcclusion[idx]'. (eg. Add 'JointOcclusion0' and 'JointOcclusion1' when using two source providers.)", MessageType.Warning);
33+
}
34+
}
35+
36+
37+
public override void OnInspectorGUI()
38+
{
39+
40+
base.OnInspectorGUI();
41+
}
42+
43+
}
44+
}

Packages/Tracking Preview/AggregationProviders/Editor/AggregationProviderConfidenceInterpolationEditor.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"name": "Ultraleap.Tracking.Aggregation.Editor",
3+
"rootNamespace": "",
4+
"references": [
5+
"GUID:db4e617c04f44c144bc19216a63dd19b",
6+
"GUID:10857128242f0ed4996ead64a2dc4b7e"
7+
],
8+
"includePlatforms": [
9+
"Editor"
10+
],
11+
"excludePlatforms": [],
12+
"allowUnsafeCode": false,
13+
"overrideReferences": false,
14+
"precompiledReferences": [],
15+
"autoReferenced": true,
16+
"defineConstraints": [],
17+
"versionDefines": [],
18+
"noEngineReferences": false
19+
}

Packages/Tracking Preview/AggregationProviders/Editor/Ultraleap.Tracking.Aggregation.Editor.asmdef.meta

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/Tracking Preview/AggregationProviders/Render Texture.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)