From ff1f068e4a541681ab46d6fa2e1305ac72a63f91 Mon Sep 17 00:00:00 2001
From: Size43
Date: Thu, 23 Apr 2015 16:30:39 +0200
Subject: BoardLoader added

---
 .../java/com/camilstaps/rushhour/BoardLoader.java  | 47 ++++++++++++++++++++++
 .../camilstaps/rushhour/FullscreenActivity.java    | 33 +++++++++------
 2 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100755 app/src/main/java/com/camilstaps/rushhour/BoardLoader.java
 mode change 100644 => 100755 app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java

(limited to 'app/src/main/java/com/camilstaps')

diff --git a/app/src/main/java/com/camilstaps/rushhour/BoardLoader.java b/app/src/main/java/com/camilstaps/rushhour/BoardLoader.java
new file mode 100755
index 0000000..9285306
--- /dev/null
+++ b/app/src/main/java/com/camilstaps/rushhour/BoardLoader.java
@@ -0,0 +1,47 @@
+package com.camilstaps.rushhour;
+
+import android.graphics.Color;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Scanner;
+
+/**
+ * Created by Jos on 23-4-2015.
+ */
+public class BoardLoader {
+    public BoardLoader()
+    {}
+
+    public Board loadBoard(InputStream file)
+    {
+        Scanner scan = new Scanner(file);
+
+        Board board = new Board();
+
+        int numCars = scan.nextInt();
+        scan.nextLine();
+
+        for(int carN = 0; carN < numCars; carN++)
+        {
+            int x1 = scan.nextInt();
+            int y1 = scan.nextInt();
+            int x2 = scan.nextInt();
+            int y2 = scan.nextInt();
+            scan.nextLine();
+
+            int r = scan.nextInt();
+            int g = scan.nextInt();
+            int b = scan.nextInt();
+
+            Car c = new Car(new Coordinate(x1, y1), new Coordinate(x2, y2), Color.rgb(r, g, b));
+            board.add(c);
+
+            if(scan.hasNext()) scan.nextLine();
+        }
+
+        return board;
+    }
+}
diff --git a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
old mode 100644
new mode 100755
index 495c996..b39cddc
--- a/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
+++ b/app/src/main/java/com/camilstaps/rushhour/FullscreenActivity.java
@@ -13,6 +13,9 @@ import android.widget.RelativeLayout;
 
 import com.camilstaps.rushhour.util.SystemUiHider;
 
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.
  * status bar and navigation/system bar) with user interaction.
@@ -31,19 +34,23 @@ public class FullscreenActivity extends Activity {
 
         setContentView(R.layout.activity_fullscreen);
 
-        final Board board = new Board();
-        board.add(new Car(new Coordinate(0,0), new Coordinate(2,0), Color.YELLOW));
-        board.add(new Car(new Coordinate(3,0), new Coordinate(3,1), Color.rgb(128,223,182)));
-        board.add(new Car(new Coordinate(4,0), new Coordinate(4,2), Color.rgb(198, 134,221)));
-        board.add(new Car(new Coordinate(0,2), new Coordinate(1,2), Color.RED));
-        board.add(new Car(new Coordinate(5,2), new Coordinate(5,3), Color.rgb(255,165,0)));
-        board.add(new Car(new Coordinate(0,3), new Coordinate(0,4), Color.rgb(158,231,246)));
-        board.add(new Car(new Coordinate(1,3), new Coordinate(2,3), Color.rgb(245,158,246)));
-        board.add(new Car(new Coordinate(3,3), new Coordinate(4,3), Color.rgb(150,126,196)));
-        board.add(new Car(new Coordinate(1,4), new Coordinate(2,4), Color.GREEN));
-        board.add(new Car(new Coordinate(3,4), new Coordinate(3,5), Color.BLACK));
-        board.add(new Car(new Coordinate(5,4), new Coordinate(5,5), Color.rgb(219,202,161)));
-        board.add(new Car(new Coordinate(0,5), new Coordinate(2,5), Color.rgb(25,195,167)));
+        InputStream input = getResources().openRawResource(R.raw.level);
+
+        BoardLoader loader = new BoardLoader();
+        final Board board = loader.loadBoard(input);
+        //final Board board = new Board();
+//        board.add(new Car(new Coordinate(0,0), new Coordinate(2,0), Color.YELLOW));
+//        board.add(new Car(new Coordinate(3,0), new Coordinate(3,1), Color.rgb(128,223,182)));
+//        board.add(new Car(new Coordinate(4,0), new Coordinate(4,2), Color.rgb(198, 134,221)));
+//        board.add(new Car(new Coordinate(0,2), new Coordinate(1,2), Color.RED));
+//        board.add(new Car(new Coordinate(5,2), new Coordinate(5,3), Color.rgb(255,165,0)));
+//        board.add(new Car(new Coordinate(0,3), new Coordinate(0,4), Color.rgb(158,231,246)));
+//        board.add(new Car(new Coordinate(1,3), new Coordinate(2,3), Color.rgb(245,158,246)));
+//        board.add(new Car(new Coordinate(3,3), new Coordinate(4,3), Color.rgb(150,126,196)));
+//        board.add(new Car(new Coordinate(1,4), new Coordinate(2,4), Color.GREEN));
+//        board.add(new Car(new Coordinate(3,4), new Coordinate(3,5), Color.BLACK));
+//        board.add(new Car(new Coordinate(5,4), new Coordinate(5,5), Color.rgb(219,202,161)));
+//        board.add(new Car(new Coordinate(0,5), new Coordinate(2,5), Color.rgb(25,195,167)));
 
         soundPool = new SoundPool(2, AudioManager.STREAM_MUSIC, 0);
         soundPool.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
-- 
cgit v1.2.3