Demo day booth

Assets/JustSign/Prefabs/Symbol.prefab

@@ -222,8 +222,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Dries zie je dit?
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2}
-  m_sharedMaterial: {fileID: -1030930060397404263, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 1baf2eae62f542f4585aaf3c9c3e229a, type: 2}
+  m_sharedMaterial: {fileID: -2577534979213189211, guid: 1baf2eae62f542f4585aaf3c9c3e229a, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

Assets/JustSign/ScriptableObjects/SongList.asset

@@ -14,5 +14,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   currentSongIndex: 0
   songs:
+  - {fileID: 11400000, guid: fdccebd0ec4017441ae140542f5eee28, type: 2}
   - {fileID: 11400000, guid: 0f5b5e156c628bf189df5723ad2aab96, type: 2}
   - {fileID: 11400000, guid: 7a55c88547b9345fe87aecd1398550c9, type: 2}

Assets/JustSign/ScriptableObjects/We Will Rock You.asset

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cd3d1c3a6cf7ef07abb343f8862a7435, type: 3}
+  m_Name: We Will Rock You
+  m_EditorClassIdentifier: 
+  firstSymbolTime: 0.1
+  spawnPeriod: 4.42
+  duration: 64
+  song: {fileID: 8300000, guid: d2d246582fe87b54cbca0e1a5b0f739f, type: 3}

Assets/JustSign/ScriptableObjects/We Will Rock You.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fdccebd0ec4017441ae140542f5eee28
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JustSign/Scripts/JustSignController.cs

@@ -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 > 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;

Assets/JustSign/Songs/We Will Rock You - 1min.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: d2d246582fe87b54cbca0e1a5b0f739f
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JustSign/Songs/We Will Rock You - 30sec.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 67374b610386f4840b84569282792772
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JustSign/Songs/We Will Rock You.mp3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c6d598be536f9cb4585670869e7041bd
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: