Add words to symbols in JustSign

Assets/JustSign/Prefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1dd701eefa37cbe4e9ed52960fa7a7cf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JustSign/Prefabs/Symbol.prefab

@@ -0,0 +1,214 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4639383499500021565
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7664190503744730416}
+  - component: {fileID: 4730176006060198146}
+  - component: {fileID: 1836798560195404133}
+  m_Layer: 5
+  m_Name: Symbol
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7664190503744730416
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4639383499500021565}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6279317507399066568}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4730176006060198146
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4639383499500021565}
+  m_CullTransparentMesh: 1
+--- !u!114 &1836798560195404133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4639383499500021565}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7932988193255257378
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6279317507399066568}
+  - component: {fileID: 2862254737186411956}
+  - component: {fileID: 3570096111438075237}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6279317507399066568
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7932988193255257378}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7664190503744730416}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2862254737186411956
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7932988193255257378}
+  m_CullTransparentMesh: 1
+--- !u!114 &3570096111438075237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7932988193255257378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: A
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4282795590
+  m_fontColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 32
+  m_fontSizeBase: 32
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Assets/JustSign/Prefabs/Symbol.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f3117b0203a1342a48a95904347b03c8
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JustSign/Scenes/Game.unity

@@ -1588,14 +1588,14 @@ PrefabInstance:
     - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 667202414}
+      objectReference: {fileID: 711818226}
     - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: Back
+      value: GotoThemeSelection
       objectReference: {fileID: 0}
     - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
-      value: BackButton, CommonScripts
+      value: JustSignWebcam, Assembly-CSharp
       objectReference: {fileID: 0}
     - target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
@@ -1834,7 +1834,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 711818224}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 98f2ddd1188ed310e8733106251729b6, type: 3}
+  m_Script: {fileID: 11500000, guid: d9291edb7593521fbb7e0a486724fd3c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   display: {fileID: 496523654}
@@ -5178,6 +5178,8 @@ MonoBehaviour:
   feedBack: {fileID: 128049076}
   scoreDisplay: {fileID: 1627575593}
   hitZone: {fileID: 2012531007}
+  symbolPrefab: {fileID: 4639383499500021565, guid: f3117b0203a1342a48a95904347b03c8, type: 3}
+  symbolContainer: {fileID: 1768150806}
 --- !u!1 &1898716846
 GameObject:
   m_ObjectHideFlags: 0

Assets/JustSign/Scripts/JustSignController.cs

@@ -35,6 +35,16 @@ public class JustSignController : MonoBehaviour
     /// </summary>
     public GameObject hitZone;
 
+    /// <summary>
+    /// Symbol prefab
+    /// </summary>
+    public GameObject symbolPrefab;
+
+    /// <summary>
+    /// Reference to symbol prefab
+    /// </summary>
+    public Transform symbolContainer;
+
     /// <summary>
     /// All of the words that can be used in this session
     /// </summary>
@@ -145,9 +155,7 @@ public class JustSignController : MonoBehaviour
         currentTheme = FindThemeByName(PlayerPrefs.GetString("themeName"));
         words = currentTheme.words;
         lastSpawn = Time.time;
-        Debug.Log("BEFORE");
         SpawnNewSymbol();
-        Debug.Log("AFTER");
     }
 
     /// <summary>
@@ -165,7 +173,6 @@ public class JustSignController : MonoBehaviour
         // Destroy the oldest symbol if the current input matches it
         if (matchedSymbolIndex >= 0) {
             int difference = Math.Abs((int) (activeSymbols[matchedSymbolIndex].transform.position.x - hitZone.transform.position.x));
-            Debug.Log("HERE");
             if (difference < perfectBoundary) {
                 feedBack.text = "Perfect!";
                 score += perfectScore;
@@ -246,6 +253,7 @@ public class JustSignController : MonoBehaviour
     /// Create a new symbol at the start of the track
     /// </summary>
     void SpawnNewSymbol() {
+        // Pick a word that isn't in use yet
         List<int> unusedWordIndices = new List<int>();
 
         for (int i = 0; i < words.Length; i++) {
@@ -256,96 +264,21 @@ public class JustSignController : MonoBehaviour
 
         string nextSymbol = words[unusedWordIndices[UnityEngine.Random.Range(0, unusedWordIndices.Count)]];
 
-        GameObject newSymbolObject = new GameObject("Symbol");
-
-        RectTransform rectTransform = newSymbolObject.AddComponent<RectTransform>();
-
-        // Add the Image component as a child of the RectTransform
-        Image image = new GameObject("Image").AddComponent<Image>();
-        image.transform.SetParent(rectTransform);
-
-        // Add the Text component as a child of the RectTransform
-        Text text = new GameObject("Text").AddComponent<Text>();
-        text.transform.SetParent(rectTransform);
-
-        // Set the font size of the text component
-        text.fontSize = 100;
-        text.text = "AAAAAAA";
-        text.color = Color.white;
-
-        rectTransform.SetParent(canvas.transform, false); // Set the parent to the Canvas
-        rectTransform.localPosition = new Vector3(trackX, trackY, 0);
-        rectTransform.sizeDelta = new Vector2(symbolSize, symbolSize + 200f);
+        GameObject newSymbolObject = GameObject.Instantiate(symbolPrefab, symbolContainer);
 
+        // Dynamically load appearance
+        Image image = newSymbolObject.GetComponent<Image>();
         Sprite sprite = Resources.Load<Sprite>("Common/Images/" + nextSymbol);
         image.sprite = sprite;
         image.rectTransform.sizeDelta = new Vector2(symbolSize, symbolSize);
 
-        // Set the position and size of the RectTransform of the text component to match the RectTransform of the image component
-        text.rectTransform.localPosition = new Vector3(0, -50, 0);
-        text.rectTransform.sizeDelta = rectTransform.sizeDelta;
-        
+        // Place the word that the symbol represents under the image
+        TMP_Text text = newSymbolObject.GetComponentInChildren<TMP_Text>();
+        text.text = nextSymbol;
+        text.color = Color.black;
+        text.rectTransform.localPosition = new Vector3(0, -160, 0);
 
         activeWords.Add(nextSymbol);
         activeSymbols.Add(newSymbolObject);
     }
-
-    /*
-        GameObject newSymbolObject = new GameObject("Symbol");
-        Image image = newSymbolObject.AddComponent<Image>();
-        Sprite sprite = Resources.Load<Sprite>("Common/Images/" + nextSymbol);
-        image.sprite = sprite;
-        //Text text = newSymbolObject.AddComponent<Text>();
-        //text.text = "METTN";
-        RectTransform rectTransform = newSymbolObject.GetComponent<RectTransform>();
-        rectTransform.SetParent(canvas.transform, false); // Set the parent to the Canvas
-        rectTransform.localPosition = new Vector3(trackX, trackY, 0);
-        rectTransform.sizeDelta = new Vector2(symbolSize, symbolSize);
-    */
-
-
-    /*
-    GameObject newSymbolObject = new GameObject("Symbol");
-        Image newImage = newSymbolObject.AddComponent<Image>();
-        Text text = newSymbolObject.AddComponent<Text>();
-        RectTransform rectTransform = newSymbolObject.GetComponent<RectTransform>();
-        rectTransform.SetParent(canvas.transform, false); // Set the parent to the Canvas
-        rectTransform.localPosition = new Vector3(trackX, trackY, 0);
-        rectTransform.sizeDelta = new Vector2(symbolSize, symbolSize);
-        */
-
-        /*
-        GameObject newSymbolObject = new GameObject("Symbol");
-
-        RectTransform rectTransform = newSymbolObject.AddComponent<RectTransform>();
-
-        // Add the Image component as a child of the RectTransform
-        Image image = new GameObject("Image").AddComponent<Image>();
-        image.transform.SetParent(rectTransform);
-
-        // Add the Text component as a child of the RectTransform
-        Text text = new GameObject("Text").AddComponent<Text>();
-        text.transform.SetParent(rectTransform);
-
-        // Set the font size of the text component
-        text.fontSize = 30;
-        text.text = "AAAAAAA";
-        text.color = Color.black;
-
-        Sprite sprite = Resources.Load<Sprite>("Common/Images/" + nextSymbol);
-
-        
-
-        rectTransform.SetParent(canvas.transform, false); // Set the parent to the Canvas
-        rectTransform.localPosition = new Vector3(trackX, trackY, 0);
-        rectTransform.sizeDelta = new Vector2(symbolSize, symbolSize + 200f);
-
-        Sprite sprite = Resources.Load<Sprite>("Common/Images/" + nextSymbol);
-        image.sprite = sprite;
-        image.rectTransform.sizeDelta = new Vector2(symbolSize, symbolSize);
-
-        // Set the position and size of the RectTransform of the text component to match the RectTransform of the image component
-        text.rectTransform.localPosition = new Vector3(0, -50, 0);
-        text.rectTransform.sizeDelta = rectTransform.sizeDelta;
-        */
 }