From d503992380630c1ee6d2edce8861d5f6e31cf8a1 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@getdrop.com>
Date: Sat, 18 Aug 2018 12:09:34 +0100
Subject: start vector plugin arch

---
 gui/libs/ofxAChaosLib/src/AChaosBaker.h             |  2 ++
 gui/libs/ofxAChaosLib/src/AChaosBase.h              | 15 +++++++++++----
 gui/libs/ofxAChaosLib/src/AChaosClifford.h          |  1 +
 gui/libs/ofxAChaosLib/src/AChaosCollatz.h           |  1 +
 gui/libs/ofxAChaosLib/src/AChaosDuffing.h           |  1 +
 gui/libs/ofxAChaosLib/src/AChaosGinger.h            |  1 +
 gui/libs/ofxAChaosLib/src/AChaosHenon.h             |  1 +
 gui/libs/ofxAChaosLib/src/AChaosHenonF.h            |  1 +
 gui/libs/ofxAChaosLib/src/AChaosHenonHeilles.h      |  1 +
 gui/libs/ofxAChaosLib/src/AChaosHenonPhase.h        |  1 +
 gui/libs/ofxAChaosLib/src/AChaosIkeda.h             |  1 +
 gui/libs/ofxAChaosLib/src/AChaosJong.h              |  1 +
 gui/libs/ofxAChaosLib/src/AChaosLogistic.h          |  1 +
 gui/libs/ofxAChaosLib/src/AChaosLogistic1.h         |  1 +
 gui/libs/ofxAChaosLib/src/AChaosLorenz.h            |  1 +
 gui/libs/ofxAChaosLib/src/AChaosLorenzEuler.h       |  3 ++-
 gui/libs/ofxAChaosLib/src/AChaosLyapunov.h          |  1 +
 gui/libs/ofxAChaosLib/src/AChaosNavierStokes.h      |  1 +
 gui/libs/ofxAChaosLib/src/AChaosNavierStokesEuler.h |  1 +
 gui/libs/ofxAChaosLib/src/AChaosRossler.h           |  1 +
 gui/libs/ofxAChaosLib/src/AChaosStein.h             |  1 +
 gui/libs/ofxAChaosLib/src/AChaosStein1.h            |  1 +
 gui/libs/ofxAChaosLib/src/AChaosTorus.h             |  1 +
 gui/libs/ofxAChaosLib/src/AChaosVerhulst.h          |  1 +
 24 files changed, 36 insertions(+), 5 deletions(-)

(limited to 'gui/libs/ofxAChaosLib/src')

diff --git a/gui/libs/ofxAChaosLib/src/AChaosBaker.h b/gui/libs/ofxAChaosLib/src/AChaosBaker.h
index c0586c3..8c5175a 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosBaker.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosBaker.h
@@ -19,6 +19,8 @@ public:
 	~AChaosBaker(){}	
 
 	vector<string> param_labels={"","init"};
+	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 		AChaosBase::init(params, 2, 1);
diff --git a/gui/libs/ofxAChaosLib/src/AChaosBase.h b/gui/libs/ofxAChaosLib/src/AChaosBase.h
index 2a8b1d0..b6ef5e3 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosBase.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosBase.h
@@ -8,9 +8,15 @@
 #pragma once
 
 // comment for 64bits version (not all objects support)
-#define ACHAOS32
+#define ACHAOS_parameters	
 
-#ifdef ACHAOS32
+#ifdef ACHAOS_paramaters
+#include "ofMain.h"
+	typedef ofParameter<float> REAL
+	#define SIN sin
+	#define COS cos
+
+#elif ACHAOS32
 // 32bit	
 	typedef float REAL;
 	#define SIN sinf
@@ -32,10 +38,11 @@ public:
 	~AChaosBase(){}	
 
 	vector<REAL> iv;	
-	vector<REAL> ov;
+	vector<REAL> ov;	
+
 	virtual void setup(REAL * params = NULL)=0;
 
-	vector<string> param_labels;
+	virtual vector<string> &get_param_labels()=0;
 
 	void init(REAL * params = NULL, int numiv=1, int numov=1){
 		iv.clear();
diff --git a/gui/libs/ofxAChaosLib/src/AChaosClifford.h b/gui/libs/ofxAChaosLib/src/AChaosClifford.h
index 1bee069..ab52473 100755
--- a/gui/libs/ofxAChaosLib/src/AChaosClifford.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosClifford.h
@@ -19,6 +19,7 @@ public:
 	~AChaosClifford(){}	
 
 	vector<string> param_labels={"a","b","c","d","",""};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 
diff --git a/gui/libs/ofxAChaosLib/src/AChaosCollatz.h b/gui/libs/ofxAChaosLib/src/AChaosCollatz.h
index f57d7b7..d7b1c00 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosCollatz.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosCollatz.h
@@ -20,6 +20,7 @@ public:
 	~AChaosCollatz(){}	
 
 	vector<string> param_labels={"","offset"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 		AChaosBase::init(params, 3, 1);
diff --git a/gui/libs/ofxAChaosLib/src/AChaosDuffing.h b/gui/libs/ofxAChaosLib/src/AChaosDuffing.h
index 338c324..f94b638 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosDuffing.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosDuffing.h
@@ -17,6 +17,7 @@ public:
 	~AChaosDuffing(){}	
 
 	vector<string> param_labels={"a","b","w","t","dt","",""};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosGinger.h b/gui/libs/ofxAChaosLib/src/AChaosGinger.h
index 53a1be2..f18094c 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosGinger.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosGinger.h
@@ -17,6 +17,7 @@ public:
 	~AChaosGinger(){}	
 
 	vector<string> param_labels={"seed","",""};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosHenon.h b/gui/libs/ofxAChaosLib/src/AChaosHenon.h
index cd42d8d..929a354 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosHenon.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosHenon.h
@@ -17,6 +17,7 @@ public:
 	
 	AChaosHenon(){}
 	~AChaosHenon(){}	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 		AChaosBase::init(params, 4,2);
diff --git a/gui/libs/ofxAChaosLib/src/AChaosHenonF.h b/gui/libs/ofxAChaosLib/src/AChaosHenonF.h
index 384a6ab..d2a1c5a 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosHenonF.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosHenonF.h
@@ -18,6 +18,7 @@ public:
 
 		vector<string> param_labels={"a","b","","","dt","t"};
 
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 		AChaosBase::init(params, 5,2);
diff --git a/gui/libs/ofxAChaosLib/src/AChaosHenonHeilles.h b/gui/libs/ofxAChaosLib/src/AChaosHenonHeilles.h
index c1aeb98..6638474 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosHenonHeilles.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosHenonHeilles.h
@@ -17,6 +17,7 @@ public:
 	~AChaosHenonHeilles(){}	
 
 	vector<string> param_labels={"","","","","e","dt"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosHenonPhase.h b/gui/libs/ofxAChaosLib/src/AChaosHenonPhase.h
index b5ffc42..02dec0f 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosHenonPhase.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosHenonPhase.h
@@ -17,6 +17,7 @@ public:
 	~AChaosHenonPhase(){}	
 
 	vector<string> param_labels={"a","b","","","dt","t"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosIkeda.h b/gui/libs/ofxAChaosLib/src/AChaosIkeda.h
index 105271b..50e5b10 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosIkeda.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosIkeda.h
@@ -17,6 +17,7 @@ public:
 	~AChaosIkeda(){}	
 
 	vector<string> param_labels={"a","b","k","p","",""};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosJong.h b/gui/libs/ofxAChaosLib/src/AChaosJong.h
index 6fe0f2b..f1fca64 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosJong.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosJong.h
@@ -18,6 +18,7 @@ public:
 
 	AChaosJong(){}
 	~AChaosJong(){}	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosLogistic.h b/gui/libs/ofxAChaosLib/src/AChaosLogistic.h
index c54cebd..298ffef 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosLogistic.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosLogistic.h
@@ -17,6 +17,7 @@ public:
 	~AChaosLogistic(){}	
 
 	vector<string> param_labels={"seed","lambda"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosLogistic1.h b/gui/libs/ofxAChaosLib/src/AChaosLogistic1.h
index 488ca38..27cbd61 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosLogistic1.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosLogistic1.h
@@ -17,6 +17,7 @@ public:
 	~AChaosLogistic1(){}	
 
 	vector<string> param_labels={"seed","lambda","gamma"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosLorenz.h b/gui/libs/ofxAChaosLib/src/AChaosLorenz.h
index 72e1efb..0f1ae2f 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosLorenz.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosLorenz.h
@@ -21,6 +21,7 @@ public:
 	
 	AChaosLorenz(){}
 	~AChaosLorenz(){}	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosLorenzEuler.h b/gui/libs/ofxAChaosLib/src/AChaosLorenzEuler.h
index d23889d..3b3f0ec 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosLorenzEuler.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosLorenzEuler.h
@@ -21,7 +21,8 @@ public:
 	~AChaosLorenzEuler(){}	
 
 	vector<string> param_labels={"a","r","c","nx","ny","nz","dt"};
-	
+		virtual vector<string> &get_param_labels(){return this->param_labels;};
+
 	virtual void setup(REAL * params = NULL){
 	
 		AChaosBase::init(params, 7, 3);	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosLyapunov.h b/gui/libs/ofxAChaosLib/src/AChaosLyapunov.h
index b894ecd..caec7ff 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosLyapunov.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosLyapunov.h
@@ -21,6 +21,7 @@ public:
 	
 	AChaosLyapunov(){}
 	~AChaosLyapunov(){}	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosNavierStokes.h b/gui/libs/ofxAChaosLib/src/AChaosNavierStokes.h
index 885379e..82b1aee 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosNavierStokes.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosNavierStokes.h
@@ -17,6 +17,7 @@ public:
 	
 	AChaosNavierStokes(){}
 	~AChaosNavierStokes(){}	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosNavierStokesEuler.h b/gui/libs/ofxAChaosLib/src/AChaosNavierStokesEuler.h
index 9018ce4..b478c72 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosNavierStokesEuler.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosNavierStokesEuler.h
@@ -17,6 +17,7 @@ public:
 	~AChaosNavierStokesEuler(){}	
 
 	vector<string> param_labels={"nv","nw","nx","ny","nz","r","dt"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosRossler.h b/gui/libs/ofxAChaosLib/src/AChaosRossler.h
index 3bbbc42..e7c9fa2 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosRossler.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosRossler.h
@@ -21,6 +21,7 @@ public:
 	
 	AChaosRossler(){}
 	~AChaosRossler(){}	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosStein.h b/gui/libs/ofxAChaosLib/src/AChaosStein.h
index f720bca..b7276fb 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosStein.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosStein.h
@@ -18,6 +18,7 @@ public:
 	~AChaosStein(){}	
 
 	vector<string> param_labels={"seed","lambda"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosStein1.h b/gui/libs/ofxAChaosLib/src/AChaosStein1.h
index df51da9..732d32e 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosStein1.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosStein1.h
@@ -17,6 +17,7 @@ public:
 	~AChaosStein1(){}	
 
 	vector<string> param_labels={"","lambda"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosTorus.h b/gui/libs/ofxAChaosLib/src/AChaosTorus.h
index 4426f4a..2ab17b6 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosTorus.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosTorus.h
@@ -18,6 +18,7 @@ public:
 	
 	AChaosTorus(){}
 	~AChaosTorus(){}	
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
diff --git a/gui/libs/ofxAChaosLib/src/AChaosVerhulst.h b/gui/libs/ofxAChaosLib/src/AChaosVerhulst.h
index 78f5b32..592df43 100644
--- a/gui/libs/ofxAChaosLib/src/AChaosVerhulst.h
+++ b/gui/libs/ofxAChaosLib/src/AChaosVerhulst.h
@@ -17,6 +17,7 @@ public:
 	~AChaosVerhulst(){}
 
 	vector<string> param_labels={"seed","lambda"};
+	virtual vector<string> &get_param_labels(){return this->param_labels;};
 
 	virtual void setup(REAL * params = NULL){
 	
-- 
cgit v1.2.3