erebus

diff liberebus/src/geomobj.h @ 4:93894c232d65

more changes across the board
author John Tsiombikas <nuclear@member.fsf.org>
date Tue, 29 Apr 2014 07:38:40 +0300
parents a932848de652
children e2d9bf168a41
line diff
     1.1 --- a/liberebus/src/geomobj.h	Mon Apr 28 15:44:59 2014 +0300
     1.2 +++ b/liberebus/src/geomobj.h	Tue Apr 29 07:38:40 2014 +0300
     1.3 @@ -3,12 +3,16 @@
     1.4  
     1.5  #include <vector>
     1.6  #include "object.h"
     1.7 +#include "material.h"
     1.8  #include "brdf.h"
     1.9  
    1.10  class GeomObject : public Object {
    1.11  public:
    1.12 +	Material mtl;
    1.13  	Reflectance *brdf;
    1.14  
    1.15 +	GeomObject();
    1.16 +
    1.17  	ObjType get_type() const override;
    1.18  
    1.19  	bool intersect(const Ray &ray, RayHit *hit = 0) const override;