eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Stats to its own module

Browse source 
Move Stats to its own module and pass it around to the intersection methods to keep track of how many tests and successful intersections there are.
This commit is contained in:
Eryn Wells 2014-08-02 15:21:14 -07:00
parent b60e27824b
commit 79c951030d
12 changed files with 166 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/scene.cc
View file

@ -174,6 +174,8 @@ Scene::render()
printf("Rendering completed in %f seconds.\n\n", seconds.count());
LOG_INFO << "Rendering completed in " << seconds.count() << " seconds.";
mStats.PrintRayTable();
printf("\n");
mStats.PrintIntersectionsTable();
}
@ -225,7 +227,7 @@ Scene::trace_ray(const Ray &ray,
// Find intersections of this ray with objects in the scene.
for (Object::Ptr s : shapes) {
ts.clear();
if (s->DoesIntersect(ray, ts)) {
if (s->DoesIntersect(ray, ts, mStats)) {
for (Double t : ts) {
if (t < 1e-2) {
break;
@ -279,7 +281,7 @@ Scene::trace_ray(const Ray &ray,
/* Figure out if we're in shadow. */
ts.clear();
if (s->DoesIntersect(shadowRay, ts)) {
if (s->DoesIntersect(shadowRay, ts, mStats)) {
diffuse_level = 0.0;
break;
}
@ -323,38 +325,3 @@ Scene::trace_ray(const Ray &ray,
return out_color;
}
unsigned long
Scene::Stats::TotalRays()
const
{
return primaryRays + shadowRays + reflectionRays + transmissionRays;
}
void
Scene::Stats::PrintRayTable()
const
{
printf("RAY TYPE NUM %%\n");
printf("-------------- ---------- ------\n");
PrintRayRow("primary", primaryRays);
PrintRayRow("shadow", shadowRays);
PrintRayRow("reflection", reflectionRays);
PrintRayRow("transmission", transmissionRays);
PrintRayRow("total", TotalRays());
}
void
Scene::Stats::PrintRayRow(const std::string& title,
const unsigned long& value)
const
{
double totalRays = TotalRays();
printf("%-14s %10ld %#5.1lf%%\n",
title.c_str(),
value,
double(value) / totalRays * 100.0);
}