diff options
| -rw-r--r-- | pluginchooser/src/pluginpanel.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pluginchooser/src/pluginpanel.h b/pluginchooser/src/pluginpanel.h index 02bf5d7..fd20d0d 100644 --- a/pluginchooser/src/pluginpanel.h +++ b/pluginchooser/src/pluginpanel.h @@ -83,6 +83,15 @@ class pluginPanel : public ofxPanel { {"a",1.4f,-0.0f,2.0f}, {"b",0.3f,-1.0f,1.0f} } + ), + loader("ikeda",&ikeda, //4,2 a b nx ny perfect + 2,0, + { + {"a",0.85f,0.0f,2.0f}, + {"b",0.9f,0.0f,2.0f}, + {"k",0.4f,0.0f,2.0f}, + {"p",7.7f,0.0f,10.0f} + } ) }; index=0; @@ -164,10 +173,10 @@ class pluginPanel : public ofxPanel { } ofVec3f calc(ofVec3f point){ - //if (active){ - return plugins[index].calc(point); - //} - //return point; + if (active){ + return (plugins[index].calc(point)*amount)+(point*(1.0f-amount)); + } + else return point; } private: int index; @@ -179,4 +188,5 @@ private: vector<ofParameter<float> > params; AChaosClifford clifford; AChaosHenon henon; + AChaosIkeda ikeda; };
\ No newline at end of file |