com.amanotes.gdk 0.2.71 → 0.2.73-1

package/Runtime/Core/GDKString.cs

@@ -0,0 +1,197 @@
+using System;
+using UnityEngine;
+
+namespace Amanotes.Core
+{
+    public static class GDKStringExtension
+    {
+        internal static void Log(GDKString gdkStr, LogType logType, UnityEngine.Object context, Action<string, UnityEngine.Object> logFunc)
+        {
+            StackTraceLogType type = Application.GetStackTraceLogType(logType);
+            Application.SetStackTraceLogType(logType, StackTraceLogType.None);
+            {
+                logFunc(gdkStr.ToString(), context);
+            }
+            Application.SetStackTraceLogType(logType, type);
+            gdkStr.Clear();
+        }
+
+        public static void Log(this GDKString gdkStr, UnityEngine.Object context = null)
+        {
+            Log(gdkStr, LogType.Log, context, Debug.Log);
+        }
+
+        public static void LogWarning(this GDKString gdkStr, UnityEngine.Object context = null)
+        {
+            Log(gdkStr, LogType.Warning, context, Debug.LogWarning);
+        }
+        
+        public static void LogError(this GDKString gdkStr, UnityEngine.Object context = null)
+        {
+            Log(gdkStr, LogType.Error, context, Debug.LogError);
+        }
+        
+        private static readonly char[] DigitChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+        internal static unsafe int Write(string s, int stIndex, ulong value, bool writePrefix = false, char prefix = '-')
+        {
+            fixed (char* ptr = s)
+            {
+                var idx = 0;
+                if (writePrefix)
+                {
+                    ptr[stIndex] = prefix;
+                    idx++;
+                }
+                
+                if (value <= 9)
+                {
+                    ptr[stIndex + idx] = DigitChars[value];
+                    idx++;
+                    return idx;
+                }
+
+                var len = (int)Math.Ceiling(Math.Log10(value));
+                int endIdx = stIndex + len - 1 + idx;
+                do
+                {
+                    ptr[endIdx] = (char)('0' + value % 10);
+                    endIdx--;
+                    value /= 10;
+                } while (value > 0);
+
+                idx += len;
+                return idx;
+            }
+        }
+
+        internal static int WriteULong(this string s, int stIndex, ulong value)
+        {
+            return Write(s, stIndex, value);
+        }
+        
+        internal static int WriteLong(this string s, int stIndex, long value)
+        {
+            return Write(s, stIndex, (ulong)(value < 0 ? -value : value), value < 0, '-');
+        }
+        
+        internal static int WriteDouble(this string s, int stIndex, double value, int decimalPlaces = 4)
+        {
+            var integerPart = (ulong)value;
+            int counter = Write(s, stIndex, integerPart, value < 0);
+            if (decimalPlaces <= 0) return counter;
+            
+            double fractionalPart = value - integerPart;
+            for (var i = 0; i < decimalPlaces; i++)
+            {
+                fractionalPart *= 10;
+            }
+            
+            var fractionalInt = (ulong)(fractionalPart + 0.5);
+            counter += Write(s, stIndex + counter, fractionalInt, true, '.');
+            return counter;
+        }
+    }
+    
+    public unsafe class GDKString
+    {
+        private readonly int _capacity;
+        private readonly string _str;
+        private int _length;
+        
+        public GDKString(int capacity)
+        {
+            _capacity = capacity;
+            _str = new string('\0', capacity);
+            _length = 0;
+        }
+
+        public int Length => _length;
+
+        private GDKString SetLength(int value)
+        {
+            if (value < 0 || value > _capacity)
+            {
+                throw new ArgumentOutOfRangeException(nameof(value));
+            }
+            
+            _length = value;
+            fixed (char* ptr = _str)
+            {
+                ptr[value] = '\0';
+                *(int*)((IntPtr)ptr - sizeof(int)) = _length;
+            }
+
+            return this;
+        }
+
+        public GDKString Append(string value)
+        {
+            return string.IsNullOrEmpty(value) ? this : WriteAt(_length, value);
+        }
+        
+        public GDKString WriteAt(int stIdx, string value)
+        {
+            if (string.IsNullOrEmpty(value)) return this;
+            
+            int vLength = value.Length;
+            if (stIdx + vLength >= _capacity)
+            {
+                throw new InvalidOperationException("Buffer overflow.");
+            }
+            
+            // Calculate the number of bytes to copy (2 bytes per char)
+            fixed (char* srcPtr = value)
+            fixed (char* destPtr = _str)
+            {
+                // Use memcpy equivalent with pointers
+                char* destPos = destPtr + _length;
+                for (var i = 0; i < vLength; i++)
+                {
+                    *(destPos + i) = *(srcPtr + i);
+                }
+            }
+
+            if (stIdx + vLength > _length) SetLength(_length + vLength);
+            return this;
+        }
+        
+        public GDKString Append(int value)
+        {
+            int vLength = _str.WriteLong(Length, value);
+            return SetLength(_length + vLength);
+        }
+
+        public GDKString Append(uint value)
+        {
+            int vLength = _str.WriteULong(Length, value);
+            return SetLength(_length + vLength);
+        }
+
+        private const string TRUE = "True";
+        private const string FALSE = "False";
+        public GDKString Append(bool value)
+        {
+            Append(value ? TRUE : FALSE);
+            return this;
+        }
+
+        public GDKString Append(float value)
+        {
+            int vLength = _str.WriteDouble(Length, value);
+            return SetLength(_length + vLength);
+        }
+
+        public GDKString Append(double value)
+        {
+            int vLength = _str.WriteDouble(Length, value);
+            return SetLength(_length + vLength);
+        }
+        
+        public GDKString Clear()
+        {
+            return SetLength(0);
+        }
+
+        public override string ToString() => _str;
+    }
+}

package/Runtime/Core/GDKString.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1b832c4b2bab4b7d8f05c2d315eb6f85
+timeCreated: 1724065190

package/Runtime/EmbedRemoteConfigAsset.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using UnityEngine;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
@@ -30,7 +31,7 @@ namespace Amanotes.Core.Internal
         {
             var config = configs?.FirstOrDefault(a => a.id == id);
             if (config == null)
-                Logging.LogWarningOnce($"Not found embedded config <{id}>");
+                LogWarningOnce($"Not found embedded config <{id}>");
             return config;
         }
 

package/Runtime/Fps/AmaFPS.Utils.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 using UnityEngine;
 namespace Amanotes.Core
 {
@@ -33,7 +33,11 @@ namespace Amanotes.Core
                 dictionary.Add("processor_frequency", SystemInfo.processorFrequency);
                 dictionary.Add("screen_width", resolution.width);
                 dictionary.Add("screen_height", resolution.height);
+                #if UNITY_2022_2_OR_NEWER
+                dictionary.Add("screen_refresh_rate", resolution.refreshRateRatio.value);
+                #else
                 dictionary.Add("screen_refresh_rate", resolution.refreshRate);
+                #endif
             }
             internal static void InjectDeviceStatus(Dictionary<string, object> dictionary)
             {

package/Runtime/Fps/AmaFPS.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Amanotes.Core.Internal;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 using UnityEngine;
 using UnityEngine.Events;
 

package/Runtime/Fps/AmaFPSVisualizer.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Profiling;
 using UnityEngine.UI;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -197,8 +197,13 @@ namespace Amanotes.Core
             {
                 graphic = GetComponent<Graphic>()
             };
-            
+
+            #if UNITY_2022_2_OR_NEWER
+            Application.targetFrameRate = (int)Screen.currentResolution.refreshRateRatio.value;
+            #else
             Application.targetFrameRate = Screen.currentResolution.refreshRate;
+            #endif
+
             Log($"Target FrameRate: {Application.targetFrameRate}");
         }
 

package/Runtime/Fps/FrameRecorder.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/GDKAudio/GDKAudio.cs

@@ -7,9 +7,12 @@
 // 2. On Android devices (excluding the Unity Editor).
 // 3. In the Unity Editor running on macOS with Apple Silicon (M1, M2, etc.).
 #if UNITY_2021_1_OR_NEWER && ((UNITY_MOBILE && !UNITY_EDITOR) || (UNITY_MOBILE && UNITY_EDITOR_OSX))
+
 using System;
 using System.Runtime.InteropServices;
 using Amanotes.Core.Internal;
+using static Amanotes.Core.GDKDebug;
+
 using UnityEngine;
 
 namespace Amanotes.Core
@@ -21,7 +24,7 @@ namespace Amanotes.Core
             GDKAudio.EnsureDecompressOnLoad(legacyAudioSource.clip);
             if (legacyAudioSource.gameObject.GetComponents<AudioSource>().Length > 1)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
             }
             var instance = legacyAudioSource.gameObject.AddComponent<GDKAudio>();
             if (legacyAudioSource.clip != null)
@@ -98,7 +101,7 @@ namespace Amanotes.Core
             }
             catch (Exception ex)
             {
-                Utils.ThrowExceptionIfEditor(ex.ToString());
+                GDKUtils.ThrowExceptionIfEditor(ex.ToString());
             }
             return this;
         }
@@ -118,12 +121,12 @@ namespace Amanotes.Core
             }
             if (gameObject.GetComponents<AudioSource>().Length > 1)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
             }
 
             if (gameObject.GetComponents<GDKAudio>().Length > 1)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single GDKAudio component.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single GDKAudio component.");
             }
         }
 
@@ -137,7 +140,7 @@ namespace Amanotes.Core
         {
             if (clip != null && clip.loadType != AudioClipLoadType.DecompressOnLoad)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only supports AudioClips with Load Type set to Decompress On Load.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only supports AudioClips with Load Type set to Decompress On Load.");
             }
         }
     }
@@ -212,7 +215,7 @@ namespace Amanotes.Core
                     ) / numChannel;
                 audioData = new float[numSamples*numChannel];
                 Marshal.Copy(audioDataResample, audioData, 0, numSamples*numChannel);
-                Logging.LogWarning(
+                LogWarning(
                     "Warning: The input AudioClip has a sample rate of " + fs + " Hz," +
                     " which does not match AudioSetting sample rate of " + AudioSettings.outputSampleRate + " Hz." +
                     " GDKAudio will resample the audio to match AudioSetting with high memory usage." +
@@ -220,17 +223,17 @@ namespace Amanotes.Core
                 );
             }
 
-            Logging.Log("[AAA]numSamples: " + numSamples);
-            Logging.Log("[AAA]numChannel:" + numChannel);
-            Logging.Log("[AAA]bufferLength:" + bufferLength);
-            Logging.Log("[AAA]numBuffer:" + numBuffer);
+            Log("[AAA]numSamples: " + numSamples);
+            Log("[AAA]numChannel:" + numChannel);
+            Log("[AAA]bufferLength:" + bufferLength);
+            Log("[AAA]numBuffer:" + numBuffer);
 
             nFFT = 2048;
             // hop = 512;
 
             numFrame = (numSamples - nFFT) / hop;
             // Initialize
-            Logging.Log("[AAA]TSM_Init");
+            Log("[AAA]TSM_Init");
             TSM_Init(audioData, speed, fs, numChannel,  nFFT,  hop, ref ptrL, ref ptrR);
             initialized = true;
             hopFrame = new float[hop*numChannel];
@@ -239,7 +242,7 @@ namespace Amanotes.Core
 
             audioSource.clip = audioClip;
             audioSource.loop = loop;
-            Logging.Log("[AAA]AudioSettings.outputSampleRate (later): " + AudioSettings.outputSampleRate);
+            Log("[AAA]AudioSettings.outputSampleRate (later): " + AudioSettings.outputSampleRate);
         }
 
         private void OnAudioFilterRead(float[] data, int channels)
@@ -257,7 +260,7 @@ namespace Amanotes.Core
                     return;
                 }
                 idxFrame = 0;
-                Logging.Log("[AAA] Loop");
+                Log("[AAA] Loop");
             }
 
 

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Text;
 using UnityEngine;
 using UnityObject = UnityEngine.Object;
 using static Amanotes.Core.AmaGDK.Analytics;
 using static Amanotes.Core.AmaGDK;
+using static Amanotes.Core.GDKDebug;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -48,6 +48,7 @@ namespace Amanotes.Core.Internal
         [MenuItem("GameObject/AmaGDK/Add AmaGDK Prefab", false, 10)]
         private static void AddAmaGDKPrefab()
         {
+            AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
             var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(AMAGDK_PREFAB);
             if (prefab == null)
             {
@@ -63,40 +64,29 @@ namespace Amanotes.Core.Internal
         }
 #endif
     }
-
+    
+    #if !AMAGDK_DEV
+    
+    [Obsolete("Deprecated class - use GDKDebug instead!")]
     public static class Logging
     {
-        public static Action<string> logNonfatalErrorHook = null;
-        private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
-        public static readonly HashSet<string> logWarningDict = new HashSet<string>();
-
+        [Obsolete("Deprecated method - use GDKDebug.LogWarningOnce() instead!")]
         public static void LogWarningOnce(string message, string key = null)
-        {
-            if (Config.common.logLevel < LogLevel.Warning) return;
-            if (string.IsNullOrEmpty(key)) key = message;
-            if (!logWarningDict.Add(key)) return;
-            Debug.LogWarning($"AmaGDK {message}");
-        }
+            => GDKDebug.LogWarningOnce(message, key);
+    
+        [Obsolete("Deprecated method - use GDKDebug.LogWarning() instead!")]
         public static void LogWarning(string message)
-        {
-            if (Config.common.logLevel >= LogLevel.Warning) Debug.LogWarning($"AmaGDK {message}");
-        }
+            => GDKDebug.LogWarning(message);
+        
+        [Obsolete("Deprecated method - use GDKDebug.LogError() instead!")]
         public static void LogError(string message)
-        {
-            if (Config.common.logLevel >= LogLevel.Error) Debug.LogError($"AmaGDK {message}");
-            if (logNonfatalErrorHook == null) return;
-            GDKUtils.DoOnMainThread(() =>
-            {
-                if (nonFatalDict.Contains(message)) return; // LogOnce
-                nonFatalDict.Add(message);
-                logNonfatalErrorHook(message);    
-            });
-        }
+            => GDKDebug.LogError(message);
+        
+        [Obsolete("Deprecated method - use GDKDebug.Log() instead!")]
         public static void Log(string message)
-        {
-            if (Config.common.logLevel == LogLevel.Verbose) Debug.Log($"AmaGDK {message}");
-        }
+            => GDKDebug.Log(message);
     }
+    #endif
 
     public static class Forbidden
     {
@@ -141,7 +131,7 @@ namespace Amanotes.Core.Internal
                 }
 #endif
 
-                // Logging.LogWarning("Something wrong: another AmaGDK instance found!");
+                // LogWarning("Something wrong: another AmaGDK instance found!");
                 UnityObject.Destroy(result[i].gameObject);
             }
             
@@ -182,7 +172,7 @@ namespace Amanotes.Core.Internal
         }
     }
     
-    public static class Utils // Hidden Utils
+    public static partial class GDKUtils // Hidden Utils
     {
         private static readonly Dictionary<string, float> LastFireInSessions = new Dictionary<string, float>();
 
@@ -203,10 +193,10 @@ namespace Amanotes.Core.Internal
         public static void ThrowExceptionIfEditor(string message)
         {
             #if UNITY_EDITOR
-            throw new GDKException(message);
-            #else
-            Logging.LogError(message);
+            if (Application.isEditor) throw new GDKException(message);
             #endif
+            
+            LogError(message);
         }
         
         /// <summary>

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
 using UnityEngine.Profiling;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
@@ -268,7 +268,7 @@ namespace Amanotes.Core.Internal
         
         public static void ClearCacheData()
         {
-            var sb = GDKPool.TakeStringBuilder();
+            var sb = GDKPool.GetStringBuilder();
             sb.AppendLine("[AmaGDK] All cached data & stats cleared");
             
             if (!Directory.Exists(basePath))
@@ -411,7 +411,7 @@ namespace Amanotes.Core.Internal
             if (inputDict == null) return "{}";
             
             Profiler.BeginSample("AmaGDK.JsonUtils.DictionaryToJson()");
-            var jsonSb = GDKPool.TakeStringBuilder(8192);
+            var jsonSb = GDKPool.GetStringBuilder(8);
             jsonSb.Append("{");
             bool isFirstElement = true;
             
@@ -431,7 +431,7 @@ namespace Amanotes.Core.Internal
             }
             
             jsonSb.AppendFormat("{0}{1}", format ? "\n" : "", "}");
-            var result = GDKPool.ReturnAndStringify(jsonSb);
+            var result = GDKPool.ReturnString(jsonSb);
             Profiler.EndSample();
             
             return result;

package/Runtime/Internal/AmaGDK.WebUtils.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
 using UnityEngine.Networking;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {

package/Runtime/Internal/GDKGeoLocationcs.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.Networking;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
@@ -39,7 +40,7 @@ namespace Amanotes.Core.Internal
             {
                 result?.Invoke(data.countryCode?.ToUpper());
                 if (data.errorMessage != null)
-                    Logging.Log(data.errorMessage);
+                    Log(data.errorMessage);
             });
         }
 

package/Runtime/Internal/GDKServerTime.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -189,7 +190,7 @@ namespace Amanotes.Core.Internal
                 else
                 {
                     result?.Invoke(null);
-                    Logging.Log(data.errorMessage);
+                    Log(data.errorMessage);
                     FetchTimeWithOtherProvider();
                 }
             });

package/Runtime/Klavar/Attributes/TimeDiffLastFireAttribute.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Reflection;
+using Amanotes.Core.Internal;
 using UnityEngine;
 
 namespace Amanotes.Core
@@ -9,7 +10,7 @@ namespace Amanotes.Core
         public override object Convert(object parent, FieldInfo fieldInfo, object param)
         {
             string name = parent.GetType().FullName;
-            return Internal.Utils.GetTimeDiffLastFire(name);
+            return GDKUtils.GetTimeDiffLastFire(name);
         }
     }
 

package/Runtime/Klavar/KlavarContainer.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Reflection;
-using Amanotes.Core.Internal;
 using UnityEngine;
 using GUID = System.Guid;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -26,10 +26,10 @@ namespace Amanotes.Core
         public static void ThrowIfEditor(string message)
         {
             #if UNITY_EDITOR
-            throw new KlavarException(message);
-            #else
-            Logging.LogError(message);
+            if (Application.isEditor) throw new KlavarException(message);
             #endif
+            
+            LogError(message);
         }
 
         public static void ThrowErrorOnField(object parent, FieldInfo fieldInfo, string message)

package/Runtime/UserProfile/Plugins/Android/AdvertisingIdFetcher.cs

@@ -1,6 +1,6 @@
 using System;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/Utils/GDKUtils.cs

@@ -1,6 +1,6 @@
 using System;
 using UnityEngine;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.71",
+    "version": "0.2.73-1",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",