blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cycles: De-duplicate trace-time object visibility calculation 

We already have enough files to worry about in BVH builders. no need to add yet
another copy-paste code which is tempting to be running out of sync.
This commit is contained in:
Sergey Sharybin 2017-08-10 09:19:40 +02:00
parent de3c165713
commit 5a618ab737
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/bvh/bvh.cpp
View File

@ -153,7 +153,6 @@ void BVH::pack_primitives()
if(pack.prim_index[i] != -1) {
int tob = pack.prim_object[i];
Object *ob = objects[tob];
if((pack.prim_type[i] & PRIMITIVE_ALL_TRIANGLE) != 0) {
pack_triangle(i, (float4*)&pack.prim_tri_verts[3 * prim_triangle_index]);
pack.prim_tri_index[i] = 3 * prim_triangle_index;
@ -162,15 +161,10 @@ void BVH::pack_primitives()
else {
pack.prim_tri_index[i] = -1;
}
pack.prim_visibility[i] = ob->visibility;
if(pack.prim_type[i] & PRIMITIVE_ALL_CURVE)
pack.prim_visibility[i] = ob->visibility_for_tracing();
if(pack.prim_type[i] & PRIMITIVE_ALL_CURVE) {
pack.prim_visibility[i] |= PATH_RAY_CURVE;
if (ob->is_shadow_catcher)
pack.prim_visibility[i] &= ~PATH_RAY_SHADOW_NON_CATCHER;
else
pack.prim_visibility[i] &= ~PATH_RAY_SHADOW_CATCHER;
}
}
else {
pack.prim_tri_index[i] = -1;

8
intern/cycles/bvh/bvh2.cpp
View File

@ -312,14 +312,8 @@ void BVH2::refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility)
}
}
}
visibility |= ob->visibility;
if (ob->is_shadow_catcher)
visibility &= ~PATH_RAY_SHADOW_NON_CATCHER;
else
visibility &= ~PATH_RAY_SHADOW_CATCHER;
visibility |= ob->visibility_for_tracing();
}
/* TODO(sergey): De-duplicate with pack_leaf(). */
float4 leaf_data[BVH_NODE_LEAF_SIZE];
leaf_data[0].x = __int_as_float(c0);

8
intern/cycles/bvh/bvh4.cpp
View File

@ -438,14 +438,8 @@ void BVH4::refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility)
}
}
}
visibility |= ob->visibility;
if (ob->is_shadow_catcher)
visibility &= ~PATH_RAY_SHADOW_NON_CATCHER;
else
visibility &= ~PATH_RAY_SHADOW_CATCHER;
visibility |= ob->visibility_for_tracing();
}
/* TODO(sergey): This is actually a copy of pack_leaf(),
* but this chunk of code only knows actual data and has
* no idea about BVHNode.

11
intern/cycles/render/object.cpp
View File

@ -262,6 +262,17 @@ bool Object::is_traceable()
return true;
}
uint Object::visibility_for_tracing() const {
uint trace_visibility = visibility;
if (is_shadow_catcher) {
trace_visibility &= ~PATH_RAY_SHADOW_NON_CATCHER;
}
else {
trace_visibility &= ~PATH_RAY_SHADOW_CATCHER;
}
return trace_visibility;
}
/* Object Manager */
ObjectManager::ObjectManager()

7
intern/cycles/render/object.h
View File

@ -60,7 +60,7 @@ public:
ParticleSystem *particle_system;
int particle_index;
Object();
~Object();
@ -75,6 +75,11 @@ public:
* kernel scene.
*/
bool is_traceable();
/* Combine object's visibility with all possible internal run-time
* determined flags which denotes trace-time visibility.
*/
uint visibility_for_tracing() const;
};
/* Object Manager */