Add support for point light and materials.

Add material to objects.
This commit is contained in:
Godzil
2020-02-17 19:12:57 +00:00
parent 73d60fb7e4
commit 5ebed12f4f
10 changed files with 274 additions and 1 deletions

32
source/include/light.h Normal file
View File

@@ -0,0 +1,32 @@
/*
* DoRayMe - a quick and dirty Raytracer
* Light header
*
* Created by Manoël Trapier
* Copyright (c) 2020 986-Studio.
*
*/
#ifndef DORAYME_LIGHT_H
#define DORAYME_LIGHT_H
#include <tuple.h>
#include <colour.h>
enum LightType
{
POINT_LIGHT = 0,
};
class Light
{
public:
Colour intensity;
Tuple position;
LightType type;
public:
Light(LightType type = POINT_LIGHT, Tuple position=Point(0, 0, 0),
Colour intensity=Colour(1, 1, 1)) : type(type), position(position), intensity(intensity) { };
};
#endif //DORAYME_LIGHT_H

37
source/include/material.h Normal file
View File

@@ -0,0 +1,37 @@
/*
* DoRayMe - a quick and dirty Raytracer
* Material header
*
* Created by Manoël Trapier
* Copyright (c) 2020 986-Studio.
*
*/
#ifndef DORAYME_MATERIAL_H
#define DORAYME_MATERIAL_H
#include <tuple.h>
#include <colour.h>
#include <light.h>
class Material
{
public:
Colour colour;
double ambient;
double diffuse;
double specular;
double shininess;
public:
Material() : colour(Colour(1, 1, 1)), ambient(0.1), diffuse(0.9), specular(0.9), shininess(200) {};
Colour lighting(Light light, Tuple point, Tuple eyeVector, Tuple normalVector);
bool operator==(const Material &b) const { return double_equal(this->ambient, b.ambient) &&
double_equal(this->diffuse, b.diffuse) &&
double_equal(this->specular, b.specular) &&
double_equal(this->shininess, b.shininess) &&
(this->colour == b.colour); };
};
#endif //DORAYME_MATERIAL_H

View File

@@ -15,6 +15,7 @@ class Object;
#include <tuple.h>
#include <matrix.h>
#include <intersect.h>
#include <material.h>
/* Base class for all object that can be presented in the world */
class Object
@@ -22,6 +23,7 @@ class Object
public:
Matrix transformMatrix;
Matrix inverseTransform;
Material material;
public:
Object();
@@ -30,6 +32,7 @@ public:
virtual Tuple normalAt(Tuple point);
void setTransform(Matrix transform);
void setMaterial(Material material) { this->material = material; };
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); };
};