From ea9fdeb5ec19b26fbbdae90e5c5f1d84bbbf5b49 Mon Sep 17 00:00:00 2001 From: Matt Schoen Date: Mon, 25 Nov 2019 03:31:57 -0800 Subject: [PATCH] Change namespace to Unity.Labs.XR to avoid conflict with LineRenderer in other Unity.Labs namespaces --- Editor/MeshChainShaderGUI.cs | 2 +- Editor/XRLineRendererEditor.cs | 2 +- Editor/XRTrailRendererEditor.cs | 2 +- Runtime/MeshChainRenderer.cs | 2 +- Runtime/XRLineRenderer.cs | 2 +- Runtime/XRMeshChain.cs | 2 +- Runtime/XRTrailRenderer.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Editor/MeshChainShaderGUI.cs b/Editor/MeshChainShaderGUI.cs index 2589909..0ac539f 100644 --- a/Editor/MeshChainShaderGUI.cs +++ b/Editor/MeshChainShaderGUI.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Labs.XRLineRenderer +namespace Unity.Labs.XR { class MeshChainShaderGUI : ShaderGUI { diff --git a/Editor/XRLineRendererEditor.cs b/Editor/XRLineRendererEditor.cs index 9b58ed3..367b8d8 100644 --- a/Editor/XRLineRendererEditor.cs +++ b/Editor/XRLineRendererEditor.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Labs.XRLineRenderer +namespace Unity.Labs.XR { [CustomEditor(typeof(XRLineRenderer))] [CanEditMultipleObjects] diff --git a/Editor/XRTrailRendererEditor.cs b/Editor/XRTrailRendererEditor.cs index e6cde7a..f7d029a 100644 --- a/Editor/XRTrailRendererEditor.cs +++ b/Editor/XRTrailRendererEditor.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace Unity.Labs.XRLineRenderer +namespace Unity.Labs.XR { [CustomEditor(typeof(XRTrailRenderer))] [CanEditMultipleObjects] diff --git a/Runtime/MeshChainRenderer.cs b/Runtime/MeshChainRenderer.cs index 438e90b..5828790 100644 --- a/Runtime/MeshChainRenderer.cs +++ b/Runtime/MeshChainRenderer.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.XRLineRenderer +namespace Unity.Labs.XR { /// /// A unified base class for the XR Line Renderer and XR Trail Renderer diff --git a/Runtime/XRLineRenderer.cs b/Runtime/XRLineRenderer.cs index 014f9b3..8c6198b 100644 --- a/Runtime/XRLineRenderer.cs +++ b/Runtime/XRLineRenderer.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.Serialization; -namespace Unity.Labs.XRLineRenderer +namespace Unity.Labs.XR { /// /// An XR-Focused drop-in replacement for the Line Renderer diff --git a/Runtime/XRMeshChain.cs b/Runtime/XRMeshChain.cs index 9c2b826..871f28a 100644 --- a/Runtime/XRMeshChain.cs +++ b/Runtime/XRMeshChain.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace Unity.Labs.XRLineRenderer +namespace Unity.Labs.XR { /// /// The mesh chain handles all the translation between Unity's mesh class, diff --git a/Runtime/XRTrailRenderer.cs b/Runtime/XRTrailRenderer.cs index b4b69be..1f66dcc 100644 --- a/Runtime/XRTrailRenderer.cs +++ b/Runtime/XRTrailRenderer.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Unity.Labs.XRLineRenderer +namespace Unity.Labs.XR { /// /// An XR-Focused drop-in replacement for the Trail Renderer