diff --git a/attractors/testAttractor.stf b/attractors/testAttractor.stf index 6d0625e..0ab5b98 100644 --- a/attractors/testAttractor.stf +++ b/attractors/testAttractor.stf @@ -3,12 +3,15 @@ input: "attractor" output: "png" attractor: { - type: "unravel" - dimensions: "3" - + type: lorenz/unravel/polynomial/polynomial a/logistic + => "unravel" + dimensions: most types only support 3D + => "3" + iterations: "1000000" - - parameters: { + + parameters: the variables of the attractortype + { :"-0.78" :"2.042" :"1.22" @@ -20,21 +23,58 @@ attractor: { } projector: { - type: "lineair map" - - domainDimension: "3" - codomainDimensions: "2" - - matrix : { - :{ :"1" :"0" :".2" } - :{ :"0" :"1" :".2" } + type: auto center/lineair map/spherical/color projector + => "lineair map" + + domain: input of the projector, normally the attractor, but can also be a projector + => "attractor" + domainDimension: redundant, because it knows from domain + => "3" + + codomain: output of the Projector, normally a canvas, but can also be another projector + => "canvas" + codomainDimensions: redundant, because it knows from codomain + => "2" + + matrix: describing the lineair map + { + :{ :"1" :"0" :"0" } + :{ :"0" :"1" :"0" } } } -png: { - width: "3200" - height: "3200" - -} +canvas: { + type: 2D image/2D slices/3D volume/2D animation + => "2D image" + output: canvas/png/jpg/zip/mpg + => "png" + + width: "6400" + height: "6400" + colors: "3" -/media/Data/Code/C/AwesomeAttractor/Attractor.cpp|80|error: cannot convert ‘std::basic_string, std::allocator >’ to ‘const char*’ for argument ‘1’ to ‘double atof(const char*)’| + imageConversion: description how to show the abstract canvas classe + { + colorMatrix: desciribing lineair map from canvas colors to RGB colorspace + { + :{ :"1" :"0" :"0" } + :{ :"0" :"1" :"0" } + :{ :"0" :"0" :"1" } + } + + vibrancy: "0" + gamma: "-2.5" + brightness: "3" + } + + pngFile: png options + { + fileName: leave empty to autogenerate filename + => "" + + compression: "9" + author: "Joshua Moerman" + title: "Unravel" + description: "A unravel-type attractor made with AwesomeAttractor" + } +} diff --git a/main.cpp b/main.cpp index c582516..f8d901b 100644 --- a/main.cpp +++ b/main.cpp @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) { unsigned int iterations = 2000000000; // twee miljard for ( unsigned int j = 1; j <= 100; j++ ) { - for ( unsigned int i = 0; 100*i <= iterations; i++ ) { + for ( unsigned int i = 0; i <= iterations; i++ ) { myAttractor.iterate(); myAttractor.plot(); }