From ce1ff796b8093e71a48d3d9c196c305994b1ae25 Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Fri, 8 May 2026 08:53:27 +0200 Subject: [PATCH] Added Unity subnamespace --- Editor/BrainPickerWindow.cs | 2 +- Editor/Brain_Editor.cs | 2 +- Editor/ClusterEditor.cs | 2 +- Editor/ClusterViewer.cs | 2 +- Editor/ConfigurationChecker.cs | 115 +++++++++--------- Editor/Neuron_Drawer.cs | 4 +- Runtime/Scripts/Brain.cs | 2 +- Runtime/Scripts/Core/Cluster.cs | 1 + .../ScriptableObjects/ClusterPrefab.cs | 2 +- 9 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Editor/BrainPickerWindow.cs b/Editor/BrainPickerWindow.cs index 1a9aa6a..4e2597f 100644 --- a/Editor/BrainPickerWindow.cs +++ b/Editor/BrainPickerWindow.cs @@ -3,7 +3,7 @@ using UnityEngine; using System; using System.Linq; -namespace NanoBrain { +namespace NanoBrain.Unity { public class ClusterPickerWindow : EditorWindow { private Vector2 scroll; diff --git a/Editor/Brain_Editor.cs b/Editor/Brain_Editor.cs index 6a9e654..af4eddc 100644 --- a/Editor/Brain_Editor.cs +++ b/Editor/Brain_Editor.cs @@ -4,7 +4,7 @@ using UnityEditor.UIElements; using UnityEngine; using UnityEngine.UIElements; -namespace NanoBrain { +namespace NanoBrain.Unity { [CustomEditor(typeof(Brain))] public class Brain_Editor : Editor { diff --git a/Editor/ClusterEditor.cs b/Editor/ClusterEditor.cs index 81aaf79..31cc63b 100644 --- a/Editor/ClusterEditor.cs +++ b/Editor/ClusterEditor.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; using UnityEngine.UIElements; -namespace NanoBrain { +namespace NanoBrain.Unity { [CustomEditor(typeof(ClusterPrefab))] public class ClusterEditor : ClusterViewer { diff --git a/Editor/ClusterViewer.cs b/Editor/ClusterViewer.cs index b6e006a..37c4f2b 100644 --- a/Editor/ClusterViewer.cs +++ b/Editor/ClusterViewer.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; using UnityEngine.UIElements; -namespace NanoBrain { +namespace NanoBrain.Unity { public class ClusterViewer : Editor { diff --git a/Editor/ConfigurationChecker.cs b/Editor/ConfigurationChecker.cs index 18c318f..07b07f2 100644 --- a/Editor/ConfigurationChecker.cs +++ b/Editor/ConfigurationChecker.cs @@ -3,76 +3,73 @@ using UnityEditor; using UnityEditor.Build; using UnityEditor.Callbacks; -class ConfigurationChecker { +namespace Passer { - [DidReloadScripts] - protected static void DidReloadScripts() { - CheckUnityMathematics(); - } + class ConfigurationChecker { - public static bool CheckUnityMathematics() { - bool available = isUnityMathematicsAvailable; - UpdateDefine(available, "UNITY_MATHEMATICS"); - return available; - } + [DidReloadScripts] + protected static void DidReloadScripts() { + CheckUnityMathematics(); + } - protected static void UpdateDefine(bool enabled, string define) { - if (enabled) - GlobalDefine(define); - else - GlobalUndefine(define); - } + public static bool CheckUnityMathematics() { + bool available = isUnityMathematicsAvailable; + UpdateDefine(available, "UNITY_MATHEMATICS"); + return available; + } + + protected static void UpdateDefine(bool enabled, string define) { + if (enabled) + GlobalDefine(define); + else + GlobalUndefine(define); + } - public static void GlobalDefine(string name) { - // UnityEngine.Debug.Log("Define " + name); - BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup; - NamedBuildTarget namedBuildTarget = UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup); - //string scriptDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup); - string scriptDefines = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget); - if (!scriptDefines.Contains(name)) { - string newScriptDefines = scriptDefines + " " + name; - if (EditorUserBuildSettings.selectedBuildTargetGroup != 0) + public static void GlobalDefine(string name) { + // UnityEngine.Debug.Log("Define " + name); + BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup; + NamedBuildTarget namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup); + string scriptDefines = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget); + if (!scriptDefines.Contains(name)) { + string newScriptDefines = scriptDefines + " " + name; + if (EditorUserBuildSettings.selectedBuildTargetGroup != 0) + PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, newScriptDefines); + } + } + + public static void GlobalUndefine(string name) { + // UnityEngine.Debug.Log("Undefine " + name); + BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup; + NamedBuildTarget namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup); + string scriptDefines = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget); + if (scriptDefines.Contains(name)) { + int playMakerIndex = scriptDefines.IndexOf(name); + string newScriptDefines = scriptDefines.Remove(playMakerIndex, name.Length); PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, newScriptDefines); - //PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, newScriptDefines); - } - } + } - public static void GlobalUndefine(string name) { - // UnityEngine.Debug.Log("Undefine " + name); - BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup; - NamedBuildTarget namedBuildTarget = UnityEditor.Build.NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup); - // string scriptDefines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup); - string scriptDefines = PlayerSettings.GetScriptingDefineSymbols(namedBuildTarget); - if (scriptDefines.Contains(name)) { - int playMakerIndex = scriptDefines.IndexOf(name); - string newScriptDefines = scriptDefines.Remove(playMakerIndex, name.Length); - PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, newScriptDefines); - // PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, newScriptDefines); } - } + #region Availability - #region Availability + #region Packages - #region Packages - - private static bool isUnityMathematicsAvailable { - get => DoesTypeExist("Unity.Mathematics.float3"); - // { - // return DoesTypeExist("Passer.Tracking.HydraBaseStation"); - // } - } - #endregion Packages - - public static bool DoesTypeExist(string className) { - System.Reflection.Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); - foreach (System.Reflection.Assembly assembly in assemblies) { - if (assembly.GetType(className) != null) - return true; + private static bool isUnityMathematicsAvailable { + get => DoesTypeExist("Unity.Mathematics.float3"); } - return false; + #endregion Packages + + public static bool DoesTypeExist(string className) { + System.Reflection.Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); + foreach (System.Reflection.Assembly assembly in assemblies) { + if (assembly.GetType(className) != null) + return true; + } + return false; + } + + #endregion Availability } - #endregion Availability -} +} \ No newline at end of file diff --git a/Editor/Neuron_Drawer.cs b/Editor/Neuron_Drawer.cs index 6cb226c..d03c4da 100644 --- a/Editor/Neuron_Drawer.cs +++ b/Editor/Neuron_Drawer.cs @@ -5,7 +5,8 @@ using System; using System.Reflection; using System.Collections; -namespace NanoBrain { +namespace NanoBrain.Unity { + [CustomPropertyDrawer(typeof(Neuron))] class Neuron_Drawer : PropertyDrawer { public static void Insepctor(SerializedObject serializedObject, string propertyName ) { @@ -80,4 +81,5 @@ namespace NanoBrain { return en.Current; } } + } \ No newline at end of file diff --git a/Runtime/Scripts/Brain.cs b/Runtime/Scripts/Brain.cs index afffba0..2f7ad90 100644 --- a/Runtime/Scripts/Brain.cs +++ b/Runtime/Scripts/Brain.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace NanoBrain { +namespace NanoBrain.Unity { /// /// The NanoBrain Unity Componnent diff --git a/Runtime/Scripts/Core/Cluster.cs b/Runtime/Scripts/Core/Cluster.cs index 8779e03..e672bf0 100644 --- a/Runtime/Scripts/Core/Cluster.cs +++ b/Runtime/Scripts/Core/Cluster.cs @@ -5,6 +5,7 @@ using UnityEngine; using Unity.Mathematics; using static Unity.Mathematics.math; #endif +using NanoBrain.Unity; namespace NanoBrain { diff --git a/Runtime/Scripts/ScriptableObjects/ClusterPrefab.cs b/Runtime/Scripts/ScriptableObjects/ClusterPrefab.cs index 287d19c..a586568 100644 --- a/Runtime/Scripts/ScriptableObjects/ClusterPrefab.cs +++ b/Runtime/Scripts/ScriptableObjects/ClusterPrefab.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace NanoBrain { +namespace NanoBrain.Unity { /// /// The Unity ScriptableObject to implement re-usable Cluster Prefabs