diff options
author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-06-11 20:44:01 +0400 |
---|---|---|
committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-06-11 20:44:01 +0400 |
commit | 49479ef91044965077cb0053623e51967dd662c6 (patch) | |
tree | 732b6e78362bb827a078747b275d1c0f3886a9d9 /source/blender/render/intern/include/render_types.h | |
parent | f9ee042afb8a4903327ec8bc1f6b214382384967 (diff) |
*Instance support at dupliverts/faces
*Octree works nicely on hierarchic trees
*the old code was quite destructive at the Isect variable
changing isec->start, end, vec..now it only changes isec->labda (and hit results)
Currently rendering a BVH of all objects, where each object has it own octree.
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
-rw-r--r-- | source/blender/render/intern/include/render_types.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 4846fe8d0e4..88bf30bd9ef 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -54,6 +54,7 @@ struct GHash; struct RenderBuckets; struct ObjectInstanceRen; struct RayObject; +struct RayFace; #define TABLEINITSIZE 1024 #define LAMPINITSIZE 256 @@ -170,7 +171,7 @@ struct Render /* octree tables and variables for raytrace */ struct RayObject *raytree; - struct RayObject *rayfaces; /* TODO Temporary */ + struct RayFace *rayfaces; /* occlusion tree */ void *occlusiontree; @@ -280,6 +281,12 @@ typedef struct ObjectRen { int actmtface, actmcol, bakemtface; float obmat[4][4]; /* only used in convertblender.c, for instancing */ + + /* used on makeraytree */ + struct RayObject *raytree; + struct RayFace *rayfaces; + struct ObjectInstanceRen *rayobi; + } ObjectRen; typedef struct ObjectInstanceRen { @@ -297,6 +304,10 @@ typedef struct ObjectInstanceRen { float *vectors; int totvector; + + /* used on makeraytree */ + struct RayObject *raytree; + } ObjectInstanceRen; /* ------------------------------------------------------------------------- */ |