diff --git a/Assignments/Assignment3/application_integrator.cpp b/Assignments/Assignment3/application_integrator.cpp index fe49bda..236aea8 100644 --- a/Assignments/Assignment3/application_integrator.cpp +++ b/Assignments/Assignment3/application_integrator.cpp @@ -28,7 +28,7 @@ void ApplicationIntegrator::drawGUI() { if (ImGui::Checkbox("bootstrap", &bootstrap)) resetRender(); - if (ImGui::SliderInt("Bootstrap amount", &bootstrap_amount, 1, 1000000)) + if (ImGui::SliderInt("Bootstrap amount", &bootstrap_amount, 1, 2000000)) resetRender(); if (ImGui::SliderInt("chain lengths", &chain_lengths, 1, 200000)) @@ -187,8 +187,8 @@ void ApplicationIntegrator::mltRender(int *pixels, int width, int height, } if (l > 0.0) { + data.film.addSplat(x_pixel, y_pixel, (f / l) * a); if (RandomSampler_get1D(chains[i].sampler) < a) { - data.film.addSplat(x_pixel, y_pixel, f / l); accepted_count.fetch_add(1, std::memory_order_relaxed); // if (i == 0) // printf("%d accept %d %f %f %f\n", i, chains[i].is_large_step(), last_l[i], l, l / last_l[i]); diff --git a/Assignments/Assignment3/application_integrator.h b/Assignments/Assignment3/application_integrator.h index bb847b9..0a4b988 100644 --- a/Assignments/Assignment3/application_integrator.h +++ b/Assignments/Assignment3/application_integrator.h @@ -37,10 +37,10 @@ protected: MLTRandomSampler chains[NUM_CHAINS]; float last_l[NUM_CHAINS]; size_t frame_count = 0; - int chain_lengths = 100000; + int chain_lengths = 10000; float small_step_size = 0.01; float large_step_probability = 0.02; bool keep_chains = true; bool bootstrap = false; - int bootstrap_amount = 100000; + int bootstrap_amount = 500000; };