diff options
| -rwxr-xr-x | liveengineUnmapped/src/layers.cpp | 8 | ||||
| -rwxr-xr-x | liveengineUnmapped/src/testApp.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/liveengineUnmapped/src/layers.cpp b/liveengineUnmapped/src/layers.cpp index 36f9b14..a62f2e6 100755 --- a/liveengineUnmapped/src/layers.cpp +++ b/liveengineUnmapped/src/layers.cpp @@ -65,10 +65,11 @@ void svglayer::draw(float a,unsigned char* controllers,int cx,int cy,bool transp float layerspercontroller=((float)svg.getNumPath())/6.0f;
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]);
+ 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).draw(xo,yo);
+ svg.getPathAt(j-1).draw(xo,yo);
}
}
}
@@ -98,6 +99,7 @@ void imglayer::load(string _filename,int _frames,int _start,float _rate,int n, i void imglayer::draw(float a,int cx,int cy,float colShift) { //if (sprite.isAllocated()) if (!sprite.isUsingTexture()) sprite.setUseTexture(true); //has to be done from the main thread? still doesn't work
+ sprite.update();
int x,y,w,h;
if ((((float)cx)/cy)<(((float)sprite.getWidth())/sprite.getHeight())){
@@ -129,7 +131,7 @@ void imglayer::setNote(int note) if (!sprite.getIsPlaying()) {
sprite.play();
-
+
} //printf("triggered frame %i of %i\n",(int)(((((float)note-startNote)/((float)endNote-startNote)))*sprite.getTotalFrames()),sprite.getTotalFrames());
sprite.setCurrentFrame((int)(((((float)note-startNote)/((float)endNote-startNote)))*sprite.getTotalFrames()));
diff --git a/liveengineUnmapped/src/testApp.cpp b/liveengineUnmapped/src/testApp.cpp index c6fb94e..1885bb2 100755 --- a/liveengineUnmapped/src/testApp.cpp +++ b/liveengineUnmapped/src/testApp.cpp @@ -532,7 +532,7 @@ void testApp::nmidiMessage(int event,int data1, int data2) { if (noteRandomiseColours) { makeColours(); // } - randOffs=ofRandom(1.0f);
+ randOffs=ofRandom(100.0f);
break;
case 176: //control change channel 0
//for (int i=0;i<numLayers;i++){
|