diff --git a/.gitignore b/.gitignore index 60aa2c3..877906e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ *.bmp *.png *.out - - -!/renders/*.png \ No newline at end of file +out/ \ No newline at end of file diff --git a/README.md b/README.md index 4c3bdeb..242e82d 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,23 @@ Visit the website at [renders.datenvorr.at](https://renders.datenvorr.at) ![infinite spheres](renders/mandelbulb-pow3.png) ## Compiling: -in fish: -```fish + +```bash # load requirements nix-shell --run fish # run gcc with flags -gcc (pkg-config --cflags --libs gtk+-3.0 | string split " ") -lm -Wall -Wextra -o march.out main.c +gcc -lm -Wall -Wextra -o march.out main.c ``` ## Running give it the number of threads you want to use ```bash -./march.out +./march.out ``` + +## Animating the power + +Make sure you compiled a version of the program wich takes the power as first arg and target file name as second arg. I would suggest you hardcode the number of threads to use and set up a suitable camera location manually. + +Then edit the parameters in the animate script (it's a fish script, just beware of that) and run it. Depending on your parameters this might take a loooong time to complete. The animate script will not show output of each individual render, but instread display a little progress meter showing the percent of frames complete, the starting power, current power, and the power we want to reach. \ No newline at end of file diff --git a/default.nix b/default.nix index ad62a24..a9e8648 100644 --- a/default.nix +++ b/default.nix @@ -2,6 +2,6 @@ with import {}; stdenv.mkDerivation { name = "raymarcher-dev-env"; buildInputs = [ - gtk3 pkgconfig gdb + pkgconfig gdb ]; } \ No newline at end of file diff --git a/images b/images index a070980..e20f4cb 160000 --- a/images +++ b/images @@ -1 +1 @@ -Subproject commit a070980af1171f7f7966ba5e8b2fb6ba529feb10 +Subproject commit e20f4cb891ae1f6ac34f7572ea6847957b7195db diff --git a/main.c b/main.c index b291874..01386a3 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,3 @@ -#include #include #include "images/images.h" #include "marcher.h" diff --git a/src/camera.c b/src/camera.c index 06bc905..21f5b8d 100644 --- a/src/camera.c +++ b/src/camera.c @@ -1,4 +1,5 @@ #include "../marcher.h" +#include #include #include diff --git a/src/scene.c b/src/scene.c index 34f9a90..6b08202 100644 --- a/src/scene.c +++ b/src/scene.c @@ -1,7 +1,7 @@ #include "../marcher.h" #include "../images/images.h" -#include +#include static Image* current_image; static Scene* current_scene;