aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/color.cpp7
-rw-r--r--src/main.cpp9
2 files changed, 8 insertions, 8 deletions
diff --git a/src/color.cpp b/src/color.cpp
index c1036e0..33351a8 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -1,16 +1,11 @@
#include "color.hpp"
#include "rt.hpp"
-void write_color(std::ostream& out, const color& pixel_color, uint32_t samples_per_pixel) {
+void write_color(std::ostream& out, const color& pixel_color) {
auto r = pixel_color.x;
auto g = pixel_color.y;
auto b = pixel_color.z;
- // auto scale = 1.0 / samples_per_pixel;
- // r = sqrt(r * scale);
- // g = sqrt(g * scale);
- // b = sqrt(b * scale);
-
out << static_cast<uint32_t>(256.0 * clamp(r, 0.0, 0.999)) << ' '
<< static_cast<uint32_t>(256.0 * clamp(g, 0.0, 0.999)) << ' '
<< static_cast<uint32_t>(256.0 * clamp(b, 0.0, 0.999)) << std::endl;
diff --git a/src/main.cpp b/src/main.cpp
index b769dd3..8811c78 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -85,7 +85,7 @@ int main() {
const float aspect_ratio = 1.0 / 1.0;
const size_t width = 400;
const size_t height = width / aspect_ratio;
- const uint32_t samples_per_pixel = 1;
+ const uint32_t samples_per_pixel = 100;
const uint32_t max_depth = 100;
// const vec3 camera_position{ 13.0, 2.0, 3.0 };
@@ -98,6 +98,7 @@ int main() {
.sky_color = sky_color,
.ground_color = ground_color,
.camera_pos = camera_position,
+ .samples_per_pixel = samples_per_pixel,
.viewport_width = 2.f * aspect_ratio,
.viewport_height = 2.f,
.proj_plane_distance = 1.f,
@@ -105,6 +106,10 @@ int main() {
// .sphere = { { 0.f, -100.5f, -1.f }, 100.f },
};
+ for (size_t rand_number_index = 0; rand_number_index < samples_per_pixel * 2; rand_number_index++) {
+ inputs.random_numbers[rand_number_index] = randd();
+ }
+
// World hittable objects
hittable_list world = random_scene();
@@ -120,7 +125,7 @@ int main() {
//-------------------------
auto output_image = renderer.output_image();
for (size_t index = 0; index < height * width; index++) {
- write_color(std::cout, output_image[index], samples_per_pixel);
+ write_color(std::cout, output_image[index]);
}
std::cerr << "Done !" << std::endl;