various

4 files changed, 38 insertions, 3 deletions

diff --git a/config.make b/config.make
index 85e8c5d..40ff504 100755
--- a/config.make
+++ b/config.make
@@ -17,7 +17,7 @@ USER_CFLAGS = -std=c++11
 # for example libraries like:
 # USER_LDFLAGS = libs/libawesomelib.a
 
-USER_LDFLAGS = -lX11
+USER_LDFLAGS = -lX11 -lvamp-hostsdk -lsndfile
 
 
 EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj"
diff --git a/notes.txt b/notes.txt
index b825b8b..ee38915 100755
--- a/notes.txt
+++ b/notes.txt
@@ -26,6 +26,19 @@ control - overall brightness
 start with dunks app as a template

 

 -------------------------------------

+

+a way of creating palettes and cycling through them - drag and drop

+several ways of drawing- 

+	music vis, 

+	drawing by hand and having the strokes record + repeat

+	kinect?

+expression of the seed number - 

+	phase, frequency, offset

+	colour effect

+	rotation of scrolling feedback effects

+

+--------------------------------------

+

 draw a number of viewports

 pass the same parameters to each

 they each interpret in a slightly different way

@@ -49,7 +62,7 @@ fade value
 phase offset affect scroll angle

 

 onset randomise phase

-retain palettes

+retain palettes ---> load palettes into windows

 

 no fill option

 

diff --git a/src/testApp.cpp b/src/testApp.cpp
index 18e7255..72762ce 100755
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -46,14 +46,29 @@ void guiWindow::dragEvent(ofDragInfo dragInfo, ofxFenster* win){
     parent->dragEvent(dragInfo);
 }
 //--------------------------------------------------------------
+void testApp::backupPalettes(){
+	backups.clear();
+	if (viewports.size()){
+		for (int i=0;i<viewports.size();i++){
+			backups.push_back(viewports[i].Palette);
+		}
+	}
+}
+void testApp::restorePalettes(){
+	for (int i=0;i<viewports.size();i++){
+		viewports[i].Palette=backups[i%backups.size()];
+	}
+}
 void testApp::create1port(bool & pressed){
 	if (!pressed) return;
+	backupPalettes();	
 	viewports.clear();
 	viewports.push_back(viewport(4*windowsize,2*windowsize,0,0,0));
 	createports(1);
 }
 void testApp::create2port(bool & pressed){
 	if (!pressed) return;
+	backupPalettes();
 	viewports.clear();
 	viewports.push_back(viewport(2*windowsize,2*windowsize,0,0,0));
 	viewports.push_back(viewport(2*windowsize,2*windowsize,2*windowsize,0,1));
@@ -61,16 +76,17 @@ void testApp::create2port(bool & pressed){
 }
 void testApp::create4port(bool & pressed){
 	if (!pressed) return;
+	backupPalettes();
 	viewports.clear();
 	viewports.push_back(viewport(windowsize,2*windowsize,0,0,0));
 	viewports.push_back(viewport(windowsize,2*windowsize,windowsize,0,1));
 	viewports.push_back(viewport(windowsize,2*windowsize,2*windowsize,0,2));
 	viewports.push_back(viewport(windowsize,2*windowsize,3*windowsize,0,3));
-	
 	createports(4);
 }
 void testApp::create8port(bool & pressed){
 	if (!pressed) return;
+	backupPalettes();
 	viewports.clear();
 	viewports.push_back(viewport(windowsize,windowsize,0,0,0));
 	viewports.push_back(viewport(windowsize,windowsize,(1*windowsize),0,1));
@@ -83,6 +99,7 @@ void testApp::create8port(bool & pressed){
 	createports(8);
 }
 void testApp::createports(int num){
+	restorePalettes();
 	cerr<<"created "<<num<<" ports"<<endl;
 }
 //--------------------------------------------------------------
diff --git a/src/testApp.h b/src/testApp.h
index 780bdc2..037cbf7 100755
--- a/src/testApp.h
+++ b/src/testApp.h
@@ -5,6 +5,7 @@
 #include "ofxFensterManager.h"
 #include "ofxGui.h"
 
+#include "ofxVamphost.h"
 #include "viewport.h"
 
 
@@ -87,6 +88,10 @@ class testApp : public ofxFensterListener {
 		void create8port(bool & pressed);
 		void createports(int num);
 
+		void backupPalettes();
+		void restorePalettes();
+
+		vector<palette> backups;
 		vector<viewport> viewports;
 		vpcontrol control;
 		int previewscale;