projects
/
cyberay
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
started on the BVH build
[cyberay]
/
src
/
geom.h
diff --git
a/src/geom.h
b/src/geom.h
index
7f71094
..
2233c67
100644
(file)
--- a/
src/geom.h
+++ b/
src/geom.h
@@
-20,15
+20,6
@@
struct aabox {
cgm_vec3 vmin, vmax;
};
cgm_vec3 vmin, vmax;
};
-struct bvhnode {
- struct aabox aabb;
-
- struct triangle *faces;
- int num_faces;
-
- struct bvhnode *left, *right;
-};
-
struct rayhit {
float t;
struct vertex v;
struct rayhit {
float t;
struct vertex v;
@@
-36,10
+27,11
@@
struct rayhit {
struct material *mtl;
};
struct material *mtl;
};
-void free_bvh_tree(struct bvhnode *tree);
-
int ray_triangle(cgm_ray *ray, struct triangle *tri, float tmax, struct rayhit *hit);
int ray_aabox_any(cgm_ray *ray, struct aabox *box, float tmax);
int ray_triangle(cgm_ray *ray, struct triangle *tri, float tmax, struct rayhit *hit);
int ray_aabox_any(cgm_ray *ray, struct aabox *box, float tmax);
-int ray_bvhnode(cgm_ray *ray, struct bvhnode *bn, float tmax, struct rayhit *hit);
+
+void aabox_union(struct aabox *res, struct aabox *a, struct aabox *b);
+float aabox_surf_area(struct aabox *box);
+float surf_area(float dx, float dy, float dz);
#endif /* GEOM_H_ */
#endif /* GEOM_H_ */