diff --git a/Editor/Assets_v1.meta b/Editor/Assets_Legacy.meta similarity index 100% rename from Editor/Assets_v1.meta rename to Editor/Assets_Legacy.meta diff --git a/Editor/Assets_v1/InteractableButtonsRootEditor.cs b/Editor/Assets_Legacy/InteractableButtonsRootEditor.cs similarity index 95% rename from Editor/Assets_v1/InteractableButtonsRootEditor.cs rename to Editor/Assets_Legacy/InteractableButtonsRootEditor.cs index 2e218f6..5363a2c 100644 --- a/Editor/Assets_v1/InteractableButtonsRootEditor.cs +++ b/Editor/Assets_Legacy/InteractableButtonsRootEditor.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using UnityEngine; using UnityEditor; -using ubc.ok.ovilab.HPUI.CoreV1; +using ubco.ovilab.HPUI.Legacy; -namespace ubc.ok.ovilab.HPUI.Editor +namespace ubco.ovilab.HPUI.Legacy.Editor { [CustomEditor(typeof(InteractableButtonsRoot), true)] public class InteractableButtonsRootEditor: UnityEditor.Editor diff --git a/Editor/Assets_v1/InteractableButtonsRootEditor.cs.meta b/Editor/Assets_Legacy/InteractableButtonsRootEditor.cs.meta similarity index 100% rename from Editor/Assets_v1/InteractableButtonsRootEditor.cs.meta rename to Editor/Assets_Legacy/InteractableButtonsRootEditor.cs.meta diff --git a/Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef b/Editor/Assets_Legacy/ubco.ovilab.HPUI.Legacy.Editor.asmdef similarity index 70% rename from Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef rename to Editor/Assets_Legacy/ubco.ovilab.HPUI.Legacy.Editor.asmdef index 5fc530f..f2f254e 100644 --- a/Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef +++ b/Editor/Assets_Legacy/ubco.ovilab.HPUI.Legacy.Editor.asmdef @@ -1,8 +1,8 @@ { - "name": "ubc.ok.ovilab.HPUI.Editor", - "rootNamespace": "ubc.ok.ovilab.HPUI.Editor", + "name": "ubco.ovilab.HPUI.Legacy.Editor", + "rootNamespace": "ubco.ovilab.HPUI.Legacy.Editor", "references": [ - "ubc.ok.ovilab.HPUI" + "ubco.ovilab.HPUI.Legacy" ], "includePlatforms": [ "Editor" diff --git a/Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef.meta b/Editor/Assets_Legacy/ubco.ovilab.HPUI.Legacy.Editor.asmdef.meta similarity index 100% rename from Editor/Assets_v1/ubc.ok.ovilab.HPUI.Editor.asmdef.meta rename to Editor/Assets_Legacy/ubco.ovilab.HPUI.Legacy.Editor.asmdef.meta diff --git a/Editor/ConditionalFieldAttributeDrawer.cs b/Editor/ConditionalFieldAttributeDrawer.cs index 34db2e1..5ab8f3c 100644 --- a/Editor/ConditionalFieldAttributeDrawer.cs +++ b/Editor/ConditionalFieldAttributeDrawer.cs @@ -1,3 +1,4 @@ +using ubco.ovilab.HPUI.Utils; using UnityEditor; using UnityEngine; diff --git a/Editor/HPUIBaseInteractableEditor.cs b/Editor/HPUIBaseInteractableEditor.cs index ecbfb43..624c19d 100644 --- a/Editor/HPUIBaseInteractableEditor.cs +++ b/Editor/HPUIBaseInteractableEditor.cs @@ -1,5 +1,5 @@ using UnityEditor; -using ubco.ovilab.HPUI.Core; +using ubco.ovilab.HPUI.Interaction; using UnityEditor.XR.Interaction.Toolkit; using System.Collections.Generic; diff --git a/Editor/HPUIContinuousInteractableEditor.cs b/Editor/HPUIContinuousInteractableEditor.cs index bc60a16..7d7b2fa 100644 --- a/Editor/HPUIContinuousInteractableEditor.cs +++ b/Editor/HPUIContinuousInteractableEditor.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEditor; -using ubco.ovilab.HPUI.Core; +using ubco.ovilab.HPUI.Interaction; using System.Collections.Generic; using System.Linq; diff --git a/Editor/HPUIInteractorEditor.cs b/Editor/HPUIInteractorEditor.cs index 51fe64b..8af4924 100644 --- a/Editor/HPUIInteractorEditor.cs +++ b/Editor/HPUIInteractorEditor.cs @@ -1,5 +1,5 @@ using UnityEditor; -using ubco.ovilab.HPUI.Core; +using ubco.ovilab.HPUI.Interaction; using UnityEditor.XR.Interaction.Toolkit; using System.Collections.Generic; diff --git a/Runtime/Assets_v1.meta b/Runtime/Assets_Legacy.meta similarity index 100% rename from Runtime/Assets_v1.meta rename to Runtime/Assets_Legacy.meta diff --git a/Runtime/Assets_v1/Plugins.meta b/Runtime/Assets_Legacy/Plugins.meta similarity index 100% rename from Runtime/Assets_v1/Plugins.meta rename to Runtime/Assets_Legacy/Plugins.meta diff --git a/Runtime/Assets_v1/Plugins/alglib400gpl_net2.dll b/Runtime/Assets_Legacy/Plugins/alglib400gpl_net2.dll similarity index 100% rename from Runtime/Assets_v1/Plugins/alglib400gpl_net2.dll rename to Runtime/Assets_Legacy/Plugins/alglib400gpl_net2.dll diff --git a/Runtime/Assets_v1/Plugins/alglib400gpl_net2.dll.meta b/Runtime/Assets_Legacy/Plugins/alglib400gpl_net2.dll.meta similarity index 100% rename from Runtime/Assets_v1/Plugins/alglib400gpl_net2.dll.meta rename to Runtime/Assets_Legacy/Plugins/alglib400gpl_net2.dll.meta diff --git a/Runtime/Assets_v1/Prefabs.meta b/Runtime/Assets_Legacy/Prefabs.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs.meta rename to Runtime/Assets_Legacy/Prefabs.meta diff --git a/Runtime/Assets_v1/Prefabs/DeformableSurface.prefab b/Runtime/Assets_Legacy/Prefabs/DeformableSurface.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/DeformableSurface.prefab rename to Runtime/Assets_Legacy/Prefabs/DeformableSurface.prefab diff --git a/Runtime/Assets_v1/Prefabs/DeformableSurface.prefab.meta b/Runtime/Assets_Legacy/Prefabs/DeformableSurface.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/DeformableSurface.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/DeformableSurface.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/InteractionManager.prefab b/Runtime/Assets_Legacy/Prefabs/InteractionManager.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/InteractionManager.prefab rename to Runtime/Assets_Legacy/Prefabs/InteractionManager.prefab diff --git a/Runtime/Assets_v1/Prefabs/InteractionManager.prefab.meta b/Runtime/Assets_Legacy/Prefabs/InteractionManager.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/InteractionManager.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/InteractionManager.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyL.prefab b/Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyL.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyL.prefab rename to Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyL.prefab diff --git a/Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyL.prefab.meta b/Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyL.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyL.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyL.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyR.prefab b/Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyR.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyR.prefab rename to Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyR.prefab diff --git a/Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyR.prefab.meta b/Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyR.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/OVRHandCoordinateProxyR.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/OVRHandCoordinateProxyR.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/SkinnedMeshDeformableSurface.prefab b/Runtime/Assets_Legacy/Prefabs/SkinnedMeshDeformableSurface.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/SkinnedMeshDeformableSurface.prefab rename to Runtime/Assets_Legacy/Prefabs/SkinnedMeshDeformableSurface.prefab diff --git a/Runtime/Assets_v1/Prefabs/SkinnedMeshDeformableSurface.prefab.meta b/Runtime/Assets_Legacy/Prefabs/SkinnedMeshDeformableSurface.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/SkinnedMeshDeformableSurface.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/SkinnedMeshDeformableSurface.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyL.prefab b/Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyL.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyL.prefab rename to Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyL.prefab diff --git a/Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyL.prefab.meta b/Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyL.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyL.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyL.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyR.prefab b/Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyR.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyR.prefab rename to Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyR.prefab diff --git a/Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyR.prefab.meta b/Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyR.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/ViconHandCoordinateProxyR.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/ViconHandCoordinateProxyR.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/btn_container.prefab b/Runtime/Assets_Legacy/Prefabs/btn_container.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/btn_container.prefab rename to Runtime/Assets_Legacy/Prefabs/btn_container.prefab diff --git a/Runtime/Assets_v1/Prefabs/btn_container.prefab.meta b/Runtime/Assets_Legacy/Prefabs/btn_container.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/btn_container.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/btn_container.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/btn_container_square.prefab b/Runtime/Assets_Legacy/Prefabs/btn_container_square.prefab similarity index 100% rename from Runtime/Assets_v1/Prefabs/btn_container_square.prefab rename to Runtime/Assets_Legacy/Prefabs/btn_container_square.prefab diff --git a/Runtime/Assets_v1/Prefabs/btn_container_square.prefab.meta b/Runtime/Assets_Legacy/Prefabs/btn_container_square.prefab.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/btn_container_square.prefab.meta rename to Runtime/Assets_Legacy/Prefabs/btn_container_square.prefab.meta diff --git a/Runtime/Assets_v1/Prefabs/square.png b/Runtime/Assets_Legacy/Prefabs/square.png similarity index 100% rename from Runtime/Assets_v1/Prefabs/square.png rename to Runtime/Assets_Legacy/Prefabs/square.png diff --git a/Runtime/Assets_v1/Prefabs/square.png.meta b/Runtime/Assets_Legacy/Prefabs/square.png.meta similarity index 100% rename from Runtime/Assets_v1/Prefabs/square.png.meta rename to Runtime/Assets_Legacy/Prefabs/square.png.meta diff --git a/Runtime/Assets_v1/Scripts.meta b/Runtime/Assets_Legacy/Scripts.meta similarity index 100% rename from Runtime/Assets_v1/Scripts.meta rename to Runtime/Assets_Legacy/Scripts.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI.meta b/Runtime/Assets_Legacy/Scripts/HPUI.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI.meta rename to Runtime/Assets_Legacy/Scripts/HPUI.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/AddOffsetToLinkers.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/AddOffsetToLinkers.cs similarity index 98% rename from Runtime/Assets_v1/Scripts/HPUI/Core/AddOffsetToLinkers.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/AddOffsetToLinkers.cs index aabca77..c449513 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/AddOffsetToLinkers.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/AddOffsetToLinkers.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { public class AddOffsetToLinkers : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/AddOffsetToLinkers.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/AddOffsetToLinkers.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/AddOffsetToLinkers.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/AddOffsetToLinkers.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonColorBehaviour.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonColorBehaviour.cs similarity index 98% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonColorBehaviour.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonColorBehaviour.cs index ce80c39..6bb3425 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonColorBehaviour.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonColorBehaviour.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { public class ButtonColorBehaviour : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonColorBehaviour.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonColorBehaviour.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonColorBehaviour.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonColorBehaviour.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonController.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonController.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonController.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonController.cs index d43c35d..d0d6c1d 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonController.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonController.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { [DefaultExecutionOrder(110)] public class ButtonController : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonController.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonController.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonController.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonController.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonScaleBehaviour.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonScaleBehaviour.cs similarity index 93% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonScaleBehaviour.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonScaleBehaviour.cs index 75e5fa6..b6300a1 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonScaleBehaviour.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonScaleBehaviour.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { [DefaultExecutionOrder(100)] public class ButtonScaleBehaviour : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonScaleBehaviour.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonScaleBehaviour.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonScaleBehaviour.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonScaleBehaviour.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonTriggerCollider.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonTriggerCollider.cs similarity index 78% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonTriggerCollider.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonTriggerCollider.cs index 77ba4a3..335b231 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonTriggerCollider.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonTriggerCollider.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { [RequireComponent(typeof(Collider))] public class ButtonTriggerCollider : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonTriggerCollider.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonTriggerCollider.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonTriggerCollider.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonTriggerCollider.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonZone.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonZone.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonZone.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonZone.cs index 8a06e34..d8f6c6d 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonZone.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonZone.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { public class ButtonZone : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/ButtonZone.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonZone.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/ButtonZone.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/ButtonZone.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs similarity index 93% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs index 7bd5842..2026140 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using UnityEngine; -using ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay; +using ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { public class CalibrateButton2 : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CalibrateButton2.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs index 93e8a80..a2d59ab 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs @@ -2,7 +2,7 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { public class ConnectedStaticDisplay : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/ConnectedStaticDisplay.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs similarity index 95% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs index ebc0254..05146df 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { public abstract class CoordinateManager : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/CoordinateManager.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs index 63a0153..e570ba3 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs @@ -6,9 +6,9 @@ using UnityEngine.Jobs; using System; using System.Linq; -using ubc.ok.ovilab.HPUI.Utils; +using ubco.ovilab.HPUI.Legacy.utils; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { public class DeformableSurfaceDisplayManager : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformableSurfaceDisplayManager.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs index 3956a9a..5fa3a3f 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { /* This class modifies the coordnates of a mesh based on some criteria diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationCoordinateManager.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs similarity index 97% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs index 6c50bad..d1e3c41 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { [RequireComponent(typeof(DeformationCoordinateManager))] public class DeformationLimiter : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DeformationLimiter.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs index 3eab30c..32526c6 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs @@ -3,7 +3,7 @@ using UnityEngine; //using IronPython.Hosting; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { public class DynamicMeshDeformer : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/DynamicMeshDeformer.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs index 9a92b93..2f9fd1c 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { /* Provided the dimensions of a mesh, this class will gerneate the mesh diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/PlaneMeshGenerator.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs similarity index 98% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs index 34c2617..780989c 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs @@ -4,7 +4,7 @@ using System.Linq; using Unity.Collections; -namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay +namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay { public class SkinnedMeshCoordinateManager : CoordinateManager { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Deformable Surface Display/SkinnedMeshCoordinateManager.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Events.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Events.cs similarity index 93% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Events.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Events.cs index 64a7f86..eccf0a0 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/Events.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Events.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine.Events; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { /// /// Event containing a ButtonController as a parameter diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/Events.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/Events.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/Events.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/Events.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/HandCoordinateManager.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/HandCoordinateManager.cs similarity index 97% rename from Runtime/Assets_v1/Scripts/HPUI/Core/HandCoordinateManager.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/HandCoordinateManager.cs index dc0ea72..ad31b7b 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/HandCoordinateManager.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/HandCoordinateManager.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using UnityEngine; -using static ubc.ok.ovilab.HPUI.utils.Extensions; +using static ubco.ovilab.HPUI.Legacy.utils.Extensions; using System.Linq; using System; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { [DefaultExecutionOrder(-140)] public class HandCoordinateManager : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/HandCoordinateManager.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/HandCoordinateManager.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/HandCoordinateManager.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/HandCoordinateManager.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/HandsManager.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/HandsManager.cs similarity index 92% rename from Runtime/Assets_v1/Scripts/HPUI/Core/HandsManager.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/HandsManager.cs index 2cdee04..7a0d474 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/HandsManager.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/HandsManager.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { [DefaultExecutionOrder(-200)] public class HandsManager : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/HandsManager.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/HandsManager.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/HandsManager.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/HandsManager.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/InteractableButtonsRoot.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractableButtonsRoot.cs similarity index 72% rename from Runtime/Assets_v1/Scripts/HPUI/Core/InteractableButtonsRoot.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractableButtonsRoot.cs index 78e5080..ce27f11 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/InteractableButtonsRoot.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractableButtonsRoot.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { public class InteractableButtonsRoot : MonoBehaviour { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/InteractableButtonsRoot.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractableButtonsRoot.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/InteractableButtonsRoot.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractableButtonsRoot.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/InteractionManger.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractionManger.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/InteractionManger.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractionManger.cs index 1e3d3f0..e862876 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/InteractionManger.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractionManger.cs @@ -5,7 +5,7 @@ using System.Linq; using UnityEngine.Events; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { [DefaultExecutionOrder(120)] public class InteractionManger : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/InteractionManger.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractionManger.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/InteractionManger.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/InteractionManger.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/TransformLinker.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/TransformLinker.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Core/TransformLinker.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/TransformLinker.cs index 9ea7476..c88ab7f 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/TransformLinker.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/TransformLinker.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { [DefaultExecutionOrder(-130)] public class TransformLinker : MonoBehaviour diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/TransformLinker.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/TransformLinker.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/TransformLinker.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/TransformLinker.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs similarity index 95% rename from Runtime/Assets_v1/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs index 53de9b3..8a1b1ea 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEngine; -namespace ubc.ok.ovilab.HPUI.CoreV1 +namespace ubco.ovilab.HPUI.Legacy { /// /// For all child TransformLinkeres under the object with this script, diff --git a/Runtime/Assets_v1/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Core/TransoformLinkerRelativeModifier.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Utils.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Utils.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/Coord.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Coord.cs similarity index 95% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/Coord.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/Coord.cs index 872a5c3..e4459aa 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Utils/Coord.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Coord.cs @@ -1,4 +1,4 @@ -namespace ubc.ok.ovilab.HPUI.Utils +namespace ubco.ovilab.HPUI.Legacy.utils { public class Coord { private int _x, _y = 0; diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/Coord.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Coord.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/Coord.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/Coord.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/Extensions.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Extensions.cs similarity index 97% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/Extensions.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/Extensions.cs index 2eae27a..5e36620 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Utils/Extensions.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Extensions.cs @@ -1,7 +1,7 @@ using UnityEngine; using System; -namespace ubc.ok.ovilab.HPUI.utils +namespace ubco.ovilab.HPUI.Legacy.utils { public static class Extensions { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/Extensions.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Extensions.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/Extensions.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/Extensions.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/OneEuroFilter.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/OneEuroFilter.cs similarity index 99% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/OneEuroFilter.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/OneEuroFilter.cs index 687df9d..de371cd 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Utils/OneEuroFilter.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/OneEuroFilter.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; -namespace ubc.ok.ovilab.HPUI.Utils +namespace ubco.ovilab.HPUI.Legacy.utils { class LowPassFilter { diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/OneEuroFilter.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/OneEuroFilter.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/OneEuroFilter.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/OneEuroFilter.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/Range.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Range.cs similarity index 93% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/Range.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/Range.cs index 0b501b7..f8fb669 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Utils/Range.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Range.cs @@ -1,6 +1,6 @@ using System; -namespace ubc.ok.ovilab.HPUI.Utils +namespace ubco.ovilab.HPUI.Legacy.utils { [Serializable] public class Range diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/Range.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/Range.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/Range.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/Range.cs.meta diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/ReparentFixedTransform.cs b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/ReparentFixedTransform.cs similarity index 96% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/ReparentFixedTransform.cs rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/ReparentFixedTransform.cs index 200bfcf..1319aec 100644 --- a/Runtime/Assets_v1/Scripts/HPUI/Utils/ReparentFixedTransform.cs +++ b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/ReparentFixedTransform.cs @@ -1,9 +1,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using static ubc.ok.ovilab.HPUI.utils.Extensions; +using static ubco.ovilab.HPUI.Legacy.utils.Extensions; -namespace ubc.ok.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Legacy.utils { /// /// The current objects transform is set to match the diff --git a/Runtime/Assets_v1/Scripts/HPUI/Utils/ReparentFixedTransform.cs.meta b/Runtime/Assets_Legacy/Scripts/HPUI/Utils/ReparentFixedTransform.cs.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/HPUI/Utils/ReparentFixedTransform.cs.meta rename to Runtime/Assets_Legacy/Scripts/HPUI/Utils/ReparentFixedTransform.cs.meta diff --git a/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef b/Runtime/Assets_Legacy/Scripts/ubc.ok.ovilab.HPUI.Legacy.asmdef similarity index 54% rename from Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef rename to Runtime/Assets_Legacy/Scripts/ubc.ok.ovilab.HPUI.Legacy.asmdef index 71d9731..6f76b2f 100644 --- a/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef +++ b/Runtime/Assets_Legacy/Scripts/ubc.ok.ovilab.HPUI.Legacy.asmdef @@ -1,12 +1,14 @@ { - "name": "ubc.ok.ovilab.HPUI", - "rootNamespace": "ubc.ok.ovilab.HPUI", + "name": "ubco.ovilab.HPUI.Legacy", + "rootNamespace": "ubco.ovilab.HPUI.Legacy", "references": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], + "overrideReferences": true, + "precompiledReferences": [ + "alglib400gpl_net2.dll" + ], "autoReferenced": true, "defineConstraints": [], "versionDefines": [], diff --git a/Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef.meta b/Runtime/Assets_Legacy/Scripts/ubc.ok.ovilab.HPUI.Legacy.asmdef.meta similarity index 100% rename from Runtime/Assets_v1/Scripts/ubc.ok.ovilab.HPUI.asmdef.meta rename to Runtime/Assets_Legacy/Scripts/ubc.ok.ovilab.HPUI.Legacy.asmdef.meta diff --git a/Runtime/Interactions.meta b/Runtime/Interaction.meta similarity index 100% rename from Runtime/Interactions.meta rename to Runtime/Interaction.meta diff --git a/Runtime/DeformableSurface.cs b/Runtime/Interaction/DeformableSurface.cs similarity index 99% rename from Runtime/DeformableSurface.cs rename to Runtime/Interaction/DeformableSurface.cs index 7565ce3..993fc07 100644 --- a/Runtime/DeformableSurface.cs +++ b/Runtime/Interaction/DeformableSurface.cs @@ -3,7 +3,7 @@ using Unity.Collections; using UnityEngine; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { /// /// Main class to generate deformable meshes that use Unity's . diff --git a/Runtime/DeformableSurface.cs.meta b/Runtime/Interaction/DeformableSurface.cs.meta similarity index 100% rename from Runtime/DeformableSurface.cs.meta rename to Runtime/Interaction/DeformableSurface.cs.meta diff --git a/Runtime/DeformableSurfaceCollidersManager.cs b/Runtime/Interaction/DeformableSurfaceCollidersManager.cs similarity index 99% rename from Runtime/DeformableSurfaceCollidersManager.cs rename to Runtime/Interaction/DeformableSurfaceCollidersManager.cs index bb66c03..4d5aaeb 100644 --- a/Runtime/DeformableSurfaceCollidersManager.cs +++ b/Runtime/Interaction/DeformableSurfaceCollidersManager.cs @@ -5,7 +5,7 @@ using UnityEngine.Jobs; using System; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { /// /// Component to manage the colliders of the deformable surface. diff --git a/Runtime/DeformableSurfaceCollidersManager.cs.meta b/Runtime/Interaction/DeformableSurfaceCollidersManager.cs.meta similarity index 100% rename from Runtime/DeformableSurfaceCollidersManager.cs.meta rename to Runtime/Interaction/DeformableSurfaceCollidersManager.cs.meta diff --git a/Runtime/Interactions/HPUIBaseInteractable.cs b/Runtime/Interaction/HPUIBaseInteractable.cs similarity index 99% rename from Runtime/Interactions/HPUIBaseInteractable.cs rename to Runtime/Interaction/HPUIBaseInteractable.cs index 070a895..97db364 100644 --- a/Runtime/Interactions/HPUIBaseInteractable.cs +++ b/Runtime/Interaction/HPUIBaseInteractable.cs @@ -3,7 +3,7 @@ using UnityEngine.XR.Interaction.Toolkit; using UnityEngine.XR.Interaction.Toolkit.Utilities; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { /// /// Base HPUI interactable. diff --git a/Runtime/Interactions/HPUIBaseInteractable.cs.meta b/Runtime/Interaction/HPUIBaseInteractable.cs.meta similarity index 100% rename from Runtime/Interactions/HPUIBaseInteractable.cs.meta rename to Runtime/Interaction/HPUIBaseInteractable.cs.meta diff --git a/Runtime/Interactions/HPUIContinuousInteractable.cs b/Runtime/Interaction/HPUIContinuousInteractable.cs similarity index 98% rename from Runtime/Interactions/HPUIContinuousInteractable.cs rename to Runtime/Interaction/HPUIContinuousInteractable.cs index aee857c..8b417f8 100644 --- a/Runtime/Interactions/HPUIContinuousInteractable.cs +++ b/Runtime/Interaction/HPUIContinuousInteractable.cs @@ -1,10 +1,12 @@ using System.Collections; using System.Collections.Generic; +using ubco.ovilab.HPUI.Tracking; +using ubco.ovilab.HPUI.Utils; using UnityEngine; using UnityEngine.XR.Hands; using UnityEngine.XR.Interaction.Toolkit; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { /// /// diff --git a/Runtime/Interactions/HPUIContinuousInteractable.cs.meta b/Runtime/Interaction/HPUIContinuousInteractable.cs.meta similarity index 100% rename from Runtime/Interactions/HPUIContinuousInteractable.cs.meta rename to Runtime/Interaction/HPUIContinuousInteractable.cs.meta diff --git a/Runtime/Interactions/HPUIEvents.cs b/Runtime/Interaction/HPUIEvents.cs similarity index 99% rename from Runtime/Interactions/HPUIEvents.cs rename to Runtime/Interaction/HPUIEvents.cs index 871918b..fed24c3 100644 --- a/Runtime/Interactions/HPUIEvents.cs +++ b/Runtime/Interaction/HPUIEvents.cs @@ -3,7 +3,7 @@ using UnityEngine.Events; using UnityEngine.XR.Interaction.Toolkit; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { public enum HPUIGestureState { diff --git a/Runtime/Interactions/HPUIEvents.cs.meta b/Runtime/Interaction/HPUIEvents.cs.meta similarity index 100% rename from Runtime/Interactions/HPUIEvents.cs.meta rename to Runtime/Interaction/HPUIEvents.cs.meta diff --git a/Runtime/Interactions/HPUIGestureLogic.cs b/Runtime/Interaction/HPUIGestureLogic.cs similarity index 99% rename from Runtime/Interactions/HPUIGestureLogic.cs rename to Runtime/Interaction/HPUIGestureLogic.cs index ed790ae..3b1f928 100644 --- a/Runtime/Interactions/HPUIGestureLogic.cs +++ b/Runtime/Interaction/HPUIGestureLogic.cs @@ -4,7 +4,7 @@ using UnityEngine.Pool; using UnityEngine.XR.Interaction.Toolkit; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { /// /// Encapsulates the logic for HPUI gesture interactions. diff --git a/Runtime/Interactions/HPUIGestureLogic.cs.meta b/Runtime/Interaction/HPUIGestureLogic.cs.meta similarity index 100% rename from Runtime/Interactions/HPUIGestureLogic.cs.meta rename to Runtime/Interaction/HPUIGestureLogic.cs.meta diff --git a/Runtime/Interactions/HPUIInteractor.cs b/Runtime/Interaction/HPUIInteractor.cs similarity index 98% rename from Runtime/Interactions/HPUIInteractor.cs rename to Runtime/Interaction/HPUIInteractor.cs index 1910a8a..0771c44 100644 --- a/Runtime/Interactions/HPUIInteractor.cs +++ b/Runtime/Interaction/HPUIInteractor.cs @@ -5,7 +5,7 @@ using UnityEngine.XR.Hands; using UnityEngine.XR.Interaction.Toolkit; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { /// /// Base HPUI interactor. diff --git a/Runtime/Interactions/HPUIInteractor.cs.meta b/Runtime/Interaction/HPUIInteractor.cs.meta similarity index 100% rename from Runtime/Interactions/HPUIInteractor.cs.meta rename to Runtime/Interaction/HPUIInteractor.cs.meta diff --git a/Runtime/Interactions/IHPUIInteractable.cs b/Runtime/Interaction/IHPUIInteractable.cs similarity index 95% rename from Runtime/Interactions/IHPUIInteractable.cs rename to Runtime/Interaction/IHPUIInteractable.cs index b7b75d7..b8499a9 100644 --- a/Runtime/Interactions/IHPUIInteractable.cs +++ b/Runtime/Interaction/IHPUIInteractable.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { public interface IHPUIInteractable : IXRInteractable, IXRSelectInteractable { diff --git a/Runtime/Interactions/IHPUIInteractable.cs.meta b/Runtime/Interaction/IHPUIInteractable.cs.meta similarity index 100% rename from Runtime/Interactions/IHPUIInteractable.cs.meta rename to Runtime/Interaction/IHPUIInteractable.cs.meta diff --git a/Runtime/Interactions/IHPUIInteractor.cs b/Runtime/Interaction/IHPUIInteractor.cs similarity index 92% rename from Runtime/Interactions/IHPUIInteractor.cs rename to Runtime/Interaction/IHPUIInteractor.cs index cd63f1c..7a5cefc 100644 --- a/Runtime/Interactions/IHPUIInteractor.cs +++ b/Runtime/Interaction/IHPUIInteractor.cs @@ -1,6 +1,6 @@ using UnityEngine.XR.Interaction.Toolkit; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Interaction { public interface IHPUIInteractor: IXRInteractor, IXRSelectInteractor { diff --git a/Runtime/Interactions/IHPUIInteractor.cs.meta b/Runtime/Interaction/IHPUIInteractor.cs.meta similarity index 100% rename from Runtime/Interactions/IHPUIInteractor.cs.meta rename to Runtime/Interaction/IHPUIInteractor.cs.meta diff --git a/Runtime/Tracking/HandJointData.cs b/Runtime/Tracking/HandJointData.cs index 7af51b0..9f4bb2d 100644 --- a/Runtime/Tracking/HandJointData.cs +++ b/Runtime/Tracking/HandJointData.cs @@ -5,7 +5,7 @@ using Unity.XR.CoreUtils; using UnityEngine.Pool; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Tracking { /// /// Utility class to expose joint data accessible. diff --git a/Runtime/Tracking/JointFollower.cs b/Runtime/Tracking/JointFollower.cs index ae71bad..e9cf81f 100644 --- a/Runtime/Tracking/JointFollower.cs +++ b/Runtime/Tracking/JointFollower.cs @@ -1,8 +1,9 @@ using System; +using ubco.ovilab.HPUI.Utils; using UnityEngine; using UnityEngine.XR.Hands; -namespace ubco.ovilab.HPUI.Core +namespace ubco.ovilab.HPUI.Tracking { /// /// A component that makes the object follow a hand joint diff --git a/Runtime/ubco.ovilab.HPUI.asmdef b/Runtime/ubco.ovilab.HPUI.asmdef index 934cae0..959fd38 100644 --- a/Runtime/ubco.ovilab.HPUI.asmdef +++ b/Runtime/ubco.ovilab.HPUI.asmdef @@ -10,9 +10,7 @@ "excludePlatforms": [], "allowUnsafeCode": false, "overrideReferences": true, - "precompiledReferences": [ - "alglib400gpl_net2.dll" - ], + "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], "versionDefines": [], diff --git a/Runtime/Utilities.meta b/Runtime/utils.meta similarity index 77% rename from Runtime/Utilities.meta rename to Runtime/utils.meta index 69a30d6..4859157 100644 --- a/Runtime/Utilities.meta +++ b/Runtime/utils.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 77f908cd2a478a942a5491285fd3208c +guid: 880ddb861642d484b9a778a447262e76 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Runtime/Utilities/ConditionalFieldAttribute.cs b/Runtime/utils/ConditionalFieldAttribute.cs similarity index 94% rename from Runtime/Utilities/ConditionalFieldAttribute.cs rename to Runtime/utils/ConditionalFieldAttribute.cs index f8455ed..98bb8aa 100644 --- a/Runtime/Utilities/ConditionalFieldAttribute.cs +++ b/Runtime/utils/ConditionalFieldAttribute.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace ubco.ovilab.HPUI +namespace ubco.ovilab.HPUI.Utils { // Based on https://github.com/Deadcows/MyBox/blob/master/Attributes/ConditionalFieldAttribute.cs /// diff --git a/Runtime/Utilities/ConditionalFieldAttribute.cs.meta b/Runtime/utils/ConditionalFieldAttribute.cs.meta similarity index 100% rename from Runtime/Utilities/ConditionalFieldAttribute.cs.meta rename to Runtime/utils/ConditionalFieldAttribute.cs.meta