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

reformat helper functions

Browse source
This commit is contained in:
Shuo Feng 2024-03-19 19:33:38 -04:00
parent 05914ac768
commit 121910877e
Signed by: sfeng
GPG key ID: 1E83AE6CD1C037B1
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/RayTracer.cc
View file

@ -23,9 +23,17 @@ void RayTracer::parse() {
lights.push_back(Parser::getLight(*i)); lights.push_back(Parser::getLight(*i));
} }
Ray getRay(int x, int y, const Vector3f &camPos, const Vector3f &pxUpperLeft, Ray getRay(int x, int y, const Vector3f &upperLeft, const Vector3f &du,
const Vector3f &du, const Vector3f &dv) { const Vector3f &dv) {
return Ray(camPos, pxUpperLeft + x * du + y * dv - camPos); Vector3f camPos = Scene::current->center();
return Ray(camPos, upperLeft + x * du + y * dv - camPos);
}
Ray getRay(int x, int y, int i, int j, const Vector3f &upperLeft,
const Vector3f &du, const Vector3f &gdu, const Vector3f &dv,
const Vector3f &gdv) {
Vector3f camPos = Scene::current->center();
return Ray(camPos, upperLeft + x * du + i * gdu + y * dv + j * gdv - camPos);
} }
void writeColor(int i, const Vector3f &color) { void writeColor(int i, const Vector3f &color) {
@ -43,17 +51,11 @@ Vector3f RayTracer::calculateColor(const HitRecord &hit, int i) const {
return result.cwiseMax(0.0f).cwiseMin(1.0f); return result.cwiseMax(0.0f).cwiseMin(1.0f);
} }
int getGridWidth(Eigen::VectorXi data) { int getGridWidth(Eigen::VectorXi);
return data.size() != 2 && data.size() != 3 ? 1 : data.x();
}
int getGridHeight(Eigen::VectorXi data) { int getGridHeight(Eigen::VectorXi);
return data.size() == 2 ? data.x() : (data.size() == 3 ? data.y() : 1);
}
int getRayNumber(Eigen::VectorXi data) { int getRayNumber(Eigen::VectorXi);
return data.size() == 2 ? data.y() : (data.size() == 3 ? data.z() : 1);
}
Vector3f trace() { return Vector3f::Zero(); } Vector3f trace() { return Vector3f::Zero(); }
@ -97,10 +99,11 @@ void RayTracer::render() {
if (Scene::current->globalIllum()) { if (Scene::current->globalIllum()) {
for (int j = 0; j < gridHeight; ++j) for (int j = 0; j < gridHeight; ++j)
for (int i = 0; i < gridWidth; ++i) { for (int i = 0; i < gridWidth; ++i) {
Ray ray = getRay(x, y, i, j, vpUpperLeft, du, gdu, dv, gdv);
color = trace(); color = trace();
} }
} else { } else {
Ray ray = getRay(x, y, cameraPos, pxUpperLeft, du, dv); Ray ray = getRay(x, y, pxUpperLeft, du, dv);
priority_queue<HitRecord> records; priority_queue<HitRecord> records;
for (auto g : geometries) { for (auto g : geometries) {
Optional<float> t = g->intersect(ray); Optional<float> t = g->intersect(ray);
@ -129,3 +132,17 @@ void RayTracer::run() {
Output::current->write(); Output::current->write();
} }
} }
// helper functions
int getGridWidth(Eigen::VectorXi data) {
return data.size() != 2 && data.size() != 3 ? 1 : data.x();
}
int getGridHeight(Eigen::VectorXi data) {
return data.size() == 2 ? data.x() : (data.size() == 3 ? data.y() : 1);
}
int getRayNumber(Eigen::VectorXi data) {
return data.size() == 2 ? data.y() : (data.size() == 3 ? data.z() : 1);
}