diff --git a/MathMind/MathMind.cs b/MathMind/MathMind.cs index a01639b..709920f 100644 --- a/MathMind/MathMind.cs +++ b/MathMind/MathMind.cs @@ -43,14 +43,28 @@ public override void Setup() { // Load up the list of images. mImageNames = LoadImageIndex(); - // Loop through all the cubes and set them up. + // Load up the list of games. + ArrayList mGame1 = new ArrayList ("8", "plus", "7", "mult", "3", "res29"); + ArrayList mGame2 = new ArrayList ("6", "mult", "7", "mult", "2", "res84"); + ArrayList mGame3 = new ArrayList ("4", "mult", "5", "minus", "2", "res18"); + ArrayList mGame4 = new ArrayList ("6", "plus", "4", "mult", "8", "res38"); + ArrayList mGame5 = new ArrayList ("9", "mult", "7", "div", "3", "res21"); + ArrayList mGame6 = new ArrayList ("5", "mult", "7", "plus", "8", "res43"); + ArrayList mGame7 = new ArrayList ("6", "div", "2", "mult", "4", "res12"); + ArrayList mGame8 = new ArrayList ("5", "div", "1", "plus", "9", "res14"); + ArrayList mGame9 = new ArrayList ("3", "mult", "8", "mult", "4", "res96"); + + ArrayList mGamesArray = new ArrayList (mGame1, mGame2, mGame3, mGame4, mGame5, mGame6, mGame7, mGame8, mGame9); + + int cnt = 0; foreach (Cube cube in CubeSet) { // Create a wrapper object for each cube. The wrapper object allows us // to bundle a cube with extra information and behavior. CubeWrapper wrapper = new CubeWrapper(this, cube, 'o'); mWrappers.Add(wrapper); // add wrapper including individual cube into wrapper-list - wrapper.DrawSlide(); + wrapper.DrawSlide(mGame1[cnt][0]); + cnt++; } @@ -137,7 +151,7 @@ private void OnNeighborAdd(Cube cube1, Cube.Side side1, Cube cube2, Cube.Side si } - + //TODO: Siegüberprüfung: Cube[] row = CubeHelper.FindRow(CubeSet); if (row.Length == totalCubes) { Log.Debug ("6 connected"); @@ -413,7 +427,7 @@ private void OnFlip(Cube cube, bool newOrientationIsUp) { // This method draws the current image to the cube's display. The // Cube.Image method has a lot of arguments, but many of them are optional // and have reasonable default values. - public void DrawSlide() { + public void DrawSlide(String name=this.mApp.mImageNames[this.mIndex]) { // Here we specify the name of the image to draw, in this case by pulling // it from the array of names we read out of the image set (see @@ -425,7 +439,7 @@ public void DrawSlide() { // // If you specify an image name that is not in the index, the Image call // will be ignored. - String imageName = this.mApp.mImageNames[this.mIndex]; + String imageName = name; // You can specify the top/left point on the screen to start drawing at. int screenX = mXOffset; diff --git a/assets/images/0.png b/assets/images/0.png index 3d9efe6..265b5ca 100755 Binary files a/assets/images/0.png and b/assets/images/0.png differ diff --git a/assets/images/1.png b/assets/images/1.png index f34229d..341e27c 100755 Binary files a/assets/images/1.png and b/assets/images/1.png differ diff --git a/assets/images/2.png b/assets/images/2.png index 34e5a2c..98b7fdd 100755 Binary files a/assets/images/2.png and b/assets/images/2.png differ diff --git a/assets/images/3.png b/assets/images/3.png index 580dcaf..2ccd816 100755 Binary files a/assets/images/3.png and b/assets/images/3.png differ diff --git a/assets/images/4.png b/assets/images/4.png index db3cb2f..f711cfc 100755 Binary files a/assets/images/4.png and b/assets/images/4.png differ diff --git a/assets/images/5.png b/assets/images/5.png index bb1acbe..928a1f8 100755 Binary files a/assets/images/5.png and b/assets/images/5.png differ diff --git a/assets/images/6.png b/assets/images/6.png index 74cf7d8..c72e7d2 100755 Binary files a/assets/images/6.png and b/assets/images/6.png differ diff --git a/assets/images/7.png b/assets/images/7.png index d80c50a..e114e00 100755 Binary files a/assets/images/7.png and b/assets/images/7.png differ diff --git a/assets/images/8.png b/assets/images/8.png index 2647196..145d1ff 100755 Binary files a/assets/images/8.png and b/assets/images/8.png differ diff --git a/assets/images/9.png b/assets/images/9.png index 59f3ccc..9c2fe28 100755 Binary files a/assets/images/9.png and b/assets/images/9.png differ diff --git a/assets/images/div.png b/assets/images/div.png index ddc47b6..5e98b58 100755 Binary files a/assets/images/div.png and b/assets/images/div.png differ diff --git a/assets/images/images.sftbndl b/assets/images/images.sftbndl index a6082d6..de3a884 100644 Binary files a/assets/images/images.sftbndl and b/assets/images/images.sftbndl differ diff --git a/assets/images/images_siftbndl_index.txt b/assets/images/images_siftbndl_index.txt index 1d5a7b6..1ba0b9b 100644 --- a/assets/images/images_siftbndl_index.txt +++ b/assets/images/images_siftbndl_index.txt @@ -8,12 +8,25 @@ 7 8 9 -add div -mul -res1 -res2 -res3 -rev1 -rev2 -sub +minus +mult +plus +res12 +res14 +res18 +res21 +res29 +res38 +res43 +res84 +res96 +rev12 +rev21 +rev34 +rev41 +rev48 +rev69 +rev81 +rev83 +rev92 diff --git a/assets/images/add.png b/assets/images/minus.png similarity index 81% rename from assets/images/add.png rename to assets/images/minus.png index 7212077..47df1e4 100755 Binary files a/assets/images/add.png and b/assets/images/minus.png differ diff --git a/assets/images/mul.png b/assets/images/mult.png similarity index 71% rename from assets/images/mul.png rename to assets/images/mult.png index 40a47e5..941a112 100755 Binary files a/assets/images/mul.png and b/assets/images/mult.png differ diff --git a/assets/images/sub.png b/assets/images/plus.png similarity index 80% rename from assets/images/sub.png rename to assets/images/plus.png index a7681e3..25e869e 100755 Binary files a/assets/images/sub.png and b/assets/images/plus.png differ diff --git a/assets/images/res12.png b/assets/images/res12.png new file mode 100755 index 0000000..63c2bbd Binary files /dev/null and b/assets/images/res12.png differ diff --git a/assets/images/res14.png b/assets/images/res14.png new file mode 100755 index 0000000..f0a1852 Binary files /dev/null and b/assets/images/res14.png differ diff --git a/assets/images/res18.png b/assets/images/res18.png new file mode 100755 index 0000000..1323f05 Binary files /dev/null and b/assets/images/res18.png differ diff --git a/assets/images/res2.png b/assets/images/res21.png similarity index 65% rename from assets/images/res2.png rename to assets/images/res21.png index 592c95b..121817f 100755 Binary files a/assets/images/res2.png and b/assets/images/res21.png differ diff --git a/assets/images/res29.png b/assets/images/res29.png new file mode 100755 index 0000000..d998af9 Binary files /dev/null and b/assets/images/res29.png differ diff --git a/assets/images/res38.png b/assets/images/res38.png new file mode 100755 index 0000000..3ddd07e Binary files /dev/null and b/assets/images/res38.png differ diff --git a/assets/images/res43.png b/assets/images/res43.png new file mode 100755 index 0000000..fd67ab3 Binary files /dev/null and b/assets/images/res43.png differ diff --git a/assets/images/res84.png b/assets/images/res84.png new file mode 100755 index 0000000..517481c Binary files /dev/null and b/assets/images/res84.png differ diff --git a/assets/images/res1.png b/assets/images/res96.png similarity index 67% rename from assets/images/res1.png rename to assets/images/res96.png index 265e334..22c82aa 100755 Binary files a/assets/images/res1.png and b/assets/images/res96.png differ diff --git a/assets/images/rev1.png b/assets/images/rev1.png deleted file mode 100755 index e980762..0000000 Binary files a/assets/images/rev1.png and /dev/null differ diff --git a/assets/images/rev12.png b/assets/images/rev12.png new file mode 100755 index 0000000..63c2bbd Binary files /dev/null and b/assets/images/rev12.png differ diff --git a/assets/images/rev2.png b/assets/images/rev2.png deleted file mode 100755 index 77b6dd4..0000000 Binary files a/assets/images/rev2.png and /dev/null differ diff --git a/assets/images/rev21.png b/assets/images/rev21.png new file mode 100755 index 0000000..121817f Binary files /dev/null and b/assets/images/rev21.png differ diff --git a/assets/images/rev34.png b/assets/images/rev34.png new file mode 100755 index 0000000..9cf5d43 Binary files /dev/null and b/assets/images/rev34.png differ diff --git a/assets/images/res3.png b/assets/images/rev41.png similarity index 68% rename from assets/images/res3.png rename to assets/images/rev41.png index ba178dd..bdfa3c5 100755 Binary files a/assets/images/res3.png and b/assets/images/rev41.png differ diff --git a/assets/images/rev48.png b/assets/images/rev48.png new file mode 100755 index 0000000..4f9de06 Binary files /dev/null and b/assets/images/rev48.png differ diff --git a/assets/images/rev69.png b/assets/images/rev69.png new file mode 100755 index 0000000..1013712 Binary files /dev/null and b/assets/images/rev69.png differ diff --git a/assets/images/rev81.png b/assets/images/rev81.png new file mode 100755 index 0000000..71c6458 Binary files /dev/null and b/assets/images/rev81.png differ diff --git a/assets/images/rev83.png b/assets/images/rev83.png new file mode 100755 index 0000000..77a77a5 Binary files /dev/null and b/assets/images/rev83.png differ diff --git a/assets/images/rev92.png b/assets/images/rev92.png new file mode 100755 index 0000000..f663f64 Binary files /dev/null and b/assets/images/rev92.png differ