From c1c24bdf3b81532a07b2d075bcf91a4d7acad433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 5 Mar 2015 23:37:16 +0100
Subject: [PATCH] add 2D image support

---
 .../processing/pic2serialpy/pic2serialpy.pyde     |  12 ++++++------
 v2/backend/processing/pic2serialpy/test3.png      | Bin 0 -> 169 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 v2/backend/processing/pic2serialpy/test3.png

diff --git a/v2/backend/processing/pic2serialpy/pic2serialpy.pyde b/v2/backend/processing/pic2serialpy/pic2serialpy.pyde
index 8b119ad..03533d8 100644
--- a/v2/backend/processing/pic2serialpy/pic2serialpy.pyde
+++ b/v2/backend/processing/pic2serialpy/pic2serialpy.pyde
@@ -6,9 +6,8 @@ import jarray
 gamma = 1.7
 
 framerate = 0.0
-brightness = 4
+brightness = 12
 errorCount = 0
-gammatable = [0 for i in range(0, 256)]
 s = None
 img = None
 ledSerial = None
@@ -26,11 +25,12 @@ def setup():
     gammatable = [math.pow(i / 255.0, gamma) * 255.0 + 0.5 for i in range(0, 256)]
     
     size(40, 1)
-    img = loadImage("test2.png")
+    img = loadImage("test3.png")
 
 def image2data(data):
-    offset = 0
-    for x in range(0, img.width):
+    offset = 3
+    dimension = img.width * img.height
+    for x in xrange(0, dimension, 1):
         pixel = [colorWiring(img.pixels[x]) for i in range(0, 8)]
         imgmask = 0x800000
         while imgmask != 0:
@@ -85,7 +85,7 @@ def serialConfigure(portName):
 def draw():
     global img
     image(img, 0, 0)
-    data = jarray.zeros(img.width * 24 + 3, "b")
+    data = jarray.zeros(img.width * img.height * 24 + 3, "b")
     image2data(data)
     data[0] = ord('*')
     framerate = 30.0
diff --git a/v2/backend/processing/pic2serialpy/test3.png b/v2/backend/processing/pic2serialpy/test3.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e3903601f7c90ff909268c28da25e0ee484fe26
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^96-#<!2~3~f3^ZqoCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#J~OMBg2chbw|zh%$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3<Y;j-+=H&K5?KT
zWltB!5RU7~KjaTFuory$|Np;a2kU?52_{AhHYFb5pI!Jrlp)-ghgUMk{3%d5gQu&X
J%Q~loCIGjtE~@|l

literal 0
HcmV?d00001