forked from bartvdbraak/blender
c96ae81160
This adds support for ngons and attributes on subdivision meshes. Ngons are needed for proper attribute interpolation as well as correct Catmull-Clark subdivision. Several changes are made to achieve this: - new primitive `SubdFace` added to `Mesh` - 3 more textures are used to store info on patches from subd meshes - Blender export uses loop interface instead of tessface for subd meshes - `Attribute` class is updated with a simplified way to pass primitive counts around and to support ngons. - extra points for ngons are generated for O(1) attribute interpolation - curves are temporally disabled on subd meshes to avoid various bugs with implementation - old unneeded code is removed from `subd/` - various fixes and improvements Reviewed By: brecht Differential Revision: https://developer.blender.org/D2108
164 lines
4.7 KiB
C
164 lines
4.7 KiB
C
/*
|
|
* Copyright 2011-2013 Blender Foundation
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* Attribute Node */
|
|
|
|
ccl_device void svm_node_attr_init(KernelGlobals *kg, ShaderData *sd,
|
|
uint4 node, NodeAttributeType *type,
|
|
NodeAttributeType *mesh_type, AttributeElement *elem, int *offset, uint *out_offset)
|
|
{
|
|
*out_offset = node.z;
|
|
*type = (NodeAttributeType)node.w;
|
|
if(ccl_fetch(sd, object) != OBJECT_NONE) {
|
|
/* find attribute by unique id */
|
|
uint id = node.y;
|
|
uint attr_offset = ccl_fetch(sd, object)*kernel_data.bvh.attributes_map_stride;
|
|
attr_offset += attribute_primitive_type(kg, sd);
|
|
uint4 attr_map = kernel_tex_fetch(__attributes_map, attr_offset);
|
|
|
|
while(attr_map.x != id) {
|
|
if(UNLIKELY(attr_map.x == ATTR_STD_NONE)) {
|
|
*elem = ATTR_ELEMENT_NONE;
|
|
*offset = 0;
|
|
*mesh_type = (NodeAttributeType)node.w;
|
|
return;
|
|
}
|
|
attr_offset += ATTR_PRIM_TYPES;
|
|
attr_map = kernel_tex_fetch(__attributes_map, attr_offset);
|
|
}
|
|
|
|
/* return result */
|
|
*elem = (AttributeElement)attr_map.y;
|
|
*offset = as_int(attr_map.z);
|
|
*mesh_type = (NodeAttributeType)attr_map.w;
|
|
}
|
|
else {
|
|
/* background */
|
|
*elem = ATTR_ELEMENT_NONE;
|
|
*offset = 0;
|
|
*mesh_type = (NodeAttributeType)node.w;
|
|
}
|
|
}
|
|
|
|
ccl_device void svm_node_attr(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node)
|
|
{
|
|
NodeAttributeType type, mesh_type;
|
|
AttributeElement elem;
|
|
uint out_offset;
|
|
int offset;
|
|
|
|
svm_node_attr_init(kg, sd, node, &type, &mesh_type, &elem, &offset, &out_offset);
|
|
|
|
/* fetch and store attribute */
|
|
if(type == NODE_ATTR_FLOAT) {
|
|
if(mesh_type == NODE_ATTR_FLOAT) {
|
|
float f = primitive_attribute_float(kg, sd, elem, offset, NULL, NULL);
|
|
stack_store_float(stack, out_offset, f);
|
|
}
|
|
else {
|
|
float3 f = primitive_attribute_float3(kg, sd, elem, offset, NULL, NULL);
|
|
stack_store_float(stack, out_offset, average(f));
|
|
}
|
|
}
|
|
else {
|
|
if(mesh_type == NODE_ATTR_FLOAT3) {
|
|
float3 f = primitive_attribute_float3(kg, sd, elem, offset, NULL, NULL);
|
|
stack_store_float3(stack, out_offset, f);
|
|
}
|
|
else {
|
|
float f = primitive_attribute_float(kg, sd, elem, offset, NULL, NULL);
|
|
stack_store_float3(stack, out_offset, make_float3(f, f, f));
|
|
}
|
|
}
|
|
}
|
|
|
|
ccl_device void svm_node_attr_bump_dx(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node)
|
|
{
|
|
NodeAttributeType type, mesh_type;
|
|
AttributeElement elem;
|
|
uint out_offset;
|
|
int offset;
|
|
|
|
svm_node_attr_init(kg, sd, node, &type, &mesh_type, &elem, &offset, &out_offset);
|
|
|
|
/* fetch and store attribute */
|
|
if(type == NODE_ATTR_FLOAT) {
|
|
if(mesh_type == NODE_ATTR_FLOAT) {
|
|
float dx;
|
|
float f = primitive_attribute_float(kg, sd, elem, offset, &dx, NULL);
|
|
stack_store_float(stack, out_offset, f+dx);
|
|
}
|
|
else {
|
|
float3 dx;
|
|
float3 f = primitive_attribute_float3(kg, sd, elem, offset, &dx, NULL);
|
|
stack_store_float(stack, out_offset, average(f+dx));
|
|
}
|
|
}
|
|
else {
|
|
if(mesh_type == NODE_ATTR_FLOAT3) {
|
|
float3 dx;
|
|
float3 f = primitive_attribute_float3(kg, sd, elem, offset, &dx, NULL);
|
|
stack_store_float3(stack, out_offset, f+dx);
|
|
}
|
|
else {
|
|
float dx;
|
|
float f = primitive_attribute_float(kg, sd, elem, offset, &dx, NULL);
|
|
stack_store_float3(stack, out_offset, make_float3(f+dx, f+dx, f+dx));
|
|
}
|
|
}
|
|
}
|
|
|
|
ccl_device void svm_node_attr_bump_dy(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node)
|
|
{
|
|
NodeAttributeType type, mesh_type;
|
|
AttributeElement elem;
|
|
uint out_offset;
|
|
int offset;
|
|
|
|
svm_node_attr_init(kg, sd, node, &type, &mesh_type, &elem, &offset, &out_offset);
|
|
|
|
/* fetch and store attribute */
|
|
if(type == NODE_ATTR_FLOAT) {
|
|
if(mesh_type == NODE_ATTR_FLOAT) {
|
|
float dy;
|
|
float f = primitive_attribute_float(kg, sd, elem, offset, NULL, &dy);
|
|
stack_store_float(stack, out_offset, f+dy);
|
|
}
|
|
else {
|
|
float3 dy;
|
|
float3 f = primitive_attribute_float3(kg, sd, elem, offset, NULL, &dy);
|
|
stack_store_float(stack, out_offset, average(f+dy));
|
|
}
|
|
}
|
|
else {
|
|
if(mesh_type == NODE_ATTR_FLOAT3) {
|
|
float3 dy;
|
|
float3 f = primitive_attribute_float3(kg, sd, elem, offset, NULL, &dy);
|
|
stack_store_float3(stack, out_offset, f+dy);
|
|
}
|
|
else {
|
|
float dy;
|
|
float f = primitive_attribute_float(kg, sd, elem, offset, NULL, &dy);
|
|
stack_store_float3(stack, out_offset, make_float3(f+dy, f+dy, f+dy));
|
|
}
|
|
}
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|
|
|