diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-03 16:08:54 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-01-03 16:08:54 +0400 |
| commit | 57cf48e7c6fd04f864072c21433a822907774f78 (patch) | |
| tree | 45f3fa51f532a03e25c4d8ffa0c1be58027d01b2 /intern/cycles/kernel/svm/svm_geometry.h | |
| parent | 8ca977b16e745f716d044a5b6ccbb5be4a70ac94 (diff) | |
Cycles Hair: refactoring to support generic attributes for hair curves. There
should be no functional changes yet. UV, tangent and intercept are now stored
as attributes, with the intention to add more like multiple uv's, vertex
colors, generated coordinates and motion vectors later.
Things got a bit messy due to having both triangle and curve data in the same
mesh data structure, which also gives us two sets of attributes. This will get
cleaned up when we split the mesh class.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_geometry.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_geometry.h | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/svm_geometry.h index e1b898e9b14..db8bbabe0ec 100644 --- a/intern/cycles/kernel/svm/svm_geometry.h +++ b/intern/cycles/kernel/svm/svm_geometry.h @@ -28,26 +28,7 @@ __device void svm_node_geometry(KernelGlobals *kg, ShaderData *sd, float *stack, case NODE_GEOM_P: data = sd->P; break; case NODE_GEOM_N: data = sd->N; break; #ifdef __DPDU__ - case NODE_GEOM_T: { - /* try to create spherical tangent from generated coordinates */ - int attr_offset = (sd->object != ~0)? find_attribute(kg, sd, ATTR_STD_GENERATED): ATTR_STD_NOT_FOUND; -#ifdef __HAIR__ - if(attr_offset != ATTR_STD_NOT_FOUND && sd->curve_seg == ~0) { -#else - if(attr_offset != ATTR_STD_NOT_FOUND) { -#endif - data = triangle_attribute_float3(kg, sd, ATTR_ELEMENT_VERTEX, attr_offset, NULL, NULL); - data = make_float3(-(data.y - 0.5f), (data.x - 0.5f), 0.0f); - object_normal_transform(kg, sd, &data); - data = cross(sd->N, normalize(cross(data, sd->N)));; - } - else { - /* otherwise use surface derivatives */ - data = normalize(sd->dPdu); - } - - break; - } + case NODE_GEOM_T: data = primitive_tangent(kg, sd); break; #endif case NODE_GEOM_I: data = sd->I; break; case NODE_GEOM_Ng: data = sd->Ng; break; @@ -164,6 +145,7 @@ __device void svm_node_particle_info(KernelGlobals *kg, ShaderData *sd, float *s } #ifdef __HAIR__ + /* Hair Info */ __device void svm_node_hair_info(KernelGlobals *kg, ShaderData *sd, float *stack, uint type, uint out_offset) @@ -177,18 +159,15 @@ __device void svm_node_hair_info(KernelGlobals *kg, ShaderData *sd, float *stack stack_store_float(stack, out_offset, data); break; } - case NODE_INFO_CURVE_INTERCEPT: { - data = intercept(kg, sd->curve_seg, sd->prim, sd->u); - stack_store_float(stack, out_offset, data); - break; - } + case NODE_INFO_CURVE_INTERCEPT: + break; /* handled as attribute */ case NODE_INFO_CURVE_THICKNESS: { - data = 2 * hair_radius(kg, sd->curve_seg, sd->u); + data = curve_thickness(kg, sd); stack_store_float(stack, out_offset, data); break; } case NODE_INFO_CURVE_TANGENT_NORMAL: { - data3 = hair_tangent_normal(kg, sd); + data3 = curve_tangent_normal(kg, sd); stack_store_float3(stack, out_offset, data3); break; } |