WeSign/unity-application
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Changed GetCurrentModel to return the model instead of the tuple

Browse Source
This commit is contained in:
CoudronJerome
2023-03-29 19:17:42 +02:00
parent be8885a508
commit a44532b94a
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Common/Interfaces/ModelList.cs
View File

@@ -41,10 +41,9 @@ public class ModelList : ScriptableObject
/// </summary> /// </summary>
/// <param name="modelIndex">ModelIndex of the model</param> /// <param name="modelIndex">ModelIndex of the model</param>
/// <returns>Model associated with this index, null if no model was found</returns> /// <returns>Model associated with this index, null if no model was found</returns>
public ModelTuple GetCurrentModel() public NNModel GetCurrentModel()
{ {
//if(currentModelIndex < models.Find) return models.Find(x => x.model == models[currentModelIndex].model)?.model;
return models.Find(x => x.model == models[currentModelIndex].model);
} }
/// <summary> /// <summary>

7
Assets/Common/Tests/ModelListTest.cs
View File

@@ -35,14 +35,17 @@ public class ModelListTest
} }
} }
} }
/// <summary>
/// Check if current model can be correctly gotten as current via GetCurrentModel
/// </summary>
[Test]
public void TestGetCurrentModel() public void TestGetCurrentModel()
{ {
System.Random random = new System.Random(); System.Random random = new System.Random();
ModelIndex value = (ModelIndex)random.Next(modelList.models.Count); ModelIndex value = (ModelIndex)random.Next(modelList.models.Count);
modelList.SetCurrentModel(value); modelList.SetCurrentModel(value);
Assert.AreEqual(value, modelList.GetCurrentModel().index); Assert.AreEqual(modelList.models[modelList.currentModelIndex].model, modelList.GetCurrentModel());
// Check if empty model fails gracefully (returns null) // Check if empty model fails gracefully (returns null)
Assert.IsNull(ScriptableObject.CreateInstance<ModelList>().GetCurrentModel()); Assert.IsNull(ScriptableObject.CreateInstance<ModelList>().GetCurrentModel());

4
Assets/MediaPipeUnity/Scripts/SignPredictor.cs
View File

@@ -210,7 +210,7 @@ namespace Mediapipe.Unity.Tutorial
// check if model exists at path // check if model exists at path
//var model = ModelLoader.Load(Resources.Load<NNModel>("Models/Fingerspelling/model_A-L")); //var model = ModelLoader.Load(Resources.Load<NNModel>("Models/Fingerspelling/model_A-L"));
worker = modelList.GetCurrentModel().model.CreateWorker(); worker = modelList.GetCurrentModel().CreateWorker();
StartCoroutine(SignRecognitionCoroutine()); StartCoroutine(SignRecognitionCoroutine());
StartCoroutine(MediapipeCoroutine()); StartCoroutine(MediapipeCoroutine());
@@ -223,7 +223,7 @@ namespace Mediapipe.Unity.Tutorial
worker?.Dispose(); worker?.Dispose();
// Add a new worker for the new model // Add a new worker for the new model
worker = modelList.GetCurrentModel().model.CreateWorker(); worker = modelList.GetCurrentModel().CreateWorker();
} }
/// <summary> /// <summary>