fixed a few bugs

Author: Parshwa

Assets/Scripts/Description/Helpers/ChipTypeHelper.cs

@@ -16,7 +16,9 @@ public static class ChipTypeHelper
 			{ ChipType.TriStateBuffer, "3-STATE BUFFER" },
 			// ---- Memory ----
 			{ ChipType.dev_Ram_8Bit, "dev.RAM-8" },
+			{ ChipType.Rom_256x2x8, $"ROM 256{mulSymbol}x2x8" },
 			{ ChipType.Rom_256x16, $"ROM 256{mulSymbol}16" },
+			{ ChipType.Rom_256x32, $"ROM 256{mulSymbol}32" },
 			// ---- Split / Merge ----
 			{ ChipType.Split_4To1Bit, "4-1BIT" },
 			{ ChipType.Split_8To1Bit, "8-1BIT" },
@@ -69,7 +71,7 @@ public static class ChipTypeHelper
 
 		public static bool IsBusTerminusType(ChipType type) => type is ChipType.BusTerminus_1Bit or ChipType.BusTerminus_4Bit or ChipType.BusTerminus_8Bit or ChipType.BusTerminus_16Bit;
 
-		public static bool IsRomType(ChipType type) => type == ChipType.Rom_256x16;
+		public static bool IsRomType(ChipType type) => type is ChipType.Rom_256x2x8 or ChipType.Rom_256x16 or ChipType.Rom_256x32;
 
 		public static ChipType GetCorrespondingBusTerminusType(ChipType type)
 		{

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

@@ -12,18 +12,18 @@ public enum ChipType
 
 		// ---- Memory ----
 		dev_Ram_8Bit,
+		Rom_256x2x8,
 		Rom_256x16,
+		Rom_256x32,
 
 		// ---- Displays ----
-		//TODO: Make all displays use 0 to 255 for RGB, and make sure you duplicate them first so only if needed overide them, also make the RGBLED
 		SevenSegmentDisplay,
 		DisplayRGB,
 		DisplayDot,
 		DisplayLED,
 		DisplayRGBLED,
 
 		// ---- Merge / Split ----
-		//TODO: Make the 16 MERGES AND SPLITS atcually work
 		Merge_1To4Bit,
 		Merge_1To8Bit,
 		Merge_4To8Bit,

Assets/Scripts/Game/Project/BuiltinChipCreator.cs

@@ -31,7 +31,9 @@ public static ChipDescription[] CreateAllBuiltinChipDescriptions()
 				CreatePulse(),
 				// ---- Memory ----
 				dev_CreateRAM_8(),
-				CreateROM_8(),
+				CreateROM(ChipType.Rom_256x2x8),
+				CreateROM(ChipType.Rom_256x16),
+				CreateROM(ChipType.Rom_256x32),
 				// ---- Merge / Split ----
 				CreateBitConversionChip(ChipType.Split_4To1Bit, PinBitCount.Bit4, PinBitCount.Bit1, 1, 4),
 				CreateBitConversionChip(ChipType.Split_8To4Bit, PinBitCount.Bit8, PinBitCount.Bit4, 1, 2),
@@ -94,22 +96,76 @@ static ChipDescription dev_CreateRAM_8()
 			return CreateBuiltinChipDescription(ChipType.dev_Ram_8Bit, size, col, inputPins, outputPins);
 		}
 
-		static ChipDescription CreateROM_8()
+		static ChipDescription CreateROM(ChipType type)
 		{
-			PinDescription[] inputPins =
-			{
-				CreatePinDescription("ADDRESS", 0, PinBitCount.Bit8)
-			};
-			PinDescription[] outputPins =
-			{
-				CreatePinDescription("OUT B", 1, PinBitCount.Bit8),
-				CreatePinDescription("OUT A", 2, PinBitCount.Bit8)
-			};
+			switch(type){
+				case ChipType.Rom_256x2x8:
+				{
+					PinDescription[] inputPins =
+					{
+						CreatePinDescription("ADDRESS", 0, PinBitCount.Bit8)
+					};
+					PinDescription[] outputPins =
+					{
+						CreatePinDescription("OUT B", 1, PinBitCount.Bit8),
+						CreatePinDescription("OUT A", 2, PinBitCount.Bit8)
+					};
+
+					Color col = new(0.25f, 0.35f, 0.5f);
+					Vector2 size = new(GridSize * 12, SubChipInstance.MinChipHeightForPins(inputPins, outputPins));
 
-			Color col = new(0.25f, 0.35f, 0.5f);
-			Vector2 size = new(GridSize * 12, SubChipInstance.MinChipHeightForPins(inputPins, outputPins));
+					return CreateBuiltinChipDescription(ChipType.Rom_256x2x8, size, col, inputPins, outputPins);
+				}
+				case ChipType.Rom_256x16:
+				{
+					PinDescription[] inputPins =
+					{
+						CreatePinDescription("ADDRESS", 0, PinBitCount.Bit8)
+					};
+					PinDescription[] outputPins =
+					{
+						CreatePinDescription("OUT A", 1, PinBitCount.Bit16)
+					};
+
+					Color col = 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);
+				}
+				case ChipType.Rom_256x32:
+				{
+					PinDescription[] inputPins =
+					{
+						CreatePinDescription("ADDRESS", 0, PinBitCount.Bit8)
+					};
+					PinDescription[] outputPins =
+					{
+						CreatePinDescription("OUT B", 1, PinBitCount.Bit16),
+						CreatePinDescription("OUT A", 2, PinBitCount.Bit16)
+					};
 
-			return CreateBuiltinChipDescription(ChipType.Rom_256x16, size, col, inputPins, outputPins);
+					Color col = new(0.25f, 0.35f, 0.5f);
+					Vector2 size = new(GridSize * 12, SubChipInstance.MinChipHeightForPins(inputPins, outputPins));
+
+					return CreateBuiltinChipDescription(ChipType.Rom_256x32, size, col, inputPins, outputPins);
+				}
+				default:
+				{
+					PinDescription[] inputPins =
+					{
+						CreatePinDescription("ADDRESS", 0, PinBitCount.Bit8)
+					};
+					PinDescription[] outputPins =
+					{
+						CreatePinDescription("OUT A", 1, PinBitCount.Bit16)
+					};
+
+					Color col = 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()
@@ -216,30 +272,30 @@ static ChipDescription CreateDisplay7Seg()
 
 		static ChipDescription CreateDisplayRGB()
 		{
-			float height = GridSize * 21;
-			float width = height;
-			float displayWidth = height - GridSize * 2;
+			float displayWidth = GridSize * 19;
 
 			Color col = new(0.1f, 0.1f, 0.1f);
-			Vector2 size = new(width, height);
 
 			PinDescription[] inputPins =
 			{
 				CreatePinDescription("ADDRESS", 0, PinBitCount.Bit8),
-				CreatePinDescription("RED", 1, PinBitCount.Bit4),
-				CreatePinDescription("GREEN", 2, PinBitCount.Bit4),
-				CreatePinDescription("BLUE", 3, PinBitCount.Bit4),
+				CreatePinDescription("RED", 1, PinBitCount.Bit8),
+				CreatePinDescription("GREEN", 2, PinBitCount.Bit8),
+				CreatePinDescription("BLUE", 3, PinBitCount.Bit8),
 				CreatePinDescription("RESET", 4),
 				CreatePinDescription("WRITE", 5),
 				CreatePinDescription("REFRESH", 6),
 				CreatePinDescription("CLOCK", 7)
 			};
+			float height = SubChipInstance.MinChipHeightForPins(inputPins, null);
+			float width = height;
+			Vector2 size = new(width, height);
 
 			PinDescription[] outputPins =
 			{
-				CreatePinDescription("R OUT", 8, PinBitCount.Bit4),
-				CreatePinDescription("G OUT", 9, PinBitCount.Bit4),
-				CreatePinDescription("B OUT", 10, PinBitCount.Bit4)
+				CreatePinDescription("R OUT", 8, PinBitCount.Bit8),
+				CreatePinDescription("G OUT", 9, PinBitCount.Bit8),
+				CreatePinDescription("B OUT", 10, PinBitCount.Bit8)
 			};
 
 			DisplayDescription[] displays =
@@ -361,7 +417,7 @@ static ChipDescription CreateDisplayRGBLED()
 				new()
 				{
 					Position = Vector2.right * PinRadius / 3 * 0,
-					Scale = displayWidth,
+					Scale = GridSize * 1,
 					SubChipID = -1
 				}
 			};

Assets/Scripts/Game/Project/BuiltinCollectionCreator.cs

@@ -63,7 +63,9 @@ public static ChipCollection[] CreateDefaultChipCollections()
 					ChipType.DisplayRGBLED
 				),
 				CreateChipCollection("MEMORY",
-					ChipType.Rom_256x16
+					ChipType.Rom_256x2x8,
+					ChipType.Rom_256x16,
+					ChipType.Rom_256x32
 				)
 			};
 		}

Assets/Scripts/Graphics/UI/Menus/RomEditMenu.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Text;
 using DLS.Game;
+using DLS.Description;
 using Seb.Helpers;
 using Seb.Types;
 using Seb.Vis;
@@ -214,78 +215,81 @@ static bool ValidateInputString(string text)
 		// Convert from uint to display string with given display mode
 		static string UIntToDisplayString(uint raw, DataDisplayMode displayFormat, int bitCount)
 		{
-			return displayFormat switch
+			string data = displayFormat switch
 			{
 				DataDisplayMode.Binary => Convert.ToString(raw, 2).PadLeft(bitCount, '0'),
 				DataDisplayMode.DecimalSigned => Maths.TwosComplement(raw, bitCount) + "",
 				DataDisplayMode.DecimalUnsigned => raw + "",
 				DataDisplayMode.HEX => raw.ToString("X").PadLeft(bitCount / 4, '0'),
 				_ => throw new NotImplementedException("Unsupported display format: " + displayFormat)
 			};
+			Debug.Log("Loaded "+data);
+			return data;
 		}
 
 		// Convert string with given format to uint
 		static uint DisplayStringToUInt(string displayString, DataDisplayMode stringFormat, int bitCount)
 		{
 			displayString = displayString.Replace(" ", string.Empty);
+			Debug.Log("Display " + displayString);
 			uint uintVal;
-
-			switch (stringFormat)
-			{
-				case DataDisplayMode.Binary:
-					uintVal = Convert.ToUInt32(displayString, 2);
-					break;
-				case DataDisplayMode.DecimalSigned:
+			try{
+				switch (stringFormat)
 				{
-					int signedValue = int.Parse(displayString);
-					uint unsignedRange = 1u << bitCount;
-					if (signedValue < 0)
-					{
-						uintVal = (uint)(signedValue + unsignedRange);
-					}
-					else
+					case DataDisplayMode.Binary:
+						uintVal = Convert.ToUInt32(displayString, 2);
+						break;
+					case DataDisplayMode.DecimalSigned:
 					{
-						uintVal = (uint)signedValue;
-					}
+						int signedValue = int.Parse(displayString);
+						uint unsignedRange = 1u << bitCount;
+						if (signedValue < 0)
+						{
+							uintVal = (uint)(signedValue + unsignedRange);
+						}
+						else
+						{
+							uintVal = (uint)signedValue;
+						}
 
-					break;
+						break;
+					}
+					case DataDisplayMode.DecimalUnsigned:
+						uintVal = uint.Parse(displayString);
+						break;
+					case DataDisplayMode.HEX:
+						int value = Convert.ToInt32(displayString, 16);
+						uintVal = (uint)value;
+						break;
+					default:
+						throw new NotImplementedException("Unsupported display format: " + stringFormat);
+				}
+			}catch (Exception e){
+				Debug.Log(e);
+				if (stringFormat is DataDisplayMode.Binary){
+					uintVal =(uint) ((ulong) (Convert.ToInt64(displayString, 2))& 0b11111111111111111111111111111111);
 				}
-				case DataDisplayMode.DecimalUnsigned:
-					uintVal = uint.Parse(displayString);
-					break;
-				case DataDisplayMode.HEX:
- 					int value = Convert.ToInt32(displayString, 16);
- 					uintVal = (uint)value;
- 					break;
-				default:
-					throw new NotImplementedException("Unsupported display format: " + stringFormat);
+				uintVal = 0;
 			}
-
+			Debug.Log(uintVal);
 			return uintVal;
 		}
 
 		static bool TryParseDisplayStringToUInt(string displayString, DataDisplayMode stringFormat, int bitCount, out uint raw)
 		{
-			try
-			{
-				raw = DisplayStringToUInt(displayString, stringFormat, bitCount);
-				uint maxVal = (1u << bitCount) - 1;
-
-				// If value is too large to fit in given bit-count, clamp the result and return failure
-				// (note: maybe makes more sense to wrap the result, but I think it's more obvious to player what happened if it just clamps)
-				if (raw > maxVal)
-				{
-					raw = maxVal;
-					return false;
-				}
+			raw = DisplayStringToUInt(displayString, stringFormat, bitCount);
+			long maxVal = (long) Math.Pow(2,bitCount) - 1;
+			uint max = (uint) maxVal;
 
-				return true;
-			}
-			catch (Exception)
+			// If value is too large to fit in given bit-count, clamp the result and return failure
+			// (note: maybe makes more sense to wrap the result, but I think it's more obvious to player what happened if it just clamps)
+			if (raw > max)
 			{
-				raw = 0;
+				raw = max;
 				return false;
 			}
+
+			return true;
 		}
 
 		static void SaveChangesToROM()
@@ -340,7 +344,14 @@ public static void OnMenuOpened()
 		{
 			romChip = (SubChipInstance)ContextMenu.interactionContext;
 			RowCount = romChip.InternalData.Length;
-			ActiveRomDataBitCount = 16; //
+			ActiveRomDataBitCount = romChip.ChipType switch
+			{
+				ChipType.Rom_256x2x8 => 16,
+				ChipType.Rom_256x16 => 16,
+				ChipType.Rom_256x32 => 32,
+				_ => 16
+			};
+
 
 			ID_DataDisplayMode = new UIHandle("ROM_DataDisplayMode", romChip.ID);
 			ID_scrollbar = new UIHandle("ROM_EditScrollbar", romChip.ID);

Assets/Scripts/Graphics/World/DevSceneDrawer.cs

@@ -379,7 +379,6 @@ public static Bounds2D DrawDisplayWithBackground(DisplayInstance display, Vector
 			Bounds2D bounds = DrawDisplay(display, pos, 1, rootChip, sim);
 
 			// Border colour around display
-			Draw.ModifyQuad(displayBorderID, bounds.Centre, bounds.Size + Vector2.one * 0.03f, borderCol);
 			// Black background behind display to fill any gaps
 			Draw.ModifyQuad(displayBackingID, bounds.Centre, bounds.Size, Color.black);
 
@@ -454,9 +453,10 @@ public static Bounds2D DrawDisplay(DisplayInstance display, Vector2 posParent, f
 		public static Bounds2D DrawDisplay_RGB(Vector2 centre, float scale, SimChip simSource)
 		{
 			const int pixelsPerRow = 16;
-			const float borderFrac = 0.95f;
-			const float pixelSizeT = 0.925f;
+			const float borderFrac = 1f;
+			const float pixelSizeT = 1f;
 			// Draw background
+			Debug.Log(scale);
 			Draw.Quad(centre, Vector2.one * scale, Color.black);
 			float size = scale * borderFrac;
 
@@ -475,9 +475,9 @@ public static Bounds2D DrawDisplay_RGB(Vector2 centre, float scale, SimChip simS
 					{
 						int address = y * 16 + x;
 						uint pixelState = simSource.InternalState[address];
-						float red = Unpack4BitColChannel(pixelState);
-						float green = Unpack4BitColChannel(pixelState >> 4);
-						float blue = Unpack4BitColChannel(pixelState >> 8);
+						float red = Unpack8BitColChannel(pixelState);
+						float green = Unpack8BitColChannel(pixelState >> 8);
+						float blue = Unpack8BitColChannel(pixelState >> 16);
 						col = new Color(red, green, blue);
 					}
 
@@ -487,11 +487,6 @@ public static Bounds2D DrawDisplay_RGB(Vector2 centre, float scale, SimChip simS
 			}
 
 			return Bounds2D.CreateFromCentreAndSize(centre, Vector2.one * scale);
-
-			float Unpack4BitColChannel(uint raw)
-			{
-				return (raw & 0b1111) / 15f;
-			}
 		}
 
 		public static Bounds2D DrawDisplay_Dot(Vector2 centre, float scale, SimChip simSource)