Resolve WES-100 "Natml integration"

Assets/Common/Interfaces/InterfacesScripts.asmdef

@@ -2,7 +2,8 @@
     "name": "InterfacesScripts",
     "rootNamespace": "",
     "references": [
-        "GUID:5c2b5ba89f9e74e418232e154bc5cc7a"
+        "GUID:5c2b5ba89f9e74e418232e154bc5cc7a",
+        "GUID:d23f64cfd3b314bb4a18a8284c99bf5e"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Common/Interfaces/InterfacesScripts.asmdef.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
 guid: 7f2d0ee6dd21e1d4eb25b71b7a749d25
-folderAsset: yes
-DefaultImporter:
+AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Common/Interfaces/ModelIndex.cs

@@ -6,6 +6,6 @@ using UnityEngine;
 /// </summary>
 public enum ModelIndex 
 {
-    FINGERSPELLING,
-    NONE
+    NONE,
+    FINGERSPELLING
 }

Assets/Common/Interfaces/ModelList.cs

@@ -1,8 +1,7 @@
+using NatML;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using Unity.Barracuda;
 /// <summary>
 /// This scriptable will hold tupples of Courseindices and models
 /// </summary>
@@ -22,28 +21,49 @@ public class ModelList : ScriptableObject
         /// <summary>
         /// The model itself
         /// </summary>
-        public NNModel model;
+        public MLModelData modelWINDOWS;
+        /// <summary>
+        /// The model itself
+        /// </summary>
+        public MLModelData modelMAC;
     }
 
 
-    /// <summary>
-    /// Index of the currently active model
-    /// </summary>
-    public int currentModelIndex = 0;
-
     /// <summary>
     /// A list of all the models
     /// </summary>
     public List<ModelTuple> models = new List<ModelTuple>();
 
+    /// <summary>
+    /// Index of the currently active model
+    /// </summary>
+    public int currentModelIndex = 0;
+
     /// <summary>
     /// Get a model by modelindex
     /// </summary>
     /// <param name="modelIndex">ModelIndex of the model</param>
     /// <returns>Model associated with this index, null if no model was found</returns>
-    public NNModel GetCurrentModel()
+    public MLModelData GetCurrentModel()
     {
-        return models.Find(x => x.model == models[currentModelIndex].model)?.model;
+
+        // Select Model based on OS
+#if (UNITY_STANDALONE_WIN || UNITY_EDITOR_WIN)
+        return models.Find(x => x.modelWINDOWS == models[currentModelIndex].modelWINDOWS)?.modelWINDOWS;
+#elif (UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX)
+        return models.Find(x => x.modelMAC == models[currentModelIndex].modelMAC)?.modelMAC;
+#endif
+        return null;
+    }
+
+
+    /// <summary>
+    /// Function to check if the modelIndex has been set
+    /// </summary>
+    /// <returns></returns>
+    public bool HasValidModel()
+    {
+        return models[currentModelIndex].index != (int)ModelIndex.NONE;
     }
 
     /// <summary>

Assets/Common/Interfaces/Theme.cs

@@ -27,6 +27,7 @@ public class Theme : ScriptableObject
     /// </summary>
     public ModelIndex modelIndex;
 
+
     /// <summary>
     /// List of all learnable words/letters
     /// </summary>