From 7af35b4f1cb902bbcb29247b459461e9da494872 Mon Sep 17 00:00:00 2001 From: Liam Brennan Date: Mon, 12 Nov 2018 12:49:11 +1100 Subject: [PATCH 1/2] made grid bigger --- scripts/mac_run.sh | 2 +- src/computerblocks/Game.java | 2 +- src/computerblocks/Grid.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/mac_run.sh b/scripts/mac_run.sh index 87df6b0..ae7000b 100755 --- a/scripts/mac_run.sh +++ b/scripts/mac_run.sh @@ -1,6 +1,6 @@ cd src/ javac -cp '.:lib/json.jar' $1.java if [[ $? == 0 ]]; then - java -cp '.:lib/json.jar' $1 + java -Dsun.java2d.opengl=true -cp '.:lib/json.jar' $1 fi find . -name "*.class" -type f -delete diff --git a/src/computerblocks/Game.java b/src/computerblocks/Game.java index b562d8a..a911ba5 100644 --- a/src/computerblocks/Game.java +++ b/src/computerblocks/Game.java @@ -70,7 +70,7 @@ private void loop() { } private void setup() { - grid = new Grid(300, 300, 3); + grid = new Grid(400, 400, 3); player = new Player(display, this); ui = new UserInterface(); snippetTray = new SnippetTray(display); diff --git a/src/computerblocks/Grid.java b/src/computerblocks/Grid.java index 8c61bc0..5f133e9 100644 --- a/src/computerblocks/Grid.java +++ b/src/computerblocks/Grid.java @@ -216,6 +216,6 @@ public void propagate(Block source, Display display, Player player) { updateQueue = nextUpdateQueue; } - // System.out.println("iters: " + iterations); + System.out.println("iters: " + iterations); } } From 300e5f95a08eef4e602e57364a2f8db0ed6d45d7 Mon Sep 17 00:00:00 2001 From: jkbriant <36391639+jkbriant@users.noreply.github.com> Date: Mon, 12 Nov 2018 15:59:09 +1100 Subject: [PATCH 2/2] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 28cb983..4a9ce08 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,6 @@ It is developed by Joshua Briant and Liam Brennan, two high school students from We hope this tool can eventually be put to use for both educational and recreational purposes. One way we would like to achieve this is through documenting the entire process to building a 10-bit computer. If you would like any more information it can be accessed from our website https://www.computerblocks.com. +Also check out what's coming next at https://trello.com/b/kMgKFAj1/computer-blocks. -build jar with `jar cfm computerblocks.jar manifest.mf $(find . -type f -name "*.class")` \ No newline at end of file +build jar with `jar cfm computerblocks.jar manifest.mf $(find . -type f -name "*.class")`