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

Fix missing TextAsset + other panel use + double use of 'Slecht' sign

Browse Source
This commit is contained in:
Dries Van Schuylenbergh
2023-04-19 22:22:38 +02:00
parent 5ee7add6b9
commit 92c3101db8
9 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/JustSign/Scenes/JustSignGame.unity
View File

@@ -1855,6 +1855,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
modelList: {fileID: 11400000, guid: 39516e4e6e56f0f4f80647d9c4d8034c, type: 2}
modelInfoFile: {fileID: 4900000, guid: fb8b51022bdcd654a9f29c054832a1b5, type: 3}
modelInfoFileEmbedding: {fileID: 4900000, guid: 4e303164823194bc4be87f4c9550cfd0, type: 3}
configAsset: {fileID: 4900000, guid: 6288c43cdca97374782dac1ea87aa029, type: 3}
screen: {fileID: 0}
--- !u!4 &1150323776

16
Assets/JustSign/Scripts/JustSignController.cs
View File

@@ -12,7 +12,7 @@ using Random = UnityEngine.Random;
/// Contains all game logic for the JustSign game
/// </summary>
public class JustSignController : AbstractFeedback
{
{
/// <summary>
/// All of the words that can be used in this session
/// </summary>
@@ -73,7 +73,7 @@ public class JustSignController : AbstractFeedback
/// Reference to the webcam
/// </summary>
public RawImage webcamScreen;
/// <summary>
/// Score obtained when getting a perfect hit
/// </summary>
@@ -283,7 +283,7 @@ public class JustSignController : AbstractFeedback
/// Sprite shown when sign leaves screen
/// </summary>
public Sprite tooLateSprite;
/// <summary>
/// Reference to display the feedback image
/// </summary>
@@ -308,7 +308,7 @@ public class JustSignController : AbstractFeedback
signPredictor.SetModel(currentTheme.modelIndex);
signPredictor.SwapScreen(webcamScreen);
AddSelfAsListener();
StartController();
}
@@ -379,7 +379,7 @@ public class JustSignController : AbstractFeedback
// Spawn new symbol every spawn period
float currentTime = Time.time;
if (currentTime - lastSpawn > 2*currentSong.spawnPeriod && lastSymbolTime > currentTime)
if (currentTime - lastSpawn > 2 * currentSong.spawnPeriod && lastSymbolTime > currentTime)
{
lastSpawn = currentTime;
SpawnNewSymbol();
@@ -408,7 +408,7 @@ public class JustSignController : AbstractFeedback
/// <returns>The calculated score</returns>
public int CalculateScore()
{
return goodSigns*goodScore + perfectSigns*perfectScore + mehScore*mehSigns + terribleScore*terribleSigns + incorrectSigns*offscreenScore;
return goodSigns * goodScore + perfectSigns * perfectScore + mehScore * mehSigns + terribleScore * terribleSigns + incorrectSigns * offscreenScore;
}
/// <summary>
@@ -657,8 +657,8 @@ public class JustSignController : AbstractFeedback
accuracy = signPredictor.learnableProbabilities[predictedSign];
// ^^^ TEMPORARY STUFF ^^^
Learnable predSign = currentTheme.learnables.Find(l => l.name == predictedSign);
Learnable predSign = currentTheme.learnables.Find(l => l.name.ToUpper().Replace(" ", "-") == predictedSign);
if (feedbackText != null && feedbackProgressImage != null)
{
Color col;