FInalized changes pre-merge

Removed items in abstract class that don't need to be there

Assets/Courses/Scripts/TemplateCourse.cs

@@ -114,6 +114,38 @@ public class TemplateCourse : AbstractFeedback
     /// </summary>
     public TMP_Text timeSpent;
 
+
+    /// <summary>
+    /// Reference to the feedback field
+    /// </summary>
+    public TMP_Text feedbackText;
+
+    /// <summary>
+    /// Reference to the progress bar
+    /// </summary>
+    public Slider feedbackProgress;
+
+    /// <summary>
+    /// Reference to the progress bar image, so we can add fancy colors
+    /// </summary>
+    public Image feedbackProgressImage;
+
+    /// <summary>
+    /// Timer to keep track of how long a incorrect sign is performed
+    /// </summary>
+    protected DateTime timer;
+
+    /// <summary>
+    /// Current predicted sign
+    /// </summary>
+    protected string predictedSign = null;
+
+    /// <summary>
+    /// Previous incorrect sign, so we can keep track whether the user is wrong or the user is still changing signs
+    /// </summary>
+    protected string previousIncorrectSign = null;
+
+
     /// <summary>
     /// This function is called when the script is initialised.
     /// It inactivatis the popup, finds a webcam to use and links it via the WebcamTexture to the display RawImage.

Assets/Hangman/Scripts/HangmanGameController.cs

@@ -212,6 +212,36 @@ public class HangmanGameController : AbstractFeedback
     /// </summary>
     private String currentsign = "";
 
+    /// <summary>
+    /// Reference to the feedback field
+    /// </summary>
+    public TMP_Text feedbackText;
+
+    /// <summary>
+    /// Reference to the progress bar
+    /// </summary>
+    public Slider feedbackProgress;
+
+    /// <summary>
+    /// Reference to the progress bar image, so we can add fancy colors
+    /// </summary>
+    public Image feedbackProgressImage;
+
+    /// <summary>
+    /// Timer to keep track of how long a incorrect sign is performed
+    /// </summary>
+    protected DateTime timer;
+
+    /// <summary>
+    /// Current predicted sign
+    /// </summary>
+    protected string predictedSign = null;
+
+    /// <summary>
+    /// Previous incorrect sign, so we can keep track whether the user is wrong or the user is still changing signs
+    /// </summary>
+    protected string previousIncorrectSign = null;
+
     // Start is called before the first frame update
     void Start()
     {

Assets/MediaPipeUnity/Scripts/AbstractFeedback.cs

@@ -12,44 +12,14 @@ using UnityEngine.UI;
 /// </summary>
 public abstract class AbstractFeedback : MonoBehaviour, Listener
 {
-    /// <summary>
-    /// Reference to the feedback field
-    /// </summary>
-    public TMP_Text feedbackText;
-
-    /// <summary>
-    /// Reference to the progress bar
-    /// </summary>
-    public Slider feedbackProgress;
-
-    /// <summary>
-    /// Reference to the progress bar image, so we can add fancy colors
-    /// </summary>
-    public Image feedbackProgressImage;
 
     /// <summary>
     /// Reference to the sign predictor
     /// </summary>
     public SignPredictor signPredictor;
 
-    /// <summary>
-    /// Timer to keep track of how long a incorrect sign is performed
-    /// </summary>
-    protected DateTime timer;
-
-    /// <summary>
-    /// Current predicted sign
-    /// </summary>
-    protected string predictedSign = null;
-
-    /// <summary>
-    /// Previous incorrect sign, so we can keep track whether the user is wrong or the user is still changing signs
-    /// </summary>
-    protected string previousIncorrectSign = null;
-
     public IEnumerator ProcessIncomingCall()
     {
-        //UpdateFeedback2();
         yield return StartCoroutine(UpdateFeedback());
     }
 
@@ -58,7 +28,5 @@ public abstract class AbstractFeedback : MonoBehaviour, Listener
         signPredictor.listeners.Add(this);
     }
 
-    public void Empty() { }
-
     protected abstract IEnumerator UpdateFeedback();
 }

Assets/SpellingBee/Scripts/GameController.cs

@@ -142,6 +142,36 @@ public partial class GameController : AbstractFeedback
     /// </summary>
     public GameObject gameEndedPanel;
 
+    /// <summary>
+    /// Reference to the feedback field
+    /// </summary>
+    public TMP_Text feedbackText;
+
+    /// <summary>
+    /// Reference to the progress bar
+    /// </summary>
+    public Slider feedbackProgress;
+
+    /// <summary>
+    /// Reference to the progress bar image, so we can add fancy colors
+    /// </summary>
+    public Image feedbackProgressImage;
+
+    /// <summary>
+    /// Timer to keep track of how long a incorrect sign is performed
+    /// </summary>
+    protected DateTime timer;
+
+    /// <summary>
+    /// Current predicted sign
+    /// </summary>
+    protected string predictedSign = null;
+
+    /// <summary>
+    /// Previous incorrect sign, so we can keep track whether the user is wrong or the user is still changing signs
+    /// </summary>
+    protected string previousIncorrectSign = null;
+
     /// <summary>
     /// Start is called before the first frame update
     /// </summary>