mirror of
https://github.com/vonhyou/ray-tracer-comp371.git
synced 2025-06-08 07:22:01 +00:00
create camera
This commit is contained in:
parent
eb9b6934c0
commit
29b87c041e
1 changed files with 24 additions and 11 deletions
|
@ -23,6 +23,12 @@ Ray getRay(int, int, int, int, const Vector3f &, const Vector3f &,
|
||||||
void writeColor(int, const Vector3f &);
|
void writeColor(int, const Vector3f &);
|
||||||
Vector3f trace();
|
Vector3f trace();
|
||||||
|
|
||||||
|
namespace camera {
|
||||||
|
int width, height;
|
||||||
|
|
||||||
|
void init();
|
||||||
|
} // namespace camera
|
||||||
|
|
||||||
void RayTracer::run() {
|
void RayTracer::run() {
|
||||||
parse();
|
parse();
|
||||||
|
|
||||||
|
@ -45,22 +51,22 @@ void RayTracer::parse() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void RayTracer::render() {
|
void RayTracer::render() {
|
||||||
int width = Scene::current->width();
|
camera::init();
|
||||||
int height = Scene::current->height();
|
|
||||||
Vector3f cameraPos = Scene::current->center();
|
Vector3f cameraPos = Scene::current->center();
|
||||||
Vector3f lookAt = Scene::current->lookAt();
|
Vector3f lookAt = Scene::current->lookAt();
|
||||||
float vpHeight =
|
float vpHeight =
|
||||||
2 * tan(Scene::current->fov() / 180 * M_PI / 2) * lookAt.norm();
|
2 * tan(Scene::current->fov() / 180 * M_PI / 2) * lookAt.norm();
|
||||||
float vpWidth = vpHeight * width / height;
|
float vpWidth = vpHeight * camera::width / camera::height;
|
||||||
Vector3f u = Vector3f(vpWidth, 0, 0);
|
Vector3f u = Vector3f(vpWidth, 0, 0);
|
||||||
Vector3f v = Vector3f(0, -vpHeight, 0);
|
Vector3f v = Vector3f(0, -vpHeight, 0);
|
||||||
Vector3f du = u / width;
|
Vector3f du = u / camera::width;
|
||||||
Vector3f dv = v / height;
|
Vector3f dv = v / camera::height;
|
||||||
|
|
||||||
Vector3f vpUpperLeft = cameraPos + lookAt - u / 2.0 - v / 2.0;
|
Vector3f vpUpperLeft = cameraPos + lookAt - u / 2.0 - v / 2.0;
|
||||||
Vector3f pxUpperLeft = vpUpperLeft + (du + dv) / 2.0;
|
Vector3f pxUpperLeft = vpUpperLeft + (du + dv) / 2.0;
|
||||||
|
|
||||||
Output::current = new Output(Scene::current->name(), width, height);
|
Output::current =
|
||||||
|
new Output(Scene::current->name(), camera::width, camera::height);
|
||||||
|
|
||||||
VectorXi data = Scene::current->raysPerPixel();
|
VectorXi data = Scene::current->raysPerPixel();
|
||||||
int gridWidth = getGridWidth(data);
|
int gridWidth = getGridWidth(data);
|
||||||
|
@ -74,11 +80,11 @@ void RayTracer::render() {
|
||||||
gdv = dv / gridHeight;
|
gdv = dv / gridHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int y = 0; y < height; ++y) {
|
for (int y = 0; y < camera::height; ++y) {
|
||||||
// print progress bar
|
// print progress bar
|
||||||
utils::Progress::of((y + 1.0f) / height);
|
utils::Progress::of((y + 1.0f) / camera::height);
|
||||||
|
|
||||||
for (int x = 0; x < width; ++x) {
|
for (int x = 0; x < camera::width; ++x) {
|
||||||
Vector3f color = Scene::current->backgroundColor();
|
Vector3f color = Scene::current->backgroundColor();
|
||||||
|
|
||||||
if (Scene::current->globalIllum()) {
|
if (Scene::current->globalIllum()) {
|
||||||
|
@ -99,10 +105,10 @@ void RayTracer::render() {
|
||||||
if (!records.empty()) {
|
if (!records.empty()) {
|
||||||
HitRecord hit = records.top();
|
HitRecord hit = records.top();
|
||||||
hit.calcNormal();
|
hit.calcNormal();
|
||||||
color = calculateColor(hit, y * width + x);
|
color = calculateColor(hit, y * camera::width + x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
writeColor(y * width + x, color);
|
writeColor(y * camera::width + x, color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
|
@ -150,3 +156,10 @@ void writeColor(int i, const Vector3f &color) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector3f trace() { return Vector3f::Zero(); }
|
Vector3f trace() { return Vector3f::Zero(); }
|
||||||
|
|
||||||
|
namespace camera {
|
||||||
|
void init() {
|
||||||
|
width = Scene::current->width();
|
||||||
|
height = Scene::current->height();
|
||||||
|
}
|
||||||
|
} // namespace camera
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue