Added RGB light

Author: OrangoMango

src/main/java/com/orangomango/logicsim/MainApplication.java

@@ -496,6 +496,9 @@ public void start(Stage stage){
 							case 9:
 								g = new TriStateBuffer(gc, new Rectangle2D(clickPoint.getX(), clickPoint.getY(), 100, 50));
 								break;
+							case 10:
+								g = new LightRGB(gc, new Rectangle2D(clickPoint.getX(), clickPoint.getY(), 50, 50));
+								break;
 						}
 						if (g != null){
 							if (loaded) this.gates.add(g);
@@ -863,6 +866,10 @@ private ContextMenu buildContextMenu(Gate found, Pin pinFound){
 				gate.setLabel(v);
 			});
 		});
+		MenuItem deleteGate = new MenuItem("Delete");
+		deleteGate.setOnAction(ev -> {
+			this.gatesToRemove.add(found);
+		});
 		if (pinFound != null){
 			final Pin pin = pinFound;
 			if (gate instanceof Bus){
@@ -871,7 +878,7 @@ private ContextMenu buildContextMenu(Gate found, Pin pinFound){
 				cm.getItems().add(removePin);
 			}
 		}
-		cm.getItems().add(changeLabel);
+		cm.getItems().addAll(changeLabel, deleteGate);
 		return cm;
 	}
 
@@ -906,8 +913,9 @@ private void buildSideArea(GraphicsContext gc){
 		this.sideArea = new SideArea(gc, new Rectangle2D(WIDTH-50, 250, 50, 75), new Rectangle2D(TOOLBAR_X, 0, WIDTH*0.3, HEIGHT));
 		this.sideArea.setButtonSize(80);
 		this.sideArea.addButton("Switch", () -> this.selectedId = 0);
-		this.sideArea.addButton("Wire", () -> this.selectedId = 1);
 		this.sideArea.addButton("Light", () -> this.selectedId = 2);
+		this.sideArea.addButton("RGB Light", () -> this.selectedId = 10);
+		this.sideArea.addButton("Wire", () -> this.selectedId = 1);
 		this.sideArea.addButton("NOT gate", () -> this.selectedId = 3);
 		this.sideArea.addButton("AND gate", () -> this.selectedId = 4);
 		this.sideArea.addButton("Chip", () -> this.selectedId = 5);
@@ -1009,7 +1017,7 @@ public static JSONObject load(File file, GraphicsContext gc, List<Gate> tempGate
 				if (name.equals("AND")){
 					gt = new AndGate(gc, rect);
 				} else if (name.equals("LIGHT")){
-					gt = new Light(gc, rect);
+					gt = pins.size() == 3 ? new LightRGB(gc, rect) : new Light(gc, rect);
 				} else if (name.equals("NOT")){
 					gt = new NotGate(gc, rect);
 				} else if (name.equals("SWITCH")){

src/main/java/com/orangomango/logicsim/core/Light.java

@@ -5,7 +5,7 @@
 import javafx.scene.image.Image;
 
 public class Light extends Gate{
-	private Image image;
+	protected Image image;
 
 	public Light(GraphicsContext gc, Rectangle2D rect){
 		super(gc, "LIGHT", rect, null);
@@ -20,6 +20,6 @@ public boolean isOn(){
 
 	@Override
 	protected void renderGate(GraphicsContext gc){
-		gc.drawImage(this.image, 1+(isOn() ? 52 : 0), 1, 50, 50, this.rect.getMinX(), this.rect.getMinY(), this.rect.getWidth(), this.rect.getHeight());
+		gc.drawImage(this.image, 1+(isOn() ? 0 : 52), 1, 50, 50, this.rect.getMinX(), this.rect.getMinY(), this.rect.getWidth(), this.rect.getHeight());
 	}
 }

src/main/java/com/orangomango/logicsim/core/LightRGB.java

@@ -0,0 +1,34 @@
+package com.orangomango.logicsim.core;
+
+import javafx.scene.canvas.GraphicsContext;
+import javafx.geometry.Rectangle2D;
+
+public class LightRGB extends Light{
+	public LightRGB(GraphicsContext gc, Rectangle2D rect){
+		super(gc, rect);
+		this.label = "RGB Light";
+		this.pins.clear(); // Reset pins
+		this.pins.add(new Pin(this, new Rectangle2D(rect.getMinX()-7, rect.getMinY()+3, 10, 10), true));
+		this.pins.add(new Pin(this, new Rectangle2D(rect.getMinX()-7, rect.getMinY()+21, 10, 10), true));
+		this.pins.add(new Pin(this, new Rectangle2D(rect.getMinX()-7, rect.getMinY()+39, 10, 10), true));
+	}
+
+	private int getRGB(){
+		int rgb = 0;
+		if (this.pins.get(0).isOn()) rgb |= 4;
+		if (this.pins.get(1).isOn()) rgb |= 2;
+		if (this.pins.get(2).isOn()) rgb |= 1;
+		return rgb;
+	}
+
+	@Override
+	public boolean isOn(){
+		return getRGB() != 0;
+	}
+
+	@Override
+	protected void renderGate(GraphicsContext gc){
+		int index = getRGB()+1;
+		gc.drawImage(this.image, 1+(52*index), 1, 50, 50, this.rect.getMinX(), this.rect.getMinY(), this.rect.getWidth(), this.rect.getHeight());
+	}
+}