Chore: Remove interfaces, and add files for packaging

unity/Assets/ARFlowPackage/ARFlow/ARFlow.asmdef

@@ -6,7 +6,9 @@
         "GUID:c3bc0afe4a069b54aa23296f3c18a871",
         "GUID:21b0c8d1703a94250bfac916590cea4f",
         "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:92703082f92b41ba80f0d6912de66115"
+        "GUID:92703082f92b41ba80f0d6912de66115",
+        "GUID:8a68004c08665e8449ab651ffdc7bee0",
+        "GUID:1504f36c4fe570349afad1ff2291fbd0"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

unity/Assets/ARFlowPackage/ARFlow/ARFlowClientManager.cs

@@ -39,8 +39,8 @@ public class ARFlowClientManager
         private bool _isStreaming = false;
 
         // Interfaces for implementations using other packages
-        private IAudioStreaming _audioStreaming;
-        private IMeshEncoder _meshEncoder;
+        private AudioStreaming _audioStreaming;
+        private MeshEncoder _meshEncoder;
 
         //TODO
         //private Dictionary<string, Dictionary<string, Any>> _modalityConfig
@@ -76,9 +76,7 @@ public ARFlowClientManager(
             ARCameraManager cameraManager = null,
             AROcclusionManager occlusionManager = null,
             ARPlaneManager planeManager = null,
-            ARMeshManager meshManager = null,
-            IAudioStreaming audioStreaming = null,
-            IMeshEncoder meshEncoder = null
+            ARMeshManager meshManager = null
         )
         {
             if (UnityEngine.InputSystem.Gyroscope.current != null)
@@ -103,8 +101,8 @@ public ARFlowClientManager(
             _planeManager = planeManager;
             _meshManager = meshManager;
 
-            _audioStreaming = audioStreaming;
-            _meshEncoder = meshEncoder;
+            _audioStreaming = new AudioStreaming();
+            _meshEncoder = new MeshEncoder();
 
 #if UNITY_ANDROID
             if (!Permission.HasUserAuthorizedPermission(Permission.Microphone))

unity/Assets/ARFlowPackage/ARFlow/AudioStreaming.cs

@@ -0,0 +1,54 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+using Pv.Unity;
+
+namespace ARFlow
+{
+    public class AudioStreaming
+    {
+        private List<float> _unsentFrames;
+
+        public List<float> GetFrames()
+        {
+            return _unsentFrames;
+        }
+
+        public AudioStreaming()
+        {
+            _unsentFrames = new List<float>();
+        }
+
+        /// <summary>
+        /// Since Unity's microphone implementation requires calling "start" and "end", we need
+        /// a call to start microphone recording
+        /// </summary>
+        public void InitializeAudioRecording(int sampleRate, int frameLength)
+        {
+            VoiceProcessor.Instance.StartRecording(frameLength, sampleRate);
+            VoiceProcessor.Instance.AddFrameListener(UpdateCurrentAudioFrame);
+        }
+
+        /// <summary>
+        /// Our point is that we only want to send the current frame, not all frames that might be sent.
+        /// </summary>
+        /// <param name="frame"></param>
+        private void UpdateCurrentAudioFrame(float[] frame)
+        {
+            _unsentFrames.AddRange(frame);
+        }
+
+        public void ClearFrameList()
+        {
+            _unsentFrames.Clear();
+        }
+
+        public void DisposeAudioRecording()
+        {
+            VoiceProcessor.Instance.StopRecording();
+        }
+    }
+
+
+}

unity/Assets/Scripts/Utils/MeshingEncode/MeshingEncoderAssembly.asmdef → unity/Assets/ARFlowPackage/ARFlow/MeshingEncode/MeshEncoder.asmdef

@@ -2,8 +2,7 @@
     "name": "MeshingEncoderAssembly",
     "rootNamespace": "",
     "references": [
-        "GUID:411961ebab96043d8a061c656d3a461c",
-        "GUID:32105e0090382574e9f663b4802eb134"
+        "GUID:411961ebab96043d8a061c656d3a461c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

unity/Assets/ARFlowPackage/ARFlow/MeshingEncode/MeshEncoder.cs

@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+using Draco.Encoder;
+using Unity.Collections;
+
+namespace ARFlow
+{
+    public class MeshEncoder
+    {
+        public List<NativeArray<byte>> EncodeMesh(Mesh mesh)
+        {
+            EncodeResult[] result = DracoEncoder.EncodeMesh(mesh);
+            List<NativeArray<byte>> ret = new();
+            foreach (EncodeResult item in result)
+            {
+                ret.Add(item.data);
+            }
+            return ret;
+        }
+    }
+
+}
+

unity/Assets/Scenes/DeviceData.unity

@@ -7334,7 +7334,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 518653703}
   m_HandleRect: {fileID: 518653702}
   m_Direction: 2
-  m_Value: -0.000014345874
+  m_Value: -0.000003912511
   m_Size: 0.9417186
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -13482,7 +13482,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -0.000076293945, y: -177.35057}
+  m_AnchoredPosition: {x: -0.000076293945, y: -177.35083}
   m_SizeDelta: {x: -4.7499847, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6234637625898487408

unity/Assets/Scripts/ARFlowDeviceSample.cs

@@ -57,24 +57,17 @@ public class ARFlowDeviceSample : MonoBehaviour
     private bool _isConnected = false;
     private Task connectTask = null;
 
-    private IAudioStreaming _audioStreaming;
-    private IMeshEncoder _meshEncoder;
     // Start is called before the first frame update
     void Start()
     {
         connectButton.onClick.AddListener(OnConnectButtonClick);
         startPauseButton.onClick.AddListener(OnStartPauseButtonClick);
 
-        _audioStreaming = new AudioStreaming();
-        _meshEncoder = new MeshEncoder();
-
         _clientManager = new ARFlowClientManager(
             cameraManager: cameraManager,
             occlusionManager: occlusionManager,
             planeManager: planeManager,
-            meshManager: meshManager,
-            audioStreaming: _audioStreaming,
-            meshEncoder: _meshEncoder
+            meshManager: meshManager
          );
 
         AddModalityOptionsToConfig();