eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Materials to the shapes in the scene

Browse source
This commit is contained in:
Eryn Wells 2013-09-11 09:05:27 -07:00
parent b480e2c869
commit 2c23fb819e
4 changed files with 33 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/object.h
View file

@ -10,6 +10,7 @@
#define __OBJECT_H__
#include "basics.h"
#include "material.h"
#include "texture.h"
@ -34,9 +35,15 @@ public:
Shape();
Shape(Vector3 o);
Material &get_material() const;
void set_material(Material *mat);
virtual int does_intersect(const Ray &ray, float **t) const = 0;
virtual bool point_is_on_surface(const Vector3 &p) const = 0;
virtual Vector3 compute_normal(const Vector3 &p) const = 0;
private:
Material *material;
};
#endif