Revision 29:50be685a3f54, committed 2014-12-11

Comitter:

kalbers

Date:

Thu Dec 11 05:26:39 2014 +0000

Parent:

28:42ae7eed0b68

Parent:

25:7a866b3d79bb

Child:

30:3261015fdd17

Commit message:

Commit because this system is stupid.

Changed in this revision

--- a/ledCube.cpp	Thu Dec 11 05:25:03 2014 +0000
+++ b/ledCube.cpp	Thu Dec 11 05:26:39 2014 +0000
@@ -44,7 +44,7 @@
     g = 255*0.1;
     b = 255*0.1;
 
-    brightness = 0.05;
+    brightness = 0.5;
     saturation = 1.0;
     
     ledStrip1.begin();
@@ -84,6 +84,51 @@
 
 void LedCube::updateLEDs(bool on, int size, int x, int y, int z) {
     //Panel 1
+    double bright;
+    bright = 1.0 / ((y + 1) * (y + 1));
+    printf("Panel 1 Brightness: %f\r\n", bright);
+    for(int i = x; i < x + size; i++) {
+        for(int j = z; j < z + size; j++) {
+            int led = getLedIndex(PANEL1, i, j);
+            if(on) {
+                ledStrip1.setPixelColor(led, r*bright, g*bright, b*bright);
+            } else {
+                ledStrip1.setPixelColor(led, 0, 0, 0);
+            }
+        }
+    }
+    
+    //Panel 2
+    bright = 1.0 / (((nCOLs-1) - x - (size-1) + 1) * ((nCOLs-1) - x - (size-1) + 1));
+    printf("Panel 2 Brightness: %f\r\n", bright);
+    for(int i = y; i < y + size; i++) {
+        for(int j = z; j < z + size; j++) {
+            int led = getLedIndex(PANEL2, i, j);
+            if(on) {
+                ledStrip1.setPixelColor(led, r*bright, g*bright, b*bright);
+            } else {
+                ledStrip1.setPixelColor(led, 0, 0, 0);
+            }
+        }
+    }
+    
+    //Panel 3
+    bright = 1.0 / (((nCOLs-1) - z - (size-1) + 1) * ((nCOLs-1) - z - (size-1) + 1));
+    printf("Panel 3 Brightness: %f\r\n", bright);
+    for(int i = x; i < x + size; i++) {
+        for(int j = y; j < y + size; j++) {
+            int led = getLedIndex(PANEL3, i, j);
+            if(on) {
+                ledStrip2.setPixelColor(led, r*bright, g*bright, b*bright);
+            } else {
+                ledStrip2.setPixelColor(led, 0, 0, 0);
+            }
+        }
+    }
+}
+
+void LedCube::updateLEDsOld(bool on, int size, int x, int y, int z) {
+    //Panel 1
     if(y == 0) {
         for(int i = x; i < x + size; i++) {
             for(int j = z; j < z + size; j++) {

--- a/ledCube.h	Thu Dec 11 05:25:03 2014 +0000
+++ b/ledCube.h	Thu Dec 11 05:26:39 2014 +0000
@@ -11,6 +11,7 @@
         void Init(int x, int y, int z);
         int getLedIndex(int panel, int x, int y);
         void updateLEDs(bool on, int size, int x, int y, int z);
+        void updateLEDsOld(bool on, int size, int x, int y, int z);
         void cubeUpdate();
         int move(int deltaX, int deltaY, int deltaZ);
         void changeColor(float hue);