Skip to content

Commit 620868d

Browse files
committed
Restructure project (names & namespaces)
1 parent 4246d8f commit 620868d

File tree

60 files changed

+58
-54
lines changed

Some content is hidden

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

60 files changed

+58
-54
lines changed

Diff for: Editor/Assets_v1/InteractableButtonsRootEditor.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
using System.Collections.Generic;
55
using UnityEngine;
66
using UnityEditor;
7-
using ubc.ok.ovilab.HPUI.CoreV1;
7+
using ubco.ovilab.HPUI.CoreV1;
88

9-
namespace ubc.ok.ovilab.HPUI.Editor
9+
namespace ubco.ovilab.HPUI.CoreV1.Editor
1010
{
1111
[CustomEditor(typeof(InteractableButtonsRoot), true)]
1212
public class InteractableButtonsRootEditor: UnityEditor.Editor

Diff for: Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef renamed to Editor/Assets_v1/ubco.ovilab.HPUI.Corev1.Editor.asmdef

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "ubc.ok.ovilab.HPUI.Editor",
3-
"rootNamespace": "ubc.ok.ovilab.HPUI.Editor",
2+
"name": "ubco.ovilab.HPUI.Corev1.Editor",
3+
"rootNamespace": "ubco.ovilab.HPUI.Corev1.Editor",
44
"references": [
5-
"ubc.ok.ovilab.HPUI"
5+
"ubco.ovilab.HPUI.CoreV1"
66
],
77
"includePlatforms": [
88
"Editor"

Diff for: Editor/ConditionalFieldAttributeDrawer.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using ubco.ovilab.HPUI.Utils;
12
using UnityEditor;
23
using UnityEngine;
34

Diff for: Editor/HPUIBaseInteractableEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEditor;
2-
using ubco.ovilab.HPUI.Core;
2+
using ubco.ovilab.HPUI.Interaction;
33
using UnityEditor.XR.Interaction.Toolkit;
44
using System.Collections.Generic;
55

Diff for: Editor/HPUIContinuousInteractableEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22
using UnityEditor;
3-
using ubco.ovilab.HPUI.Core;
3+
using ubco.ovilab.HPUI.Interaction;
44
using System.Collections.Generic;
55
using System.Linq;
66

Diff for: Editor/HPUIInteractorEditor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using UnityEditor;
2-
using ubco.ovilab.HPUI.Core;
2+
using ubco.ovilab.HPUI.Interaction;
33
using UnityEditor.XR.Interaction.Toolkit;
44
using System.Collections.Generic;
55

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/AddOffsetToLinkers.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using UnityEngine;
33

4-
namespace ubc.ok.ovilab.HPUI.CoreV1
4+
namespace ubco.ovilab.HPUI.CoreV1
55
{
66
public class AddOffsetToLinkers : MonoBehaviour
77
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/ButtonColorBehaviour.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace ubc.ok.ovilab.HPUI.CoreV1
3+
namespace ubco.ovilab.HPUI.CoreV1
44
{
55
public class ButtonColorBehaviour : MonoBehaviour
66
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/ButtonController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace ubc.ok.ovilab.HPUI.CoreV1
3+
namespace ubco.ovilab.HPUI.CoreV1
44
{
55
[DefaultExecutionOrder(110)]
66
public class ButtonController : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/ButtonScaleBehaviour.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace ubc.ok.ovilab.HPUI.CoreV1
3+
namespace ubco.ovilab.HPUI.CoreV1
44
{
55
[DefaultExecutionOrder(100)]
66
public class ButtonScaleBehaviour : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/ButtonTriggerCollider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace ubc.ok.ovilab.HPUI.CoreV1
3+
namespace ubco.ovilab.HPUI.CoreV1
44
{
55
[RequireComponent(typeof(Collider))]
66
public class ButtonTriggerCollider : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/ButtonZone.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace ubc.ok.ovilab.HPUI.CoreV1
3+
namespace ubco.ovilab.HPUI.CoreV1
44
{
55
public class ButtonZone : MonoBehaviour
66
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44

5-
using ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay;
5+
using ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay;
66

7-
namespace ubc.ok.ovilab.HPUI.CoreV1
7+
namespace ubco.ovilab.HPUI.CoreV1
88
{
99
public class CalibrateButton2 : MonoBehaviour
1010
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using UnityEngine;
33

44

5-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
5+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
66
{
77

88
public class ConnectedStaticDisplay : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44

5-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
5+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
66
{
77
public abstract class CoordinateManager : MonoBehaviour
88
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using UnityEngine.Jobs;
77
using System;
88
using System.Linq;
9-
using ubc.ok.ovilab.HPUI.Utils;
9+
using ubco.ovilab.HPUI.CoreV1.utils;
1010

11-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
11+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
1212
{
1313
public class DeformableSurfaceDisplayManager : MonoBehaviour
1414
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using UnityEngine;
33

4-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
4+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
55
{
66
/*
77
This class modifies the coordnates of a mesh based on some criteria

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44

5-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
5+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
66
{
77
[RequireComponent(typeof(DeformationCoordinateManager))]
88
public class DeformationLimiter : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEngine;
44
//using IronPython.Hosting;
55

6-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
6+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
77
{
88
public class DynamicMeshDeformer : MonoBehaviour
99
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44

5-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
5+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
66
{
77
/*
88
Provided the dimensions of a mesh, this class will gerneate the mesh

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Linq;
55
using Unity.Collections;
66

7-
namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
7+
namespace ubco.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
88
{
99
public class SkinnedMeshCoordinateManager : CoordinateManager
1010
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/Events.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using UnityEngine.Events;
44

5-
namespace ubc.ok.ovilab.HPUI.CoreV1
5+
namespace ubco.ovilab.HPUI.CoreV1
66
{
77
/// <summary>
88
/// Event containing a ButtonController as a parameter

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/HandCoordinateManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System.Collections.Generic;
22
using UnityEngine;
3-
using static ubc.ok.ovilab.HPUI.utils.Extensions;
3+
using static ubco.ovilab.HPUI.CoreV1.utils.Extensions;
44
using System.Linq;
55
using System;
66

7-
namespace ubc.ok.ovilab.HPUI.CoreV1
7+
namespace ubco.ovilab.HPUI.CoreV1
88
{
99
[DefaultExecutionOrder(-140)]
1010
public class HandCoordinateManager : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/HandsManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using UnityEngine;
33

4-
namespace ubc.ok.ovilab.HPUI.CoreV1
4+
namespace ubco.ovilab.HPUI.CoreV1
55
{
66
[DefaultExecutionOrder(-200)]
77
public class HandsManager : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/InteractableButtonsRoot.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace ubc.ok.ovilab.HPUI.CoreV1
3+
namespace ubco.ovilab.HPUI.CoreV1
44
{
55
public class InteractableButtonsRoot : MonoBehaviour
66
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/InteractionManger.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Linq;
66
using UnityEngine.Events;
77

8-
namespace ubc.ok.ovilab.HPUI.CoreV1
8+
namespace ubco.ovilab.HPUI.CoreV1
99
{
1010
[DefaultExecutionOrder(120)]
1111
public class InteractionManger : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/TransformLinker.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace ubc.ok.ovilab.HPUI.CoreV1
3+
namespace ubco.ovilab.HPUI.CoreV1
44
{
55
[DefaultExecutionOrder(-130)]
66
public class TransformLinker : MonoBehaviour

Diff for: Runtime/Assets_v1/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Linq;
33
using UnityEngine;
44

5-
namespace ubc.ok.ovilab.HPUI.CoreV1
5+
namespace ubco.ovilab.HPUI.CoreV1
66
{
77
/// <summary>
88
/// For all child TransformLinkeres under the object with this script,

Diff for: Runtime/Assets_v1/Scripts/HPUI/Utils/Coord.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace ubc.ok.ovilab.HPUI.Utils
1+
namespace ubco.ovilab.HPUI.CoreV1.utils
22
{
33
public class Coord {
44
private int _x, _y = 0;

Diff for: Runtime/Assets_v1/Scripts/HPUI/Utils/Extensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using UnityEngine;
22
using System;
33

4-
namespace ubc.ok.ovilab.HPUI.utils
4+
namespace ubco.ovilab.HPUI.CoreV1.utils
55
{
66
public static class Extensions
77
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Utils/OneEuroFilter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using System.Collections.Generic;
1313

1414

15-
namespace ubc.ok.ovilab.HPUI.Utils
15+
namespace ubco.ovilab.HPUI.CoreV1.utils
1616
{
1717
class LowPassFilter
1818
{

Diff for: Runtime/Assets_v1/Scripts/HPUI/Utils/Range.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace ubc.ok.ovilab.HPUI.Utils
3+
namespace ubco.ovilab.HPUI.CoreV1.utils
44
{
55
[Serializable]
66
public class Range

Diff for: Runtime/Assets_v1/Scripts/HPUI/Utils/ReparentFixedTransform.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Collections;
22
using System.Collections.Generic;
33
using UnityEngine;
4-
using static ubc.ok.ovilab.HPUI.utils.Extensions;
4+
using static ubco.ovilab.HPUI.CoreV1.utils.Extensions;
55

6-
namespace ubc.ok.ovilab.HPUI.Core
6+
namespace ubco.ovilab.HPUI.Core
77
{
88
/// <summary>
99
/// The current objects transform is set to match the

Diff for: Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef renamed to Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.CoreV1.asmdef

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "ubc.ok.ovilab.HPUI",
3-
"rootNamespace": "ubc.ok.ovilab.HPUI",
2+
"name": "ubco.ovilab.HPUI.CoreV1",
3+
"rootNamespace": "ubco.ovilab.HPUI.CoreV1",
44
"references": [],
55
"includePlatforms": [],
66
"excludePlatforms": [],
File renamed without changes.

Diff for: Runtime/DeformableSurface.cs renamed to Runtime/Interaction/DeformableSurface.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Unity.Collections;
44
using UnityEngine;
55

6-
namespace ubco.ovilab.HPUI.Core
6+
namespace ubco.ovilab.HPUI.Interaction
77
{
88
/// <summary>
99
/// Main class to generate deformable meshes that use Unity's <see cref="SkinnedMeshRenderer"/>.
File renamed without changes.

Diff for: Runtime/DeformableSurfaceCollidersManager.cs renamed to Runtime/Interaction/DeformableSurfaceCollidersManager.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using UnityEngine.Jobs;
66
using System;
77

8-
namespace ubco.ovilab.HPUI.Core
8+
namespace ubco.ovilab.HPUI.Interaction
99
{
1010
/// <summary>
1111
/// Component to manage the colliders of the deformable surface.

Diff for: Runtime/Interactions/HPUIBaseInteractable.cs renamed to Runtime/Interaction/HPUIBaseInteractable.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEngine.XR.Interaction.Toolkit;
44
using UnityEngine.XR.Interaction.Toolkit.Utilities;
55

6-
namespace ubco.ovilab.HPUI.Core
6+
namespace ubco.ovilab.HPUI.Interaction
77
{
88
/// <summary>
99
/// Base HPUI interactable.

Diff for: Runtime/Interactions/HPUIContinuousInteractable.cs renamed to Runtime/Interaction/HPUIContinuousInteractable.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
using System.Collections;
22
using System.Collections.Generic;
3+
using ubco.ovilab.HPUI.tracking;
4+
using ubco.ovilab.HPUI.Utils;
35
using UnityEngine;
46
using UnityEngine.XR.Hands;
57
using UnityEngine.XR.Interaction.Toolkit;
68

7-
namespace ubco.ovilab.HPUI.Core
9+
namespace ubco.ovilab.HPUI.Interaction
810
{
911
/// <summary>
1012
/// </summary>

Diff for: Runtime/Interactions/HPUIEvents.cs renamed to Runtime/Interaction/HPUIEvents.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using UnityEngine.Events;
44
using UnityEngine.XR.Interaction.Toolkit;
55

6-
namespace ubco.ovilab.HPUI.Core
6+
namespace ubco.ovilab.HPUI.Interaction
77
{
88
public enum HPUIGestureState
99
{
File renamed without changes.

Diff for: Runtime/Interactions/HPUIGestureLogic.cs renamed to Runtime/Interaction/HPUIGestureLogic.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using UnityEngine.Pool;
55
using UnityEngine.XR.Interaction.Toolkit;
66

7-
namespace ubco.ovilab.HPUI.Core
7+
namespace ubco.ovilab.HPUI.Interaction
88
{
99
/// <summary>
1010
/// Encapsulates the logic for HPUI gesture interactions.

Diff for: Runtime/Interactions/HPUIInteractor.cs renamed to Runtime/Interaction/HPUIInteractor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using UnityEngine.XR.Hands;
66
using UnityEngine.XR.Interaction.Toolkit;
77

8-
namespace ubco.ovilab.HPUI.Core
8+
namespace ubco.ovilab.HPUI.Interaction
99
{
1010
/// <summary>
1111
/// Base HPUI interactor.

Diff for: Runtime/Interactions/IHPUIInteractable.cs renamed to Runtime/Interaction/IHPUIInteractable.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using UnityEngine;
22
using UnityEngine.XR.Interaction.Toolkit;
33

4-
namespace ubco.ovilab.HPUI.Core
4+
namespace ubco.ovilab.HPUI.Interaction
55
{
66
public interface IHPUIInteractable : IXRInteractable, IXRSelectInteractable
77
{

Diff for: Runtime/Interactions/IHPUIInteractor.cs renamed to Runtime/Interaction/IHPUIInteractor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine.XR.Interaction.Toolkit;
22

3-
namespace ubco.ovilab.HPUI.Core
3+
namespace ubco.ovilab.HPUI.Interaction
44
{
55
public interface IHPUIInteractor: IXRInteractor, IXRSelectInteractor
66
{

Diff for: Runtime/Tracking/HandJointData.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Unity.XR.CoreUtils;
66
using UnityEngine.Pool;
77

8-
namespace ubco.ovilab.HPUI.Core
8+
namespace ubco.ovilab.HPUI.tracking
99
{
1010
/// <summary>
1111
/// Utility class to expose joint data accessible.

0 commit comments

Comments
 (0)