diff options
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/node_wireframe.osl | 29 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_wireframe.h | 97 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 27 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.h | 7 | ||||
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 10 | ||||
| -rw-r--r-- | source/blender/nodes/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/nodes/NOD_shader.h | 1 | ||||
| -rw-r--r-- | source/blender/nodes/NOD_static_types.h | 1 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_wireframe.c | 54 |
18 files changed, 251 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 94415514e7b..8331f3a5790 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -378,6 +378,12 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen else if (b_node.is_a(&RNA_ShaderNodeNewGeometry)) { node = new GeometryNode(); } + else if (b_node.is_a(&RNA_ShaderNodeWireframe)) { + BL::ShaderNodeWireframe b_wireframe_node(b_node); + WireframeNode *wire = new WireframeNode(); + wire->use_pixel_size = b_wireframe_node.use_pixel_size(); + node = wire; + } else if (b_node.is_a(&RNA_ShaderNodeLightPath)) { node = new LightPathNode(); } diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 961349f1095..41048c7b379 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -78,6 +78,7 @@ set(SRC_SVM_HEADERS svm/svm_brick.h svm/svm_displace.h svm/svm_fresnel.h + svm/svm_wireframe.h svm/svm_gamma.h svm/svm_brightness.h svm/svm_geometry.h diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt index 0cff264d8e1..ae8ff88efd2 100644 --- a/intern/cycles/kernel/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/shaders/CMakeLists.txt @@ -67,6 +67,7 @@ set(SRC_OSL node_voronoi_texture.osl node_ward_bsdf.osl node_wave_texture.osl + node_wireframe.osl ) set(SRC_OSL_HEADERS diff --git a/intern/cycles/kernel/shaders/node_wireframe.osl b/intern/cycles/kernel/shaders/node_wireframe.osl new file mode 100644 index 00000000000..c9e6e6f3ff4 --- /dev/null +++ b/intern/cycles/kernel/shaders/node_wireframe.osl @@ -0,0 +1,29 @@ +/* + * Copyright 2013, Blender Foundation. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "stdosl.h" +#include "oslutil.h" + +shader node_wireframe( + int use_pixel_size = 0, + float Size = 0.01, + output float Fac = 0.0) +{ + Fac = wireframe("triangles", Size, use_pixel_size); +} + diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 22172420aba..8f1d2aa0e16 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -151,6 +151,7 @@ CCL_NAMESPACE_END #include "svm_convert.h" #include "svm_displace.h" #include "svm_fresnel.h" +#include "svm_wireframe.h" #include "svm_camera.h" #include "svm_geometry.h" #include "svm_hsv.h" @@ -357,6 +358,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_LAYER_WEIGHT: svm_node_layer_weight(sd, stack, node); break; + case NODE_WIREFRAME: + svm_node_wireframe(kg, sd, stack, node.y, node.z, node.w); + break; #ifdef __EXTRA_NODES__ case NODE_SET_DISPLACEMENT: svm_node_set_displacement(sd, stack, node.y); diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index 2cf3ccbe575..de52844194c 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -51,6 +51,7 @@ typedef enum NodeType { NODE_ATTR, NODE_CONVERT, NODE_FRESNEL, + NODE_WIREFRAME, NODE_EMISSION_WEIGHT, NODE_TEX_GRADIENT, NODE_TEX_VORONOI, diff --git a/intern/cycles/kernel/svm/svm_wireframe.h b/intern/cycles/kernel/svm/svm_wireframe.h new file mode 100644 index 00000000000..efe09051403 --- /dev/null +++ b/intern/cycles/kernel/svm/svm_wireframe.h @@ -0,0 +1,97 @@ +/* + * Adapted from Open Shading Language with this license: + * + * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al. + * All Rights Reserved. + * + * Modifications Copyright 2013, Blender Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Sony Pictures Imageworks nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +CCL_NAMESPACE_BEGIN + +/* Wireframe Node */ + +__device void svm_node_wireframe(KernelGlobals *kg, ShaderData *sd, float *stack, uint in_size, uint out_fac, uint use_pixel_size) +{ + /* Input Data */ + float size = stack_load_float(stack, in_size); + int pixel_size = (int)use_pixel_size; + + /* Output */ + float f = 0.0f; + + /* Calculate wireframe */ +#ifdef __HAIR__ + if (sd->segment == ~0) { +#else + { +#endif + float3 Co[3]; + float pixelwidth = 1.0f; + + /* Triangles */ + float np = 3; + + triangle_vertices(kg, sd->prim, Co); + + if(!(sd->flag & SD_TRANSFORM_APPLIED)) { + object_position_transform(kg, sd, &Co[0]); + object_position_transform(kg, sd, &Co[1]); + object_position_transform(kg, sd, &Co[2]); + } + + if(pixel_size) { + // Project the derivatives of P to the viewing plane defined + // by I so we have a measure of how big is a pixel at this point + float pixelwidth_x = len(sd->dP.dx - dot(sd->dP.dx, sd->I) * sd->I); + float pixelwidth_y = len(sd->dP.dy - dot(sd->dP.dy, sd->I) * sd->I); + // Take the average of both axis' length + pixelwidth = (pixelwidth_x + pixelwidth_y) * 0.5f; + } + + // Use half the width as the neighbor face will render the + // other half. And take the square for fast comparison + pixelwidth *= 0.5f * size; + pixelwidth *= pixelwidth; + for (int i = 0; i < np; i++) { + int i2 = i ? i - 1 : np - 1; + float3 dir = sd->P - Co[i]; + float3 edge = Co[i] - Co[i2]; + float3 crs = cross(edge, dir); + // At this point dot(crs, crs) / dot(edge, edge) is + // the square of area / length(edge) == square of the + // distance to the edge. + if (dot(crs, crs) < (dot(edge, edge) * pixelwidth)) + f = 1.0f; + } + } + + if (stack_valid(out_fac)) + stack_store_float(stack, out_fac, f); +} + +CCL_NAMESPACE_END + diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 06322fec820..4d9fc356d80 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2891,6 +2891,33 @@ void LayerWeightNode::compile(OSLCompiler& compiler) compiler.add(this, "node_layer_weight"); } +/* Wireframe */ + +WireframeNode::WireframeNode() +: ShaderNode("Wireframe") +{ + add_input("Size", SHADER_SOCKET_FLOAT, 0.01f); + add_output("Fac", SHADER_SOCKET_FLOAT); + + use_pixel_size = false; +} + +void WireframeNode::compile(SVMCompiler& compiler) +{ + ShaderInput *size_in = input("Size"); + ShaderOutput *fac_out = output("Fac"); + + compiler.stack_assign(size_in); + compiler.stack_assign(fac_out); + compiler.add_node(NODE_WIREFRAME, size_in->stack_offset, fac_out->stack_offset, use_pixel_size); +} + +void WireframeNode::compile(OSLCompiler& compiler) +{ + compiler.parameter("use_pixel_size", use_pixel_size); + compiler.add(this, "node_wireframe"); +} + /* Output */ OutputNode::OutputNode() diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 41fa87a3859..8a34e4e0c40 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -442,6 +442,13 @@ public: SHADER_NODE_CLASS(LayerWeightNode) }; +class WireframeNode : public ShaderNode { +public: + SHADER_NODE_CLASS(WireframeNode) + + bool use_pixel_size; +}; + class MathNode : public ShaderNode { public: SHADER_NODE_CLASS(MathNode) diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index c3a5cefcfca..9ffde79405d 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -136,6 +136,7 @@ shader_node_categories = [ NodeItem("ShaderNodeValue"), NodeItem("ShaderNodeTangent"), NodeItem("ShaderNodeNewGeometry"), + NodeItem("ShaderNodeWireframe"), NodeItem("ShaderNodeObjectInfo"), NodeItem("ShaderNodeHairInfo"), NodeItem("ShaderNodeParticleInfo"), diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 8723afb881b..9f8858f760b 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -738,6 +738,7 @@ struct ShadeResult; #define SH_NODE_NORMAL_MAP 175 #define SH_NODE_HAIR_INFO 176 #define SH_NODE_SUBSURFACE_SCATTERING 177 +#define SH_NODE_WIREFRAME 178 /* custom defines options for Material node */ #define SH_NODE_MAT_DIFF 1 diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 75bf594a976..ad046af964f 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3394,6 +3394,7 @@ static void registerShaderNodes(void) register_node_type_sh_brightcontrast(); register_node_type_sh_value(); register_node_type_sh_rgb(); + register_node_type_sh_wireframe(); register_node_type_sh_mix_rgb(); register_node_type_sh_valtorgb(); register_node_type_sh_rgbtobw(); diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 9ce28cc3314..e26fe5f6f3e 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -759,6 +759,11 @@ static void node_shader_buts_attribute(uiLayout *layout, bContext *UNUSED(C), Po uiItemR(layout, ptr, "attribute_name", 0, IFACE_("Name"), ICON_NONE); } +static void node_shader_buts_wireframe(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) +{ + uiItemR(layout, ptr, "use_pixel_size", 0, NULL, 0); +} + static void node_shader_buts_tex_image(uiLayout *layout, bContext *C, PointerRNA *ptr) { PointerRNA imaptr = RNA_pointer_get(ptr, "image"); @@ -965,6 +970,9 @@ static void node_shader_set_butfunc(bNodeType *ntype) case SH_NODE_ATTRIBUTE: ntype->uifunc = node_shader_buts_attribute; break; + case SH_NODE_WIREFRAME: + ntype->uifunc = node_shader_buts_wireframe; + break; case SH_NODE_TEX_SKY: ntype->uifunc = node_shader_buts_tex_sky; break; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index a40d85ae954..308fab7e610 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -3406,6 +3406,16 @@ static void def_sh_tex_coord(StructRNA *srna) RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } +static void def_sh_tex_wireframe(StructRNA *srna) +{ + PropertyRNA *prop; + + prop = RNA_def_property(srna, "use_pixel_size", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1); + RNA_def_property_ui_text(prop, "Pixel Size", "Use screen pixel size instead of world units"); + RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); +} + static void def_glossy(StructRNA *srna) { PropertyRNA *prop; diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index f2ce9665e2b..3e0c57f4960 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -145,6 +145,7 @@ set(SRC shader/nodes/node_shader_texture.c shader/nodes/node_shader_valToRgb.c shader/nodes/node_shader_value.c + shader/nodes/node_shader_wireframe.c shader/nodes/node_shader_vectMath.c shader/nodes/node_shader_add_shader.c shader/nodes/node_shader_ambient_occlusion.c diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h index eb324182e39..334f8f48ca0 100644 --- a/source/blender/nodes/NOD_shader.h +++ b/source/blender/nodes/NOD_shader.h @@ -79,6 +79,7 @@ void register_node_type_sh_light_path(void); void register_node_type_sh_light_falloff(void); void register_node_type_sh_object_info(void); void register_node_type_sh_fresnel(void); +void register_node_type_sh_wireframe(void); void register_node_type_sh_layer_weight(void); void register_node_type_sh_tex_coord(void); void register_node_type_sh_particle_info(void); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index f9868966892..2754fb1b886 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -94,6 +94,7 @@ DefNode( ShaderNode, SH_NODE_LIGHT_FALLOFF, 0, "LI DefNode( ShaderNode, SH_NODE_OBJECT_INFO, 0, "OBJECT_INFO", ObjectInfo, "Object Info", "" ) DefNode( ShaderNode, SH_NODE_PARTICLE_INFO, 0, "PARTICLE_INFO", ParticleInfo, "Particle Info", "" ) DefNode( ShaderNode, SH_NODE_HAIR_INFO, 0, "HAIR_INFO", HairInfo, "Hair Info", "" ) +DefNode( ShaderNode, SH_NODE_WIREFRAME, def_sh_tex_wireframe, "WIREFRAME", Wireframe, "Wireframe", "" ) DefNode( ShaderNode, SH_NODE_BUMP, def_sh_bump, "BUMP", Bump, "Bump", "" ) DefNode( ShaderNode, SH_NODE_NORMAL_MAP, def_sh_normal_map, "NORMAL_MAP", NormalMap, "Normal Map", "" ) DefNode( ShaderNode, SH_NODE_TANGENT, def_sh_tangent, "TANGENT", Tangent, "Tangent", "" ) diff --git a/source/blender/nodes/shader/nodes/node_shader_wireframe.c b/source/blender/nodes/shader/nodes/node_shader_wireframe.c new file mode 100644 index 00000000000..76a176db614 --- /dev/null +++ b/source/blender/nodes/shader/nodes/node_shader_wireframe.c @@ -0,0 +1,54 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2005 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include "../node_shader_util.h" + +/* **************** Wireframe ******************** */ +static bNodeSocketTemplate sh_node_wireframe_in[] = { + { SOCK_FLOAT, 1, N_("Size"), 0.01f, 0.0f, 0.0f, 0.0f, 0.0f, 100.0f}, + { -1, 0, "" } +}; + +static bNodeSocketTemplate sh_node_wireframe_out[] = { + { SOCK_FLOAT, 0, N_("Fac"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, + { -1, 0, "" } +}; + +/* node type definition */ +void register_node_type_sh_wireframe(void) +{ + static bNodeType ntype; + + sh_node_type_base(&ntype, SH_NODE_WIREFRAME, "Wireframe", NODE_CLASS_INPUT, NODE_OPTIONS); + node_type_compatibility(&ntype, NODE_NEW_SHADING); + node_type_socket_templates(&ntype, sh_node_wireframe_in, sh_node_wireframe_out); + node_type_size(&ntype, 150, 60, 200); + node_type_init(&ntype, NULL); + node_type_storage(&ntype, "", NULL, NULL); + + nodeRegisterType(&ntype); +} |