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

Scene reader reads figures now.

Browse Source
This commit is contained in:
Wally Hackenslacker
2017-01-18 21:46:24 -04:00
parent 5edccd4d30
commit d0ffec8f60
14 changed files with 596 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scene.hpp
View File

@@ -6,14 +6,18 @@
#include <vector>
#include <stdexcept>
#include <json_spirit_value.h>
#include "camera.hpp"
#include "figure.hpp"
#include "light.hpp"
#include "material.hpp"
#include "environment.hpp"
using std::string;
using std::vector;
using std::runtime_error;
using json_spirit::Value;
class SceneError: public runtime_error {
public:
@@ -29,6 +33,15 @@ public:
Scene(const char * file_name, int h = 480, int w = 640, float fov = 90.0f) throw(SceneError);
~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);
};
#endif