Merge pull request #44 from VitoBarra/main

Wire Type menu hot fix

Author: AOx0

Assets/Scripts/Chip/InputSignal.cs

@@ -3,47 +3,61 @@
 
 // Provides input signal (0 or 1) to a chip.
 // When designing a chip, this input signal can be manually set to 0 or 1 by the player.
-public class InputSignal : ChipSignal {
-
-
-	protected override void Start () {
-		base.Start ();
-		SetCol ();
-	}
-
-	public void ToggleActive () {
-		currentState = 1 - currentState;
-		SetCol ();
-	}
-
-	public void SendSignal (int signal) {
-		currentState = signal;
-		outputPins[0].ReceiveSignal (signal);
-		SetCol ();
-	}
-
-	public void SendOffSignal()
-	{
-		outputPins[0].ReceiveSignal(0);
-		SetCol();
-	}
-
-	public void SendSignal () {
-		outputPins[0].ReceiveSignal (currentState);
-	}
-
-	void SetCol () {
-		SetDisplayState (currentState);
-	}
-
-	public override void UpdateSignalName (string newName) {
-		base.UpdateSignalName (newName);
-		outputPins[0].pinName = newName;
-	}
-
-	void OnMouseDown () {
-		// Allow only to click on single wires, not on bus wires
-		if(outputPins.All(x => x.wireType == Pin.WireType.Simple))
-			ToggleActive ();
-	}
+public class InputSignal : ChipSignal
+{
+
+
+    protected override void Start()
+    {
+        base.Start();
+        SetCol();
+    }
+
+    public void ToggleActive()
+    {
+        currentState = 1 - currentState;
+        SetCol();
+    }
+
+    public void SetState(int state)
+    {
+        currentState = state >= 1 ? 1 : 0;
+        SetCol();
+    }
+
+    public void SendSignal(int signal)
+    {
+        currentState = signal;
+        outputPins[0].ReceiveSignal(signal);
+        SetCol();
+    }
+
+    public void SendOffSignal()
+    {
+        outputPins[0].ReceiveSignal(0);
+        SetCol();
+    }
+
+    public void SendSignal()
+    {
+        outputPins[0].ReceiveSignal(currentState);
+    }
+
+    void SetCol()
+    {
+        SetDisplayState(currentState);
+    }
+
+    public override void UpdateSignalName(string newName)
+    {
+        base.UpdateSignalName(newName);
+        outputPins[0].pinName = newName;
+    }
+
+    void OnMouseDown()
+    {
+        // Allow only to click on single wires, not on bus wires
+        if (outputPins.All(x => x.wireType == Pin.WireType.Simple))
+            ToggleActive();
+    }
 }

Assets/Scripts/Chip/Pin.cs

@@ -7,7 +7,9 @@ public class Pin : MonoBehaviour
     public enum WireType { Simple, Bus4, Bus8, Bus16, Bus32 }
     public enum PinType { ChipInput, ChipOutput }
     public PinType pinType;
+
     public WireType wireType;
+
     // The chip that this pin is attached to (either as an input or output
     // terminal)
     public Chip chip;
@@ -189,4 +191,6 @@ public void MouseExit()
         transform.localScale = Vector3.one * radius * 2;
         UpdateColor();
     }
+
+
 }

Assets/Scripts/Interaction/ChipInterfaceEditor.cs

@@ -126,29 +126,27 @@ public override void FocusLostHandler()
 
 
     // Event handler when changed input or output pin wire type
-    public void ModeChanged(int mode)
+    public void ChangeWireType(int mode)
     {
         if (!IsSomethingSelected)
             return;
 
         // Change output pin wire mode
+        foreach (var sig in selectedSignals)
+            sig.wireType = (Pin.WireType)mode;
+        
         foreach (var pin in selectedSignals.SelectMany(x => x.inputPins))
-        {
             pin.wireType = (Pin.WireType)mode;
-        }
 
         // Change input pin wire mode
         if (selectedSignals[0] is InputSignal)
         {
             foreach (InputSignal signal in selectedSignals)
             {
                 var pin = signal.outputPins[0];
-                if (pin == null)
-                    return;
+                if (pin == null) return;
                 pin.wireType = (Pin.WireType)mode;
-                // Turn off input pin
-                if (pin.State == 1)
-                    signal.ToggleActive();
+                signal.SetState(0);
             }
         }
     }
@@ -347,7 +345,7 @@ void HandleSpawning()
                 visiblePins.AddRange(spawnedSignal.inputPins);
                 visiblePins.AddRange(spawnedSignal.outputPins);
                 spawnedSignals[i] = spawnedSignal;
-                
+
             }
 
             if (isGroup)
@@ -428,7 +426,7 @@ void DrawSignalHandles()
 
             if (selectedSignals.Contains(singnal))
                 handleState = HasFocus ? HandleState.SelectedAndFocused : HandleState.Selected;
-            else if(singnal == highlightedSignal)
+            else if (singnal == highlightedSignal)
                 handleState = HandleState.Highlighted;
 
             DrawHandle(singnal.transform.position.y, handleState);
@@ -494,8 +492,10 @@ void SelectSignal(ChipSignal signalToDrag)
             dragHandleStartY = selectedSignals[selectedSignals.Count / 2].transform.position.y;
         }
 
-        PropertiesMenu.EnableUI(this, selectedSignals[0].signalName, selectedSignals.Count > 1, selectedSignals[0].useTwosComplement,
-                                   currentEditorName, signalToDrag.signalName, (int)selectedSignals[0].wireType);
+        PropertiesMenu?.EnableUI(this,
+                selectedSignals[0].signalName, selectedSignals.Count > 1,
+                selectedSignals[0].useTwosComplement, currentEditorName,
+                signalToDrag.signalName, (int)selectedSignals[0].wireType);
         RequestFocus();
 
         UpdatePropertyUIPosition();

Assets/Scripts/UI/Menu/ChipPropertiesMenu.cs

@@ -55,7 +55,7 @@ public void EnableUI(ChipInterfaceEditor chipInterfaceEditor, string signalName,
 
         Opened = true;
     }
-    
+
     public void DisableUI()
     {
         if (!Opened) return;
@@ -90,6 +90,7 @@ void Delete()
     }
     void OnValueDropDownChange(int mode)
     {
-        CurrentInterface.ModeChanged(mode);
+        if (CurrentInterface != null)
+            CurrentInterface.ChangeWireType(mode);
     }
 }