Merge branch 'main' into feat-RTC

Author: firecerne

Assets/Scripts/Description/Helpers/ChipTypeHelper.cs

@@ -15,9 +15,11 @@ public static class ChipTypeHelper
 			{ ChipType.Clock, "CLOCK" },
 			{ ChipType.Pulse, "PULSE" },
 			{ ChipType.TriStateBuffer, "3-STATE BUFFER" },
+			{ ChipType.Constant_8Bit, "CONST" },
 			// ---- Memory ----
-			{ ChipType.dev_Ram_8Bit, "dev.RAM-8" },
+			{ ChipType.dev_Ram_8Bit, "RAM-8" },
 			{ ChipType.Rom_256x16, $"ROM 256{mulSymbol}16" },
+            { ChipType.EEPROM_256x16, $"EEPROM 256{mulSymbol}16" },
 			// ---- Split / Merge ----
 			{ ChipType.Split_4To1Bit, "4-1BIT" },
 			{ ChipType.Split_8To1Bit, "8-1BIT" },
@@ -46,6 +48,9 @@ public static class ChipTypeHelper
 			{ ChipType.Out_4Bit, "OUT-4" },
 			{ ChipType.Out_8Bit, "OUT-8" },
 			{ ChipType.Key, "KEY" },
+            { ChipType.Button, "BUTTON" },
+			{ ChipType.Toggle, "DIPSWITCH" },
+
 			// ---- Buses ----
 			{ ChipType.Bus_1Bit, "BUS-1" },
 			{ ChipType.Bus_4Bit, "BUS-4" },
@@ -63,7 +68,7 @@ public static class ChipTypeHelper
 
 		public static bool IsBusTerminusType(ChipType type) => type is ChipType.BusTerminus_1Bit or ChipType.BusTerminus_4Bit or ChipType.BusTerminus_8Bit;
 
-		public static bool IsRomType(ChipType type) => type == ChipType.Rom_256x16;
+		public static bool IsRomType(ChipType type) => type == ChipType.Rom_256x16 || type == ChipType.EEPROM_256x16;
 
 		public static ChipType GetCorrespondingBusTerminusType(ChipType type)
 		{
@@ -111,5 +116,15 @@ public static (bool isInput, bool isOutput, PinBitCount numBits) IsInputOrOutput
 				_ => (false, false, PinBitCount.Bit1)
 			};
 		}
+
+		public static bool IsClickableDisplayType(ChipType type) {
+			// Return true for any chiptype that is a clickable display 
+
+			return type == ChipType.Button || type == ChipType.Toggle;
+		}
+
+		public static bool IsInternalDataModifiable(ChipType type) {
+			return type == ChipType.EEPROM_256x16 || type == ChipType.Toggle;
+		}
 	}
 }

Assets/Scripts/Description/Types/SubTypes/ChipTypes.cs

@@ -13,6 +13,7 @@ public enum ChipType
 		// ---- Memory ----
 		dev_Ram_8Bit,
 		Rom_256x16,
+		EEPROM_256x16,
 
 		// ---- Displays ----
 		SevenSegmentDisplay,
@@ -38,8 +39,13 @@ public enum ChipType
 
 		Key,
 
-		// ---- Buses ----
-		Bus_1Bit,
+		Button,
+		Toggle,
+
+		Constant_8Bit,
+
+        // ---- Buses ----
+        Bus_1Bit,
 		BusTerminus_1Bit,
 		Bus_4Bit,
 		BusTerminus_4Bit,

Assets/Scripts/Game/Elements/DisplayInstance.cs

@@ -4,7 +4,7 @@
 
 namespace DLS.Game
 {
-	public class DisplayInstance
+	public class DisplayInstance : IClickable
 	{
 		public List<DisplayInstance> ChildDisplays;
 		public DisplayDescription Desc;

Assets/Scripts/Game/Elements/SubChipInstance.cs

@@ -378,6 +378,12 @@ public void FlipBus()
 			}
 		}
 
+		public void UpdateInternalData(uint[] data)
+		{
+			if (!ChipTypeHelper.IsInternalDataModifiable(ChipType)) throw new Exception("Internal Data is not modifiable for the type of chip : " + ChipTypeHelper.GetName(ChipType));
+			Array.Copy(data, InternalData, data.Length);
+		}
+
 		void LoadOutputPinColours(OutputPinColourInfo[] cols)
 		{
 			if (cols == null) return;

Assets/Scripts/Game/Interaction/ChipInteractionController.cs

@@ -50,7 +50,7 @@ public class ChipInteractionController
 		public bool CanInteractWithPin => CanInteract;
 		public bool CanInteractWithPinStateDisplay => CanInteract && !IsCreatingWire && Project.ActiveProject.CanEditViewedChip;
 		public bool CanInteractWithPinHandle => CanInteractWithPinStateDisplay;
-
+		public bool CanInteractWithButton => CanInteract;
 
 		public ChipInteractionController(Project project)
 		{

Assets/Scripts/Game/Interaction/Interfaces/IClickable.cs

@@ -0,0 +1,10 @@
+using System.Numerics;
+using Seb.Types;
+
+namespace DLS.Game
+{
+	public interface IClickable : IInteractable
+	{
+
+    }
+}

Assets/Scripts/Game/Interaction/Interfaces/IClickable.cs.meta

@@ -9,9 +9,13 @@ namespace DLS.Game
 	public static class BuiltinChipCreator
 	{
 		static readonly Color ChipCol_SplitMerge = new(0.1f, 0.1f, 0.1f); //new(0.8f, 0.8f, 0.8f);
+		static bool AllBlack;
+		static Color AllBlackColor = Color.black;
 
-		public static ChipDescription[] CreateAllBuiltinChipDescriptions()
+		public static ChipDescription[] CreateAllBuiltinChipDescriptions(ProjectDescription description)
 		{
+			AllBlack = description.ProjectName.Contains("ahic");
+
 			return new[]
 			{
 				// ---- I/O Pins ----
@@ -22,14 +26,21 @@ public static ChipDescription[] CreateAllBuiltinChipDescriptions()
 				CreateInputOrOutputPin(ChipType.In_8Bit),
 				CreateInputOrOutputPin(ChipType.Out_8Bit),
 				CreateInputKeyChip(),
+				CreateInputButtonChip(),
+				CreateInputToggleChip(),
+				
 				// ---- Basic Chips ----
 				CreateNand(),
 				CreateTristateBuffer(),
 				CreateClock(),
 				CreatePulse(),
+				CreateConstant_8(),
+
 				// ---- Memory ----
 				dev_CreateRAM_8(),
 				CreateROM_8(),
+				CreateEEPROM_8(),
+
 				// ---- Merge / Split ----
 				CreateBitConversionChip(ChipType.Split_4To1Bit, PinBitCount.Bit4, PinBitCount.Bit1, 1, 4),
 				CreateBitConversionChip(ChipType.Split_8To4Bit, PinBitCount.Bit8, PinBitCount.Bit4, 1, 2),
@@ -59,7 +70,7 @@ public static ChipDescription[] CreateAllBuiltinChipDescriptions()
 
 		static ChipDescription CreateNand()
 		{
-			Color col = new(0.73f, 0.26f, 0.26f);
+			Color col = GetColor(new(0.73f, 0.26f, 0.26f));
 			Vector2 size = new(CalculateGridSnappedWidth(GridSize * 8), GridSize * 4);
 
 			PinDescription[] inputPins = { CreatePinDescription("IN B", 0), CreatePinDescription("IN A", 1) };
@@ -70,7 +81,7 @@ static ChipDescription CreateNand()
 
 		static ChipDescription CreateBuzzer()
 		{
-			Color col = new(0, 0, 0);
+			Color col = GetColor(new(0, 0, 0));
 
 			PinDescription[] inputPins =
 			{
@@ -104,7 +115,7 @@ static ChipDescription CreateRTC()
 
 		static ChipDescription dev_CreateRAM_8()
 		{
-			Color col = new(0.85f, 0.45f, 0.3f);
+			Color col = GetColor(new(0.85f, 0.45f, 0.3f));
 
 			PinDescription[] inputPins =
 			{
@@ -132,26 +143,102 @@ static ChipDescription CreateROM_8()
 				CreatePinDescription("OUT A", 2, PinBitCount.Bit8)
 			};
 
-			Color col = new(0.25f, 0.35f, 0.5f);
+			Color col = GetColor(new(0.25f, 0.35f, 0.5f));
 			Vector2 size = new(GridSize * 12, SubChipInstance.MinChipHeightForPins(inputPins, outputPins));
 
 			return CreateBuiltinChipDescription(ChipType.Rom_256x16, size, col, inputPins, outputPins);
 		}
 
-		static ChipDescription CreateInputKeyChip()
+        static ChipDescription CreateEEPROM_8()
+        {
+            PinDescription[] inputPins =
+            {
+                CreatePinDescription("ADDRESS", 0, PinBitCount.Bit8),
+				CreatePinDescription("WRITE B", 1, PinBitCount.Bit8),
+                CreatePinDescription("WRITE A", 2, PinBitCount.Bit8),
+                CreatePinDescription("WRITE", 3, PinBitCount.Bit1),
+				CreatePinDescription("CLOCK", 4, PinBitCount.Bit1)
+            };
+            PinDescription[] outputPins =
+            {
+                CreatePinDescription("OUT B", 5, PinBitCount.Bit8),
+                CreatePinDescription("OUT A", 6, PinBitCount.Bit8)
+            };
+
+            Color col = GetColor(new(0.25f, 0.35f, 0.5f));
+            Vector2 size = new(GridSize * 12, SubChipInstance.MinChipHeightForPins(inputPins, outputPins));
+
+            return CreateBuiltinChipDescription(ChipType.EEPROM_256x16, size, col, inputPins, outputPins);
+        }
+
+		static ChipDescription CreateConstant_8()
 		{
+			PinDescription[] outputPins =
+			{
+				CreatePinDescription("VALUE OUT", 0, PinBitCount.Bit8),
+			};
+
 			Color col = new(0.1f, 0.1f, 0.1f);
+			Vector2 size = Vector2.one * GridSize * 6;
+
+			return CreateBuiltinChipDescription(ChipType.Constant_8Bit, size, col, null, outputPins);
+        }
+
+
+        static ChipDescription CreateInputKeyChip()
+		{
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			Vector2 size = new Vector2(GridSize, GridSize) * 3;
 
 			PinDescription[] outputPins = { CreatePinDescription("OUT", 0) };
 
 			return CreateBuiltinChipDescription(ChipType.Key, size, col, null, outputPins, null, NameDisplayLocation.Hidden);
 		}
 
+        static ChipDescription CreateInputButtonChip()
+        {
+            Color col = GetColor(new(0.1f, 0.1f, 0.1f));
+            Vector2 size = new Vector2(GridSize, GridSize) * 3;
+			float displayWidth = size.x - GridSize *0.5f;
 
-		static ChipDescription CreateTristateBuffer()
+            PinDescription[] outputPins = { CreatePinDescription("OUT", 0) };
+			DisplayDescription[] displays =
+			{
+				new()
+				{
+					Position = Vector2.zero,
+					Scale = displayWidth,
+					SubChipID = -1
+				}
+			};
+
+            return CreateBuiltinChipDescription(ChipType.Button, size, col, null, outputPins, displays, NameDisplayLocation.Hidden);
+        }
+
+        static ChipDescription CreateInputToggleChip()
+        {
+            Color col = GetColor(new(70, 130, 180));
+            Vector2 size = new Vector2(1f, 2f) * GridSize;
+            float displayWidth = size.x;
+
+            PinDescription[] outputPins = { CreatePinDescription("OUT", 0) };
+            DisplayDescription[] displays =
+            {
+                new()
+                {
+                    Position = Vector2.zero,
+                    Scale = displayWidth,
+                    SubChipID = -1
+                }
+            };
+
+            return CreateBuiltinChipDescription(ChipType.Toggle, size, col, null, outputPins, displays, NameDisplayLocation.Hidden);
+        }
+
+
+        static ChipDescription CreateTristateBuffer()
 		{
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			Vector2 size = new(CalculateGridSnappedWidth(1.5f), GridSize * 5);
 
 			PinDescription[] inputPins = { CreatePinDescription("IN", 0), CreatePinDescription("ENABLE", 1) };
@@ -163,7 +250,7 @@ static ChipDescription CreateTristateBuffer()
 		static ChipDescription CreateClock()
 		{
 			Vector2 size = new(GridHelper.SnapToGrid(1), GridSize * 3);
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			PinDescription[] outputPins = { CreatePinDescription("CLK", 0) };
 
 			return CreateBuiltinChipDescription(ChipType.Clock, size, col, null, outputPins);
@@ -172,7 +259,7 @@ static ChipDescription CreateClock()
 		static ChipDescription CreatePulse()
 		{
 			Vector2 size = new(GridHelper.SnapToGrid(1), GridSize * 3);
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			PinDescription[] inputPins = { CreatePinDescription("IN", 0) };
 			PinDescription[] outputPins = { CreatePinDescription("PULSE", 1) };
 
@@ -199,7 +286,7 @@ static ChipDescription CreateBitConversionChip(ChipType chipType, PinBitCount bi
 			float height = SubChipInstance.MinChipHeightForPins(inputPins, outputPins);
 			Vector2 size = new(GridSize * 9, height);
 
-			return CreateBuiltinChipDescription(chipType, size, ChipCol_SplitMerge, inputPins, outputPins);
+			return CreateBuiltinChipDescription(chipType, size, GetColor(ChipCol_SplitMerge), inputPins, outputPins);
 		}
 
 		static string GetPinName(int pinIndex, int pinCount, bool isInput)
@@ -223,7 +310,7 @@ static ChipDescription CreateDisplay7Seg()
 				CreatePinDescription("COL", 7)
 			};
 
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			float height = SubChipInstance.MinChipHeightForPins(inputPins, null);
 			Vector2 size = new(GridSize * 10, height);
 			float displayWidth = size.x - GridSize * 2;
@@ -246,7 +333,7 @@ static ChipDescription CreateDisplayRGB()
 			float width = height;
 			float displayWidth = height - GridSize * 2;
 
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			Vector2 size = new(width, height);
 
 			PinDescription[] inputPins =
@@ -302,7 +389,7 @@ static ChipDescription CreateDisplayDot()
 			float width = height;
 			float displayWidth = height - GridSize * 2;
 
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			Vector2 size = new(width, height);
 
 
@@ -358,7 +445,7 @@ static ChipDescription CreateBus(PinBitCount bitCount)
 			PinDescription[] inputs = { CreatePinDescription(name + " (Hidden)", 0, bitCount) };
 			PinDescription[] outputs = { CreatePinDescription(name, 1, bitCount) };
 
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 
 			return CreateBuiltinChipDescription(type, BusChipSize(bitCount), col, inputs, outputs, null, NameDisplayLocation.Hidden);
 		}
@@ -374,7 +461,7 @@ static ChipDescription CreateDisplayLED()
 			float width = height;
 			float displayWidth = height - GridSize * 0.5f;
 
-			Color col = new(0.1f, 0.1f, 0.1f);
+			Color col = GetColor(new(0.1f, 0.1f, 0.1f));
 			Vector2 size = new(width, height);
 
 
@@ -463,5 +550,10 @@ void AddPins(PinDescription[] pins)
 				}
 			}
 		}
+
+		static Color GetColor(Color color)
+		{
+			return AllBlack ? AllBlackColor : color;
+		}
 	}
 }