Skip to content
Snippets Groups Projects
Commit 6eb6a359 authored by Yoel's avatar Yoel
Browse files

Streamline changes that should have been in the main

parent e3f7fb62
No related branches found
No related tags found
No related merge requests found
......@@ -5,10 +5,11 @@ using namespace util;
namespace config {
std::map<std::string, util::Mat4> cameras{
{"upperAngle", rotate(Vec3(1, 0, 0), -30) * rotate(Vec3(0, 1, 0), -45) *
translate(Vec3(0, 3, 2))},
{"upperAngle", rotate(Vec3(1, 0, 0), -40) * rotate(Vec3(0, 1, 0), -45) *
translate(Vec3(-7, 4, 8))},
{"lowerAngle", rotate(Vec3(1, 0, 0), 10) * translate(Vec3(0, 0, 9))},
{"topDown", rotate(Vec3(1, 0, 0), -90) * rotate(Vec3(1, 0, 0), 0) *
translate(Vec3(0, 3, 0))},
translate(Vec3(0, 5, 0))},
};
std::map<std::string, std::string> skies{
{"StaryNight", "textures/moonlit_golf_4k.hdr"},
......@@ -17,14 +18,15 @@ std::map<std::string, std::string> skies{
size_t threadpool_size = 4;
size_t sample_n = 100;
size_t sample_l = 0;
size_t sample_n = 1;
size_t sample_l = 9;
size_t max_depth = 8;
auto camera_key = "upperAngle";
auto sky_key = "FullMoon";
// derived
auto n_n = sample_n * sample_n;
bool direct = sample_l != 0;
auto camera = cameras[camera_key];
auto sky = skies[sky_key];
......@@ -38,7 +40,7 @@ std::string file_name() {
fnme.append("_");
fnme.append(camera_key);
fnme.append("_");
fnme.append(std::to_string(sample_n));
fnme.append(std::to_string(n_n));
fnme.append("_");
if (direct)
fnme.append(std::to_string(sample_l));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment