WallyHackenslacker/PhotonMF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Assorted bug fixes.

Browse Source
This commit is contained in:
Miguel Angel Astor Romero
2017-01-20 12:13:42 -04:00
parent 33aba8cae2
commit 5970be923b
9 changed files with 314 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene.hpp
View File

@@ -33,18 +33,18 @@ public:
Environment * m_env;
Camera * m_cam;
Scene(const char * file_name, int h = 480, int w = 640, float fov = 90.0f) throw(SceneError);
Scene(const char * file_name, int h = 480, int w = 640, float fov = 90.0f);
~Scene();
private:
void read_vector(Value & val, vec3 & vec) throw(SceneError);
void read_environment(Value & v) throw(SceneError);
void read_camera(Value & v) throw(SceneError);
Material * read_material(Value & v) throw(SceneError);
Figure * read_sphere(Value & v) throw(SceneError);
Figure * read_plane(Value & v) throw(SceneError);
Figure * read_disk(Value & v) throw(SceneError);
Light * read_light(Value & v, light_type_t t) throw(SceneError);
void read_vector(Value & val, vec3 & vec);
void read_environment(Value & v);
void read_camera(Value & v);
Material * read_material(Value & v);
Figure * read_sphere(Value & v);
Figure * read_plane(Value & v);
Figure * read_disk(Value & v);
Light * read_light(Value & v, light_type_t t);
};
#endif