sfeng/ray-tracer-comp371
1
0
Fork 0
mirror of https://github.com/vonhyou/ray-tracer-comp371.git synced 2025-06-08 07:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update dummy global illum

Browse source
This commit is contained in:
Shuo Feng 2024-03-20 20:11:32 -04:00
parent 87d3c2788e
commit e59c6dbea4
Signed by: sfeng
GPG key ID: 1E83AE6CD1C037B1
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/RayTracer.cc
View file

@ -8,6 +8,7 @@
#include "Ray.h" #include "Ray.h"
#include <Eigen/Core> #include <Eigen/Core>
#include <Eigen/src/Core/Matrix.h>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>
@ -102,6 +103,9 @@ void RayTracer::render() {
success++; success++;
} }
} }
// std::cout << accumulate.transpose() << " (" << success <<
// std::endl;
} }
if (success) if (success)
@ -203,7 +207,23 @@ RETRY_RANDOM:
return Vector3f(x, y, std::sqrt(1 - x * x - y * y)); return Vector3f(x, y, std::sqrt(1 - x * x - y * y));
} }
Vector3f getGlobalRandDirection(Vector3f normal) {
Vector3f tangent = normal.cross(Vector3f::UnitX());
if (tangent.norm() < 1e-6f)
tangent = normal.cross(Vector3f::UnitY());
tangent.normalize();
Vector3f binormal = normal.cross(tangent);
Eigen::Matrix3f local2World;
local2World.col(0) = tangent;
local2World.col(1) = binormal.normalized();
local2World.col(2) = normal.normalized();
return local2World * getRandomDirection();
}
Vector3f RayTracer::trace(HitRecord hit, int bounce, float prob) const { Vector3f RayTracer::trace(HitRecord hit, int bounce, float prob) const {
RETRY_TRACING:
bool finish = !bounce || ((float)rand() / RAND_MAX < prob); bool finish = !bounce || ((float)rand() / RAND_MAX < prob);
Vector3f point = hit.point(); Vector3f point = hit.point();
Light *light = singleLightSource(); Light *light = singleLightSource();
@ -213,15 +233,17 @@ Vector3f RayTracer::trace(HitRecord hit, int bounce, float prob) const {
if (finish) if (finish)
direction = light->getCenter() - point; direction = light->getCenter() - point;
else else
direction = point + getRandomDirection(); direction = getGlobalRandDirection(hit.normal());
direction.normalize(); direction.normalize();
Ray ray(point, direction); Ray ray(point + hit.normal() * 1e-6, direction);
Optional<HitRecord> hitRecord = getHitRecord(ray, geometry, finish); Optional<HitRecord> hitRecord = getHitRecord(ray, geometry, finish);
Vector3f traceColor = Vector3f::Zero(); Vector3f traceColor = Vector3f::Zero();
if (!finish && hitRecord.hasValue()) if (!finish && hitRecord.hasValue())
traceColor = trace(hitRecord.value(), bounce - 1, prob); traceColor = trace(hitRecord.value(), bounce - 1, prob);
else if (!finish && !hitRecord.hasValue())
goto RETRY_TRACING;
else if (finish && !hitRecord.hasValue()) else if (finish && !hitRecord.hasValue())
traceColor = light->id(); traceColor = light->id();