[Picross-commit] SF.net SVN: picross: [86] trunk

[<yva...@us...>]

Revision: 86
          http://picross.svn.sourceforge.net/picross/?rev=86&view=rev
Author:   yvan_norsa
Date:     2008-05-14 05:50:47 -0700 (Wed, 14 May 2008)

Log Message:
-----------
support for more XBM files

Modified Paths:
--------------
    trunk/data/contents.txt
    trunk/src/picross/game/simple/XBMModel.java

Added Paths:
-----------
    trunk/data/bitrabbit.xbm

Added: trunk/data/bitrabbit.xbm
===================================================================
--- trunk/data/bitrabbit.xbm	                        (rev 0)
+++ trunk/data/bitrabbit.xbm	2008-05-14 12:50:47 UTC (rev 86)
@@ -0,0 +1,7 @@
+#define bitrabbit_width 19
+#define bitrabbit_height 14
+static unsigned char bitrabbit_bits[] = {
+   0x60, 0x00, 0x00, 0xe0, 0x00, 0x00, 0xe0, 0x00, 0x00, 0xe0, 0x00, 0x00,
+   0xe0, 0x00, 0x00, 0xf8, 0x00, 0x00, 0xfe, 0x78, 0x00, 0xf7, 0xfe, 0x00,
+   0xff, 0xff, 0x02, 0xfe, 0xff, 0x07, 0xf8, 0xff, 0x07, 0xf8, 0xff, 0x07,
+   0xfe, 0xff, 0x07, 0xff, 0xff, 0x03 };

Modified: trunk/data/contents.txt
===================================================================
--- trunk/data/contents.txt	2008-05-14 08:55:22 UTC (rev 85)
+++ trunk/data/contents.txt	2008-05-14 12:50:47 UTC (rev 86)
@@ -2,6 +2,7 @@
 asterix.xbm : 16x16
 audio.xbm : 32x32
 batman2.xbm : 32x32
+bitrabbit.xbm : 19x14
 bunny.xbm : 16x16
 halloween.xbm : 16x16
 squares.xbm : 16x16

Modified: trunk/src/picross/game/simple/XBMModel.java
===================================================================
--- trunk/src/picross/game/simple/XBMModel.java	2008-05-14 08:55:22 UTC (rev 85)
+++ trunk/src/picross/game/simple/XBMModel.java	2008-05-14 12:50:47 UTC (rev 86)
@@ -199,9 +199,8 @@
 
         for (String byteStr : byteValues) {
             String binaryStr = XBMModel.toBits(byteStr);
+            //XBMModel.log.debug("binaryStr : "  + binaryStr);
 
-            //XBMModel.log.debug(binaryStr);
-
             for (int j = XBMModel.BYTE_LENGTH - 1; j >= 0; j--) {
                 //XBMModel.log.debug("this.data[" + yIndex
                 //+ "][" + xIndex + "] = "
@@ -214,11 +213,16 @@
                 if (yIndex == this.width) {
                     xIndex++;
                     yIndex = 0;
+
+                    break;
                 }
 
+                // Useless ?
+                /*
                 if (xIndex == this.height) {
                     xIndex = 0;
                 }
+                */
             }
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.