Skip to content

Commit

Permalink
Restructure project (names & namespaces)
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmed-shariff committed Jan 7, 2024
1 parent 4246d8f commit d026c44
Show file tree
Hide file tree
Showing 120 changed files with 63 additions and 59 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions Editor/ConditionalFieldAttributeDrawer.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using ubco.ovilab.HPUI.Utils;
using UnityEditor;
using UnityEngine;

Expand Down
2 changes: 1 addition & 1 deletion Editor/HPUIBaseInteractableEditor.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Editor/HPUIContinuousInteractableEditor.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Editor/HPUIInteractorEditor.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
public class ButtonColorBehaviour : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
[DefaultExecutionOrder(110)]
public class ButtonController : MonoBehaviour
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
[DefaultExecutionOrder(100)]
public class ButtonScaleBehaviour : MonoBehaviour
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
[RequireComponent(typeof(Collider))]
public class ButtonTriggerCollider : MonoBehaviour
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
public class ButtonZone : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEngine;


namespace ubc.ok.ovilab.HPUI.CoreV1.DeformableSurfaceDisplay
namespace ubco.ovilab.HPUI.Legacy.DeformableSurfaceDisplay
{

public class ConnectedStaticDisplay : MonoBehaviour
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine.Events;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
/// <summary>
/// Event containing a ButtonController as a parameter
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
public class InteractableButtonsRoot : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
[DefaultExecutionOrder(-130)]
public class TransformLinker : MonoBehaviour
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Linq;
using UnityEngine;

namespace ubc.ok.ovilab.HPUI.CoreV1
namespace ubco.ovilab.HPUI.Legacy
{
/// <summary>
/// For all child TransformLinkeres under the object with this script,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace ubc.ok.ovilab.HPUI.Utils
namespace ubco.ovilab.HPUI.Legacy.utils
{
public class Coord {
private int _x, _y = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using UnityEngine;
using System;

namespace ubc.ok.ovilab.HPUI.utils
namespace ubco.ovilab.HPUI.Legacy.utils
{
public static class Extensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using System.Collections.Generic;


namespace ubc.ok.ovilab.HPUI.Utils
namespace ubco.ovilab.HPUI.Legacy.utils
{
class LowPassFilter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace ubc.ok.ovilab.HPUI.Utils
namespace ubco.ovilab.HPUI.Legacy.utils
{
[Serializable]
public class Range
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// The current objects transform is set to match the
Expand Down
Original file line number Diff line number Diff line change
@@ -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": [],
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Unity.Collections;
using UnityEngine;

namespace ubco.ovilab.HPUI.Core
namespace ubco.ovilab.HPUI.Interaction
{
/// <summary>
/// Main class to generate deformable meshes that use Unity's <see cref="SkinnedMeshRenderer"/>.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using UnityEngine.Jobs;
using System;

namespace ubco.ovilab.HPUI.Core
namespace ubco.ovilab.HPUI.Interaction
{
/// <summary>
/// Component to manage the colliders of the deformable surface.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// Base HPUI interactable.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using UnityEngine.Pool;
using UnityEngine.XR.Interaction.Toolkit;

namespace ubco.ovilab.HPUI.Core
namespace ubco.ovilab.HPUI.Interaction
{
/// <summary>
/// Encapsulates the logic for HPUI gesture interactions.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using UnityEngine.XR.Hands;
using UnityEngine.XR.Interaction.Toolkit;

namespace ubco.ovilab.HPUI.Core
namespace ubco.ovilab.HPUI.Interaction
{
/// <summary>
/// Base HPUI interactor.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine.XR.Interaction.Toolkit;

namespace ubco.ovilab.HPUI.Core
namespace ubco.ovilab.HPUI.Interaction
{
public interface IHPUIInteractor: IXRInteractor, IXRSelectInteractor
{
Expand Down
File renamed without changes.
Loading

0 comments on commit d026c44

Please sign in to comment.