Monday's Set work

Author: monsieurjonees

.vscode/settings.json

@@ -7,5 +7,6 @@
         "build": true
     },
     "java.configuration.updateBuildConfiguration": "automatic",
-    "java.debug.settings.onBuildFailureProceed": true
+    "java.debug.settings.onBuildFailureProceed": true,
+    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
 }

res/SetGame/setOutline.md

@@ -58,7 +58,7 @@
         1. addCards()
     3. remove any null cards
 
-## Cards
+## Card
 
 ### Instance Variables
 - priv `List<Int>` cardColors = [1, 2, 3]

src/SetGame/Card.java

@@ -3,12 +3,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class Card {
+import edu.macalester.graphics.GraphicsGroup;
+import edu.macalester.graphics.Rectangle;
+
+public class Card extends GraphicsGroup {
     private int color;
     private int num;
     private int shape;
     private int fill;
 
+    private static final int CARD_WIDTH = 30;
+    private static final int CARD_HEIGHT = 45;
+    
     public Card(int color, int num, int shape, int fill) {
         this.color = color;
         this.num = num;

src/SetGame/SetGameMain.java

@@ -1,12 +1,16 @@
 package SetGame;
 
 import java.util.ArrayList;
+import java.util.List;
+
+import java.awt.Color;
 
 public class SetGameMain {
     // Instance Variables
     private SetUI gameUI;
     private ArrayList<Card> deck;
 
+    public static final int NUMBER_OF_TRAIT_VARIANTS = 3;
 
     // Instance Methods
 
@@ -34,11 +38,11 @@ else if (!(cardA.getTrait(t) == cardB.getTrait(t)) &&
 
     public void createDeck() {
         deck = new ArrayList<>();
-        for (int c = 0; c < 3; c++) {
-            for (int n = 0; n < 3; n++) {
-                for (int s = 0; s < 3; s++) {
-                    for (int f = 0; f < 3; f++) {
-                        deck.add(new Card(c, n, s, f));
+        for (int color = 0; color < NUMBER_OF_TRAIT_VARIANTS; color++) {
+            for (int number = 0; number < NUMBER_OF_TRAIT_VARIANTS; number++) {
+                for (int shape = 0; shape < NUMBER_OF_TRAIT_VARIANTS; shape++) {
+                    for (int fill = 0; fill < NUMBER_OF_TRAIT_VARIANTS; fill++) {
+                        deck.add(new Card(color, number, shape, fill));
                     }
                 }
             }

src/SetGame/SetUI.java

@@ -5,13 +5,27 @@
 import java.util.Random;
 import edu.macalester.graphics.*;
 
+import java.awt.Color;
 
-public class SetUI {
+
+public class SetUI extends GraphicsGroup {
     public ArrayList<Card> board;
     private ArrayList<Card> deck;
 
     private Random rand = new Random();
 
+    private final List<Color> colors = List.of(
+        Color.RED,
+        Color.GREEN,
+        Color.BLUE
+    );
+
+    private final List<Color> halfColors = List.of(
+        new Color(255, 127, 127),
+        new Color(127, 255, 127),
+        new Color(127, 127, 255)
+    );
+
     public SetUI(ArrayList<Card> deck) {
         this.deck = deck;
     }
@@ -42,40 +56,78 @@ void checkBoard() {
 
     // Create Cards
     void createCard(Card card){
-        for (int i = 0; i < card.getTrait(1); i++){
+        // trait 1 is number of
+        for (int i = 0; i < card.getTrait(1); i++) {
+            // trait 2 is shape
             switch (card.getTrait(2)) {
+                // trait 0 is color, trait 3 is fill
                 case 0:
-                    createSquiggle(card.getTrait(0), card.getTrait(3));
+                    add(createTriangle(card.getTrait(0), card.getTrait(3)));
+                    break;
                 case 1:
-                    createDiamond(card.getTrait(0), card.getTrait(3));
+                    add(createDiamond(card.getTrait(0), card.getTrait(3)));
+                    break;
                 case 2:
-                    createOval(card.getTrait(0), card.getTrait(3));
+                    add(createRectangle(card.getTrait(0), card.getTrait(3)));
+                    break;
                 default:
-                    createSquiggle(card.getTrait(0), card.getTrait(3));
+                    add(createTriangle(card.getTrait(0), card.getTrait(3)));
+                    break;
             }
         }
     }
 
+
+    private Color getColorFromInt(int colorInt, int fillInt) {
+        if (fillInt == 1) {
+            return halfColors.get(colorInt);
+        } else if (fillInt == 2) {
+            return colors.get(colorInt);
+        } else {
+            return Color.WHITE;
+        }
+    }
+
     // createShapes
-    void createSquiggle(int color, int fill){
+    private Path createTriangle(int color, int fill){
         // crying
-         
+        Path triangle = Path.makeTriangle(
+            0, 0,
+            10, 10,
+            20, 0
+        );
+        
+        triangle.setFillColor(getColorFromInt(color, fill));
+        triangle.setStrokeColor(colors.get(color));
+
+        return triangle;
     }
 
-    void createDiamond(int color, int fill){
+    private Path createDiamond(int color, int fill){
         // more crying
-        Rectangle diamond
+        Path diamond = new Path(List.of(
+            new Point(0, 5),
+            new Point(10, 10),
+            new Point(20, 5),
+            new Point(10, 0)
+        ));
+        
+        diamond.setFillColor(getColorFromInt(color, fill));
+        diamond.setStrokeColor(colors.get(color));
+
+        return diamond;
     }
 
-    void createOval(int color, int fill){
+    private Rectangle createRectangle(int color, int fill){
         // even more crying
-        Ellipse oval = new Ellipse(x, y, 30, 10);
-        switch (fill) {
-            case 0:
-                oval.setFillColor(fillColor);
+        Rectangle rect = new Rectangle(
+            0, 0,
+            20, 10
+        );
 
-            default:
-                break;
-        }
+        rect.setFillColor(getColorFromInt(color, fill));
+        rect.setStrokeColor(colors.get(color));
+
+        return rect;
     }
 }