Added CVarContainer attribute

Project/Assets/Plugins/Lunar/App.cs

@@ -59,6 +59,12 @@ public static bool ExecCommand(string commandLine, bool manual = false)
                 throw new ArgumentNullException("commandLine");
             }
 
+            if (s_sharedInstance == null)
+            {
+                Log.e("Can't execute command: app is not initialized");
+                return false;
+            }
+
             return Imp.ExecCommand(commandLine, manual);
         }
 

Project/Assets/Plugins/Lunar/Config.cs

@@ -28,8 +28,6 @@ namespace LunarPluginInternal
 {
     static class Config
     {
-        public static readonly bool isFullFeatured;
-
         public static readonly bool isUnityFree;
         public static readonly bool isUnityPro;
 
@@ -40,15 +38,13 @@ static Config()
         {
             try
             {
-                isFullFeatured = Application.isEditor;
                 isDebugBuild = Debug.isDebugBuild;
                 isUnityPro = Application.HasProLicense();
                 isUnityFree = !isUnityPro;
                 isUnityBuild = true;
             }
             catch (Exception)
             {
-                isFullFeatured = true;
                 isUnityFree = isUnityPro = false;
                 isDebugBuild = true;
                 isUnityBuild = false;

Project/Assets/Plugins/Lunar/Console/CVar.cs

@@ -231,12 +231,10 @@ private CVar(string name, CVarType type, CFlags flags)
 
         #region Registry
 
+        [System.Diagnostics.Conditional("UNITY_EDITOR")]
         private static void Register(CVar cvar)
         {
-            if (Config.isFullFeatured)
-            {
-                CRegistery.Register(cvar);
-            }
+            CRegistery.Register(cvar);
         }
 
         #endregion
@@ -245,24 +243,22 @@ private static void Register(CVar cvar)
 
         #region Delegates
 
+        [System.Diagnostics.Conditional("UNITY_EDITOR")]
         public void AddDelegate(CVarChangedDelegate del)
         {
-            if (Config.isFullFeatured)
+            if (del == null)
             {
-                if (del == null)
-                {
-                    throw new ArgumentNullException("del");
-                }
+                throw new ArgumentNullException("del");
+            }
 
-                if (m_delegateList == null)
-                {
-                    m_delegateList = new CVarChangedDelegateList(1);
-                    m_delegateList.Add(del);
-                }
-                else if (!m_delegateList.Contains(del))
-                {
-                    m_delegateList.Add(del);
-                }
+            if (m_delegateList == null)
+            {
+                m_delegateList = new CVarChangedDelegateList(1);
+                m_delegateList.Add(del);
+            }
+            else if (!m_delegateList.Contains(del))
+            {
+                m_delegateList.Add(del);
             }
         }
 

Project/Assets/Plugins/Lunar/Console/CVarContainerAttribute.cs

@@ -0,0 +1,12 @@
+using System;
+
+using LunarPluginInternal;
+
+namespace LunarPlugin
+{
+    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
+    public class CVarContainerAttribute : Attribute
+    {
+    }
+}
+

Project/Assets/Plugins/Lunar/Console/RuntimeResolver.cs

@@ -19,7 +19,7 @@
 //  limitations under the License.
 //
 
-using System;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
@@ -51,10 +51,9 @@ public static List<CCommand> ResolveCommands()
                 {
                     foreach (Type type in assembly.GetTypes())
                     {
-                        object[] attrs = type.GetCustomAttributes(typeof(CCommandAttribute), true);
-                        if (attrs != null && attrs.Length == 1)
+                        CCommandAttribute cmdAttr = GetCustomAttribute<CCommandAttribute>(type);
+                        if (cmdAttr != null)
                         {
-                            CCommandAttribute cmdAttr = (CCommandAttribute)attrs[0];
                             string commandName = cmdAttr.Name;
                             if (!IsCorrectPlatform(cmdAttr.Flags))
                             {
@@ -80,6 +79,25 @@ public static List<CCommand> ResolveCommands()
                                 Log.e("Unable to register command: name={0} type={1}", commandName, type);
                             }
                         }
+                        else
+                        {
+                            CVarContainerAttribute cvarAttr = GetCustomAttribute<CVarContainerAttribute>(type);
+                            if (cvarAttr != null)
+                            {
+                                try
+                                {
+                                    FieldInfo[] fields = type.GetFields(BindingFlags.Static|BindingFlags.Public);
+                                    if (fields != null && fields.Length > 0)
+                                    {
+                                        fields[0].GetValue(null);
+                                    }
+                                }
+                                catch (Exception e)
+                                {
+                                    Log.error(e, "Unable to initialize cvar container: {0}", type);
+                                }
+                            }
+                        }
                     }
                 }
             }
@@ -102,6 +120,12 @@ public static List<CCommand> ResolveCommands()
             return list;
         }
 
+        private static T GetCustomAttribute<T>(Type type) where T : Attribute
+        {
+            object[] attributes = type.GetCustomAttributes(typeof(T), false);
+            return attributes != null && attributes.Length == 1 ? attributes[0] as T : null;
+        }
+
         public static void ResolveOptions(CCommand command)
         {
             ResolveOptions(command, command.GetType());