com.amanotes.gdk 0.2.74 → 0.2.77

package/Runtime/UI/ScrollableText/GDKScrollableText.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2407b55c10d97414bac10f9fa117a6a0
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/UI/ScrollableText.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 39a9966212764fb1ad9024fe989314ca
+timeCreated: 1724399977

package/Runtime/{GDKAudio/Plugins.meta → UI.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 556517e393f149748cf9890d5d436491
+guid: d4b6d2a55cd0c4bb998a769f247fe8c3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

package/Runtime/Utils/GDKUtils.cs

@@ -6,15 +6,25 @@ namespace Amanotes.Core.Internal
 {
     public static partial class GDKUtils
     {
+        public static void SafeInvokeAndClear(ref Action action)
+        {
+            if (action == null) return;
+            Action temp = action;
+            action = null;
+            SafeInvoke(temp);
+        }
+        
         public static void SafeInvoke(Action action)
         {
             if (action == null) return;
             
+            #if UNITY_EDITOR
             if (Application.isEditor)
             {
                 action();
                 return;
             }
+            #endif
             
             try
             {
@@ -29,11 +39,13 @@ namespace Amanotes.Core.Internal
         {
             if (action == null) return;
             
+            #if UNITY_EDITOR
             if (Application.isEditor)
             {
                 action(eventObject);
                 return;
             }
+            #endif
             
             try
             {
@@ -46,11 +58,15 @@ namespace Amanotes.Core.Internal
         
 	    public static void SafeInvoke<T1, T2>(Action<T1, T2> action, T1 p1, T2 p2)
 	    {
+            if (action == null) return;
+            
+            #if UNITY_EDITOR
             if (Application.isEditor)
             {
                 action(p1, p2);
                 return;
             }
+            #endif
             
             try
             {
@@ -63,10 +79,12 @@ namespace Amanotes.Core.Internal
         
         public static void ThrowExceptionInEditor<T>(string message, Func<string, T> exceptionCreator) where T: Exception
         {
+            #if UNITY_EDITOR
             if (Application.isEditor)
             {
                 throw exceptionCreator(message);
             }
+            #endif
             
             LogWarning(message);
         }

package/package.json

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

package/Runtime/GDKAudio/GDKAudio.cs

@@ -1,483 +0,0 @@
-#if UNITY_ANDROID || UNITY_IOS
-#define UNITY_MOBILE
-#endif
-
-#if UNITY_2021_1_OR_NEWER && ((UNITY_MOBILE && !UNITY_EDITOR) || (UNITY_MOBILE && UNITY_EDITOR_OSX))
-#define SUPPORTED_PLATFORMS
-#endif
-
-// GDKAudio is supported in the following environments:
-// 1. On iOS devices.
-// 2. On Android devices (excluding the Unity Editor).
-// 3. In the Unity Editor running on macOS with Apple Silicon (M1, M2, etc.).
-// For unsupported environments, GDKAudio will fallback to setting the AudioSource.pitch for time stretching.
-
-using System;
-using System.Runtime.InteropServices;
-using Amanotes.Core.Internal;
-using static Amanotes.Core.GDKDebug;
-
-using UnityEngine;
-
-#if !SUPPORTED_PLATFORMS
-using UnityEngine.Audio;
-#endif
-
-namespace Amanotes.Core
-{
-    public static class AudioSourceExtensions
-    {
-        public static GDKAudio ConvertToGDKAudio(this AudioSource legacyAudioSource)
-        {
-            GDKAudio.EnsureDecompressOnLoad(legacyAudioSource.clip);
-            if (legacyAudioSource.gameObject.GetComponents<AudioSource>().Length > 1)
-            {
-                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
-            }
-            var instance = legacyAudioSource.gameObject.AddComponent<GDKAudio>();
-            if (legacyAudioSource.clip != null)
-            {
-                instance.LoadAudioInternal(legacyAudioSource.clip);
-            }
-            return instance;
-        }
-
-        public static GDKAudio GetGDKAudio(this AudioSource legacyAudioSource)
-        {
-            return legacyAudioSource.GetComponent<GDKAudio>();
-        }
-    }
-
-    public partial class GDKAudio // public API
-    {
-        public float speed { get; private set; } = 1f;
-        public bool loop { get; private set; } = true;
-        public bool mute { get; private set; } = false;
-        private float globalVolume = 1f;
-
-
-        public bool isPlaying { get; private set; } = false;
-        public bool isInitialized => initialized;
-
-        /// <summary>
-        /// Set the audio playback speed.
-        /// The audio playback speed is capped in range 0.5x and 2x. Set `force` to true to disable this cap. Note: `speed` lower than 0.75 will create audio artifacts.
-        /// </summary>
-        /// <param name="speed">The desired audio speed. `speed` lower than 0.75 will create artifacts.</param>
-        /// <param name="force">Force setting the speed. this will affect the audio pitch on speed faster than 2x and below 0.5x.</param>
-        public GDKAudio SetSpeed(float speed, bool force = false)
-        {
-            if (!force)
-            {
-                speed = Mathf.Clamp(speed, 0.5f, 2.0f);
-            }
-            this.speed = speed;
-            SetSpeedInternal();
-            return this;
-        }
-
-        public GDKAudio SetLoop(bool loop)
-        {
-            this.loop = loop;
-            audioSource.loop = this.loop;
-            return this;
-        }
-
-        public GDKAudio SetMute(bool mute)
-        {
-            this.mute = mute;
-            audioSource.mute = this.mute;
-            return this;
-        }
-
-        public GDKAudio Pause()
-        {
-            isPlaying = false;
-            audioSource.Pause();
-            return this;
-        }
-
-        public GDKAudio Resume()
-        {
-            return Play();
-        }
-
-        public GDKAudio Stop()
-        {
-            isPlaying = false;
-            audioSource.Stop();
-            StopInternal();
-            return this;
-        }
-
-        public GDKAudio Play()
-        {
-            isPlaying = true;
-            audioSource.loop = loop;
-            audioSource.Play();
-            return this;
-        }
-
-        public GDKAudio PlayAudio(AudioClip audioClip)
-        {
-            LoadAudio(audioClip);
-            Play();
-            return this;
-        }
-
-        public GDKAudio LoadAudio(AudioClip audioClip)
-        {
-            EnsureDecompressOnLoad(audioClip);
-            try
-            {
-                LoadAudioInternal(audioClip);
-            }
-            catch (Exception ex)
-            {
-                GDKUtils.ThrowExceptionIfEditor(ex.ToString());
-            }
-            return this;
-        }
-    }
-
-    partial class GDKAudio : MonoBehaviour
-    {
-        private AudioSource audioSource;
-
-        private void Awake()
-        {
-            if (audioSource != null) return;
-            audioSource = GetComponent<AudioSource>();
-            if (audioSource == null)
-            {
-                audioSource = gameObject.AddComponent<AudioSource>();
-            }
-            if (gameObject.GetComponents<AudioSource>().Length > 1)
-            {
-                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
-            }
-
-            if (gameObject.GetComponents<GDKAudio>().Length > 1)
-            {
-                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single GDKAudio component.");
-            }
-        }
-
-        private void Update()
-        {
-            // NOTE: AudioListener.volume can only be called in Main-Thread 
-            globalVolume = AudioListener.volume;
-        }
-
-        private void OnDestroy()
-        {
-            Stop();
-            if (!initialized) return;
-            FreeMemory(ptrL, ptrR);
-        }
-
-        internal static void EnsureDecompressOnLoad(AudioClip clip)
-        {
-            if (clip != null && clip.loadType != AudioClipLoadType.DecompressOnLoad)
-            {
-                GDKUtils.ThrowExceptionIfEditor("GDKAudio only supports AudioClips with Load Type set to Decompress On Load.");
-            }
-        }
-    }
-
-#if SUPPORTED_PLATFORMS
-    partial class GDKAudio
-    {
-        public int numSamples { get; private set; }
-        public int numChannels { get; private set; }
-        public int sampleRate { get; private set; } = 44100;
-        public int numFrames { get; private set; } = 1;
-        public float time
-        {
-            get => timeSamples / (float)sampleRate;
-            set => timeSamples = (int)(value * sampleRate);
-        }
-
-        private int timeSamples
-        {
-            get => idxFrame * hop;
-            set => SetPlaybackFrame(value / hop);
-        }
-        private float _volume = 1f;
-
-        public float volume
-        {
-            get => _volume;
-            set => _volume = Mathf.Clamp01(value);
-        }
-
-
-        private float[] audioData;
-
-        private int bufferLength;
-        private int numBuffer;
-
-        private int nFFT = 2048;
-        private int hop = 512;
-        private int cntSave = 0;
-        private int idxFrame { get; set; } = 0;
-        private float[] hopFrame;
-        private float[] dataOut;
-        private float[] dataOutSave;
-
-#if UNITY_IOS && !UNITY_EDITOR
-        private const string LIBRARY_NAME ="__Internal";
-#else
-        private const string LIBRARY_NAME = "atensor";
-#endif
-
-        [DllImport(LIBRARY_NAME, EntryPoint = "ptrResampleMulti")]
-        private static extern int ResampleMulti(float[] inData, ref IntPtr outData, float fs, float targetFs, int numSrcSamples, int numChannels, ref IntPtr ptrL);
-
-        [DllImport(LIBRARY_NAME, EntryPoint = "ptrTSM_Init")]
-        private static extern void TSM_Init(float[] firstFrame, float scale, float fs, int numChannel, int nFft, int hop, ref IntPtr ptrL, ref IntPtr ptrR);
-
-        [DllImport(LIBRARY_NAME, EntryPoint = "ptrTSM_Processing")]
-        private static extern int TSM_Processing(float[] inData, float[] outData, float scale, IntPtr ptrL, IntPtr ptrR);
-
-        [DllImport(LIBRARY_NAME, EntryPoint = "ptrFreeMemory")]
-        private static extern void FreeMemory(IntPtr ptrL, IntPtr ptrR);
-
-
-        private IntPtr ptrL;
-        private IntPtr ptrR;
-        private bool initialized = false;
-
-        internal void LoadAudioInternal(AudioClip audioClip)
-        {
-            AudioSettings.GetDSPBufferSize(out bufferLength, out numBuffer);
-            hop = Mathf.Min(bufferLength, 512);
-            numSamples = audioClip.samples;
-            numChannels = audioClip.channels;
-            sampleRate = audioClip.frequency;
-
-            if (numChannels < 2)
-            {
-                numChannels = 2;
-                audioData = new float[numSamples * numChannels];
-                audioClip.GetData(audioData, 0);
-                for (int i = numSamples - 1; i > 0; --i)
-                {
-                    audioData[i * 2] = audioData[i];
-                    audioData[(i * 2) - 1] = audioData[i];
-                }
-            }
-            else
-            {
-                audioData = new float[numSamples * numChannels];
-                audioClip.GetData(audioData, 0);
-            }
-
-
-            // Do resampling
-            if (sampleRate != AudioSettings.outputSampleRate)
-            {
-                var audioDataResample = new IntPtr();
-                numSamples = ResampleMulti(
-                    audioData,
-                    ref audioDataResample,
-                    sampleRate,
-                    AudioSettings.outputSampleRate,
-                    numSamples * numChannels,
-                    numChannels,
-                    ref ptrL
-                    ) / numChannels;
-                audioData = new float[numSamples * numChannels];
-                Marshal.Copy(audioDataResample, audioData, 0, numSamples * numChannels);
-                sampleRate = AudioSettings.outputSampleRate;
-                LogWarning(
-                    $"Warning: The input AudioClip has a sample rate of {sampleRate} Hz," +
-                    $" which does not match AudioSetting sample rate of {AudioSettings.outputSampleRate} Hz." +
-                    " GDKAudio will resample the audio to match AudioSetting with high memory usage." +
-                    " We recommend resampling the audio to 44100 Hz before using it in Unity."
-                );
-            }
-
-            numFrames = (numSamples - nFFT) / hop;
-
-            Log(
-                $"[AAA] audioData: {audioData.Length}\n" +
-                $"[AAA] numSamples: {numSamples}\n" +
-                $"[AAA] numChannel: {numChannels}\n" +
-                $"[AAA] bufferLength: {bufferLength}\n" +
-                $"[AAA] numBuffer: {numBuffer}\n" +
-                $"[AAA] numFrames: {numFrames}"
-            );
-
-            // Initialize
-            Log("[AAA]TSM_Init");
-            TSM_Init(audioData, speed, sampleRate, numChannels, nFFT, hop, ref ptrL, ref ptrR);
-
-            initialized = true;
-            hopFrame = new float[hop * numChannels];
-            dataOut = new float[4 * numChannels * hop]; // minimum of scale is 0.25
-            dataOutSave = new float[numChannels * bufferLength];
-
-            audioSource.clip = audioClip;
-            audioSource.loop = loop;
-            Log($"[AAA]AudioSettings.outputSampleRate (later): {AudioSettings.outputSampleRate}");
-        }
-
-        private void OnAudioFilterRead(float[] data, int channels)
-        {
-            if (!isPlaying) return;
-
-            if (idxFrame >= numFrames)
-            {
-                if (!loop)
-                {
-                    for (int i = 0; i < bufferLength * numChannels; i++)
-                    {
-                        data[i] = 0;
-                    }
-                    return;
-                }
-                idxFrame = 0;
-            }
-
-
-            int lengthOut = 0;
-            int lengthOutOld = 0;
-            int idxSave = 0;
-            int muteModifier = mute ? 0 : 1;
-            float volumeModifier = muteModifier * volume * globalVolume;
-
-            for (; idxSave < cntSave; idxSave++)
-            {
-                data[idxSave] = dataOutSave[idxSave];
-            }
-
-            cntSave = 0;
-
-            while (lengthOut < bufferLength * numChannels - idxSave)
-            {
-                if (idxFrame >= numFrames) break;
-
-                Array.Copy(
-                    audioData,
-                    nFFT * numChannels + idxFrame * hop * numChannels,
-                    hopFrame,
-                    0,
-                    hop * numChannels);
-                int temp = TSM_Processing(hopFrame, dataOut, speed, ptrL, ptrR);
-                lengthOut = lengthOutOld + temp;
-                for (int i = lengthOutOld; i < lengthOut; i++)
-                {
-                    if (i < bufferLength * numChannels - idxSave)
-                    {
-                        data[i + idxSave] = dataOut[i - lengthOutOld] * volumeModifier;
-                    }
-                    else
-                    {
-                        dataOutSave[i + idxSave - bufferLength * numChannels] = dataOut[i - lengthOutOld] * volumeModifier;
-                        cntSave++;
-                    }
-                }
-                lengthOutOld = lengthOut;
-                idxFrame++;
-            }
-        }
-
-        private void SetSpeedInternal()
-        {
-            // This method is intentionally left empty;
-            return;
-        }
-
-        private void StopInternal()
-        {
-            idxFrame = 0;
-        }
-
-        private void SetPlaybackFrame(int frame)
-        {
-            frame = Mathf.Clamp(frame, 0, numFrames - 1);
-            idxFrame = frame;
-        }
-
-        public float GetAudioDurationInSec()
-        {
-            return numFrames * hop / sampleRate;
-        }
-
-    }
-#else
-#warning "GDKAudio is not supported on this platform. You can still use GDKAudio, but it will fallback to changing AudioSource.pitch"
-    partial class GDKAudio
-    {
-        public int numSamples => audioSource.clip.samples;
-        public int numChannels => audioSource.clip.channels;
-        public int sampleRate => audioSource.clip.frequency;
-        public int numFrames => numSamples;
-
-        public float time
-        {
-            get => audioSource.time;
-            set => audioSource.time = value;
-        }
-
-        public float volume
-        {
-            get => audioSource.volume;
-            set => audioSource.volume = value;
-        }
-
-        private AudioMixer audioMixer;
-
-        // These attributes are intentionally left unused for compatibility.
-        private readonly IntPtr ptrL;
-        private readonly IntPtr ptrR;
-        private bool initialized = false;
-
-        internal void LoadAudioInternal(AudioClip audioClip)
-        {
-            audioMixer = Resources.Load("GDKAudioMixer") as AudioMixer;
-            audioSource.clip = audioClip;
-            audioSource.loop = loop;
-            audioSource.outputAudioMixerGroup = audioMixer.FindMatchingGroups("PitchShifter")[0];
-            SetSpeedInternal();
-            initialized = true;
-        }
-
-#pragma warning disable IDE0060
-        private static void FreeMemory(IntPtr ptrL, IntPtr ptrR)
-        {
-            // This method is intentionally left empty.
-            return;
-        }
-#pragma warning restore IDE0060
-
-        private void SetSpeedInternal()
-        {
-            audioSource.pitch = speed;
-            audioMixer.SetFloat("GDKAudioMixer_PitchShifter_Pitch", 1.0f / speed);
-
-            // Note: using AudioMixer's Pitch Shifter effect makes the audio a bit louder.
-            if (speed != 1.0f)
-            {
-                audioMixer.SetFloat("GDKAudioMixer_PitchShifter_Wet", 0.0f); // disable bypass
-            }
-            else
-            {
-                audioMixer.SetFloat("GDKAudioMixer_PitchShifter_Wet", -80.0f); // enable bypass
-            }
-        }
-
-        private void StopInternal()
-        {
-            // This method is intentionally left empty.
-            return;
-        }
-
-        public float GetAudioDurationInSec()
-        {
-            return audioSource.clip.length;
-        }
-    }
-#endif
-}

package/Runtime/GDKAudio/GDKAudio.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: de1ec8deba094859a05d6b17e8553ebb
-timeCreated: 1720582209

package/Runtime/GDKAudio/Plugins/Android/atensor-release.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: cf93944c80cc4155b610a203aa4692ed
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Runtime/GDKAudio/Plugins/Android.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 7fd13b2a80734c929794ac5ee5272562
-timeCreated: 1720582106

package/Runtime/GDKAudio/Plugins/iOS/libatensor.a.meta

@@ -1,68 +0,0 @@
-fileFormatVersion: 2
-guid: a3c265b10d9ed4cf6990662d42f4ac14
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      : Any
-    second:
-      enabled: 0
-      settings:
-        Exclude Android: 1
-        Exclude Editor: 1
-        Exclude Linux64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude iOS: 0
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: OSXUniversal
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: Win
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: Win64
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 1
-      settings: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: