Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Simplify some code in Curve BVH reference fill

Browse Source 
makes code slightly shorter and uses idea of const qualifiers.
This commit is contained in:
Sergey Sharybin
2017-01-13 10:59:34 +01:00
parent 3160472a66
commit 807b1a262f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/bvh/bvh_build.cpp
View File

@@ -156,12 +156,13 @@ void BVHBuild::add_reference_mesh(BoundBox& root, BoundBox& center, Mesh *mesh,
size_t num_curves = mesh->num_curves(); size_t num_curves = mesh->num_curves();
for(uint j = 0; j < num_curves; j++) { for(uint j = 0; j < num_curves; j++) {
Mesh::Curve curve = mesh->get_curve(j); const Mesh::Curve curve = mesh->get_curve(j);
PrimitiveType type = PRIMITIVE_CURVE; PrimitiveType type = PRIMITIVE_CURVE;
const float *curve_radius = &mesh->curve_radius[0];
for(int k = 0; k < curve.num_keys - 1; k++) { for(int k = 0; k < curve.num_keys - 1; k++) {
BoundBox bounds = BoundBox::empty; BoundBox bounds = BoundBox::empty;
curve.bounds_grow(k, &mesh->curve_keys[0], &mesh->curve_radius[0], bounds); curve.bounds_grow(k, &mesh->curve_keys[0], curve_radius, bounds);
/* motion curve */ /* motion curve */
if(curve_attr_mP) { if(curve_attr_mP) {
@@ -170,7 +171,7 @@ void BVHBuild::add_reference_mesh(BoundBox& root, BoundBox& center, Mesh *mesh,
const float3 *key_steps = curve_attr_mP->data_float3(); const float3 *key_steps = curve_attr_mP->data_float3();
for(size_t step = 0; step < num_steps; step++) { for(size_t step = 0; step < num_steps; step++) {
curve.bounds_grow(k, key_steps + step*mesh_size, &mesh->curve_radius[0], bounds); curve.bounds_grow(k, key_steps + step*mesh_size, curve_radius, bounds);
} }
type = PRIMITIVE_MOTION_CURVE; type = PRIMITIVE_MOTION_CURVE;