diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d163863 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ \ No newline at end of file diff --git a/examples/exampleB/exampleB.cpp b/examples/exampleB/exampleB.cpp index 231fb12..29b567c 100644 --- a/examples/exampleB/exampleB.cpp +++ b/examples/exampleB/exampleB.cpp @@ -24,7 +24,7 @@ int main() { - Rectangle *r[12]; + Rectangle *r[25]; PointLight *Light1; initDefaultMaterial(); diff --git a/include/Tracer.h b/include/Tracer.h index 23a67c9..6f22c86 100644 --- a/include/Tracer.h +++ b/include/Tracer.h @@ -2,6 +2,7 @@ // @brief Some common raytracing globals/protos/inlines // #pragma once +#define _USE_MATH_DEFINES #include #include diff --git a/include/geom/Triangle.h b/include/geom/Triangle.h index fb9eeb9..7216bc2 100644 --- a/include/geom/Triangle.h +++ b/include/geom/Triangle.h @@ -8,7 +8,7 @@ class Triangle : public Rectangle { public: - Triangle( Vector& l, Vector& s1, Vector& s2 ) : Rectangle(l,s1,s2) {} + Triangle( const Vector& l, const Vector& s1, const Vector& s2 ) : Rectangle(l,s1,s2) {} bool intersect(Ray&, double&) override; }; diff --git a/src/image/Targa.cpp b/src/image/Targa.cpp index 086883b..3138367 100644 --- a/src/image/Targa.cpp +++ b/src/image/Targa.cpp @@ -22,7 +22,7 @@ void targa_header::save(DataSink& ds) TargaImage::TargaImage( char const*name, int width, int height, char *comment ) { - FILE *fp = fopen(name, "w"); + FILE *fp = fopen(name, "wb"); file = new FileDataSink(fp); buf_size = 1000; buffer = new rgb [buf_size]; diff --git a/src/render/ADRender.cpp b/src/render/ADRender.cpp index fc88305..c7e0d3e 100644 --- a/src/render/ADRender.cpp +++ b/src/render/ADRender.cpp @@ -18,6 +18,10 @@ void adaptive_distributed_render_scene( { double x,y; // sample point Ray ray; // pixel ray + + nx *= 4; + ny *= 4; + double hx = 2.0 * HalfWidth / nx; // pixel width double hy = 2.0 * HalfHeight / ny; // pixel height double hxSub = hx / nxSub; diff --git a/src/render/DRender.cpp b/src/render/DRender.cpp index b870ccb..49276de 100644 --- a/src/render/DRender.cpp +++ b/src/render/DRender.cpp @@ -20,6 +20,11 @@ void distributed_render_scene( { double x,y; // sample point Ray ray; // pixel ray + + + nx *= 4; + ny *= 4; + double hx = 2.0 * half_width / nx; // pixel width double hy = 2.0 * half_height / ny; // pixel height double hx_sub = hx / nx_sub; // hz subdivision diff --git a/src/render/Render.cpp b/src/render/Render.cpp index 701699a..10a1673 100644 --- a/src/render/Render.cpp +++ b/src/render/Render.cpp @@ -16,6 +16,10 @@ void render_scene(Scene* scene, double half_width, double half_height, char const* fname) { double x, y; + + nx *= 4; + ny *= 4; + double hx = 2.0 * half_width / nx; double hy = 2.0 * half_height / ny; Ray ray;