diff options
Diffstat (limited to 'source/blender/render/intern/raytrace/rayobject_vbvh.cpp')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_vbvh.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp index 26a99794362..47e78b8912e 100644 --- a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp +++ b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp @@ -88,7 +88,7 @@ void bvh_done<VBVHTree>(VBVHTree *obj) //Build and optimize the tree if (1) { - VBVHNode *root = BuildBinaryVBVH<VBVHNode>(arena1,&obj->rayobj.control).transform(obj->builder); + VBVHNode *root = BuildBinaryVBVH<VBVHNode>(arena1, &obj->rayobj.control).transform(obj->builder); if (RE_rayobjectcontrol_test_break(&obj->rayobj.control)) { BLI_memarena_free(arena1); return; @@ -115,7 +115,7 @@ void bvh_done<VBVHTree>(VBVHTree *obj) //Finds the optimal packing of this tree using a given cost model //TODO this uses quite a lot of memory, find ways to reduce memory usage during building OVBVHNode *root = BuildBinaryVBVH<OVBVHNode>(arena2).transform(obj->builder); - VBVH_optimalPackSIMD<OVBVHNode,PackCost>(PackCost()).transform(root); + VBVH_optimalPackSIMD<OVBVHNode, PackCost>(PackCost()).transform(root); obj->root = Reorganize_VBVH<OVBVHNode>(arena1).transform(root); BLI_memarena_free(arena2); @@ -136,9 +136,9 @@ int intersect(VBVHTree *obj, Isect* isec) //TODO renable hint support if (RE_rayobject_isAligned(obj->root)) { if (isec->mode == RE_RAY_SHADOW) - return bvh_node_stack_raycast<VBVHNode,StackSize,false,true>( obj->root, isec); + return bvh_node_stack_raycast<VBVHNode, StackSize, false, true>( obj->root, isec); else - return bvh_node_stack_raycast<VBVHNode,StackSize,false,false>( obj->root, isec); + return bvh_node_stack_raycast<VBVHNode, StackSize, false, false>( obj->root, isec); } else return RE_rayobject_intersect( (RayObject*) obj->root, isec ); @@ -178,13 +178,13 @@ RayObjectAPI make_api() { static RayObjectAPI api = { - (RE_rayobject_raycast_callback) ((int(*)(Tree*,Isect*)) &intersect<STACK_SIZE>), - (RE_rayobject_add_callback) ((void(*)(Tree*,RayObject*)) &bvh_add<Tree>), + (RE_rayobject_raycast_callback) ((int(*)(Tree*, Isect*)) &intersect<STACK_SIZE>), + (RE_rayobject_add_callback) ((void(*)(Tree*, RayObject*)) &bvh_add<Tree>), (RE_rayobject_done_callback) ((void(*)(Tree*)) &bvh_done<Tree>), (RE_rayobject_free_callback) ((void(*)(Tree*)) &bvh_free<Tree>), - (RE_rayobject_merge_bb_callback)((void(*)(Tree*,float*,float*)) &bvh_bb<Tree>), + (RE_rayobject_merge_bb_callback)((void(*)(Tree*, float*, float*)) &bvh_bb<Tree>), (RE_rayobject_cost_callback) ((float(*)(Tree*)) &bvh_cost<Tree>), - (RE_rayobject_hint_bb_callback) ((void(*)(Tree*,LCTSHint*,float*,float*)) &bvh_hint_bb<Tree>) + (RE_rayobject_hint_bb_callback) ((void(*)(Tree*, LCTSHint*, float*, float*)) &bvh_hint_bb<Tree>) }; return api; @@ -193,7 +193,7 @@ RayObjectAPI make_api() template<class Tree> RayObjectAPI* bvh_get_api(int maxstacksize) { - static RayObjectAPI bvh_api256 = make_api<Tree,1024>(); + static RayObjectAPI bvh_api256 = make_api<Tree, 1024>(); if (maxstacksize <= 1024) return &bvh_api256; assert(maxstacksize <= 256); @@ -202,5 +202,5 @@ RayObjectAPI* bvh_get_api(int maxstacksize) RayObject *RE_rayobject_vbvh_create(int size) { - return bvh_create_tree<VBVHTree,DFS_STACK_SIZE>(size); + return bvh_create_tree<VBVHTree, DFS_STACK_SIZE>(size); } |