folded kinect into main branch

1 files changed, 5 insertions, 4 deletions

diff --git a/liveengineUnmapped/src/layers.cpp b/liveengineUnmapped/src/layers.cpp
index a62f2e6..a0fb213 100755
--- a/liveengineUnmapped/src/layers.cpp
+++ b/liveengineUnmapped/src/layers.cpp
@@ -67,12 +67,13 @@ void svglayer::draw(float a,unsigned char* controllers,int cx,int cy,bool transp
 	for (int i=0;i<6;i++) {

 		//for (int j=(int)((i+1)*layerspercontroller)-1;j>(int)(i*layerspercontroller);j--) {
 		for (int j=(int)(i*layerspercontroller);j<(int)((i+1)*layerspercontroller);j++) {

-			    svg.getPathAt(j).setFillColor(fills[i]*a*controllers[i]); //try to reverse order of these

-			    if (!transparentBlack||((a*controllers[i])/127.0)>0.1) {

-			    svg.getPathAt(j-1).draw(xo,yo);

+			    svg.getPathAt(j).setFillColor(fills[j]*a*(((float)controllers[5-i])/127.0f)); //try to reverse order of these

+			    if (!transparentBlack||((a*controllers[5-i])/127.0f)>0.1) {

+			    svg.getPathAt(j).draw(xo,yo);

 			}

 		}

-	}

+	}
+	//printf("counted %i layers of %i\n",(int)(6*layerspercontroller),svg.getNumPath());

 }