Scene reader reads figures now.

This commit is contained in:
2017-01-18 21:46:24 -04:00
parent 5edccd4d30
commit d0ffec8f60
14 changed files with 596 additions and 387 deletions

View File

@@ -13,11 +13,11 @@ class Disk : public Plane {
public:
float m_radius;
Disk(BRDF * _brdf = NULL): Plane(_brdf), m_radius(1.0f) { }
Disk(Material * mat = NULL): Plane(mat), m_radius(1.0f) { }
Disk(float x, float y, float z, float nx, float ny, float nz, float _r, BRDF * _brdf = NULL): Plane(x, y, z, nx, ny, nz, _brdf), m_radius(_r) { }
Disk(float x, float y, float z, float nx, float ny, float nz, float _r, Material * mat = NULL): Plane(x, y, z, nx, ny, nz, mat), m_radius(_r) { }
Disk(vec3 _p, vec3 _n, float _r, BRDF * _brdf = NULL): Plane(_p, _n, _brdf), m_radius(_r) { }
Disk(vec3 _p, vec3 _n, float _r, Material * mat = NULL): Plane(_p, _n, mat), m_radius(_r) { }
virtual ~Disk() { }