clray
diff src/scene.h @ 23:51f115e337c2
separated obj loading and vector class
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Fri, 13 Aug 2010 18:20:45 +0100 |
parents | 6c44e4b1726d |
children | 13091c00d7ca |
line diff
1.1 --- a/src/scene.h Wed Aug 11 04:30:35 2010 +0100 1.2 +++ b/src/scene.h Fri Aug 13 18:20:45 2010 +0100 1.3 @@ -1,6 +1,7 @@ 1.4 #ifndef MESH_H_ 1.5 #define MESH_H_ 1.6 1.7 +#include <stdio.h> 1.8 #include <vector> 1.9 1.10 struct Vertex { 1.11 @@ -31,7 +32,7 @@ 1.12 int matid; 1.13 }; 1.14 1.15 -/*enum { 1.16 +enum { 1.17 KDAXIS_X, 1.18 KDAXIS_Y, 1.19 KDAXIS_Z 1.20 @@ -46,13 +47,13 @@ 1.21 struct KDNode { 1.22 int axis; 1.23 float pt; 1.24 -};*/ 1.25 +}; 1.26 1.27 class Scene { 1.28 public: 1.29 std::vector<Mesh*> meshes; 1.30 std::vector<Material> matlib; 1.31 - //std::vector<KDNode> kdtree; 1.32 + std::vector<KDNode> kdtree; 1.33 1.34 bool add_mesh(Mesh *m); 1.35 int get_num_meshes() const; 1.36 @@ -65,7 +66,7 @@ 1.37 bool load(const char *fname); 1.38 bool load(FILE *fp); 1.39 1.40 - //void build_kdtree(); 1.41 + void build_kdtree(); 1.42 }; 1.43 1.44 #endif /* MESH_H_ */