Add transformation to objects.

This commit is contained in:
Godzil
2020-02-17 14:15:55 +00:00
parent b799e5f819
commit 00b283053e
5 changed files with 107 additions and 4 deletions

View File

@@ -12,13 +12,24 @@
class Object;
#include <ray.h>
#include <tuple.h>
#include <matrix.h>
#include <intersect.h>
/* Base class for all object that can be presented in the world */
class Object
{
public:
Matrix transformMatrix;
Matrix inverseTransform;
public:
Object();
virtual Intersect intersect(Ray r);
void setTransform(Matrix transform);
Ray transform(Ray r) { return Ray(this->transformMatrix * r.origin, this->transformMatrix * r.direction); };
Ray invTransform(Ray r) { return Ray(this->inverseTransform * r.origin, this->inverseTransform * r.direction); };
};
#endif //DORAYME_OBJECT_H

View File

@@ -9,9 +9,23 @@
#include <ray.h>
#include <object.h>
#include <matrix.h>
#include <tuple.h>
#include <intersect.h>
Object::Object()
{
this->transformMatrix = Matrix4().identity();
this->inverseTransform = this->transformMatrix.inverse();
}
Intersect Object::intersect(Ray r)
{
return Intersect();
};
};
void Object::setTransform(Matrix transform)
{
this->transformMatrix = transform;
this->inverseTransform = transform.inverse();
}

View File

@@ -17,10 +17,13 @@ Intersect Sphere::intersect(Ray r)
{
Intersect ret;
double a, b, c, discriminant;
Tuple sphere_to_ray = r.origin - Point(0, 0, 0);
a = r.direction.dot(r.direction);
b = 2 * r.direction.dot(sphere_to_ray);
Ray transRay = this->invTransform(r);
Tuple sphere_to_ray = transRay.origin - Point(0, 0, 0);
a = transRay.direction.dot(transRay.direction);
b = 2 * transRay.direction.dot(sphere_to_ray);
c = sphere_to_ray.dot(sphere_to_ray) - 1;
discriminant = b * b - 4 * a * c;