Revision: 56928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56928
Author: dingto
Date: 2013-05-20 15:58:37 +0000 (Mon, 20 May 2013)
Log Message:
-----------
Cycles / Wireframe node:
* Added a wireframe node (Input category) to get access to Mesh wireframe data.
The thickness can be controlled via a "Size" parameter, and is available in
world units (default) and screen pixel size.
* Only the triangulated mesh is available now, quads is for later.
Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/More#Wireframe
Render and Example file:
http://www.pasteall.org/pic/show.php?id=51731
http://www.pasteall.org/blend/21510
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt
trunk/blender/intern/cycles/kernel/svm/svm.h
trunk/blender/intern/cycles/kernel/svm/svm_types.h
trunk/blender/intern/cycles/render/nodes.cpp
trunk/blender/intern/cycles/render/nodes.h
trunk/blender/release/scripts/startup/nodeitems_builtins.py
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/nodes/NOD_shader.h
trunk/blender/source/blender/nodes/NOD_static_types.h
Added Paths:
-----------
trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h
trunk/blender/source/blender/nodes/shader/nodes/node_shader_wireframe.c
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2013-05-20
14:38:47 UTC (rev 56927)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2013-05-20
15:58:37 UTC (rev 56928)
@@ -378,6 +378,12 @@
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();
}
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2013-05-20 14:38:47 UTC
(rev 56927)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2013-05-20 15:58:37 UTC
(rev 56928)
@@ -78,6 +78,7 @@
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
Modified: trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt 2013-05-20
14:38:47 UTC (rev 56927)
+++ trunk/blender/intern/cycles/kernel/shaders/CMakeLists.txt 2013-05-20
15:58:37 UTC (rev 56928)
@@ -67,6 +67,7 @@
node_voronoi_texture.osl
node_ward_bsdf.osl
node_wave_texture.osl
+ node_wireframe.osl
)
set(SRC_OSL_HEADERS
Added: trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
(rev 0)
+++ trunk/blender/intern/cycles/kernel/shaders/node_wireframe.osl
2013-05-20 15:58:37 UTC (rev 56928)
@@ -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);
+}
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h 2013-05-20 14:38:47 UTC
(rev 56927)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h 2013-05-20 15:58:37 UTC
(rev 56928)
@@ -151,6 +151,7 @@
#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 @@
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);
Modified: trunk/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_types.h 2013-05-20 14:38:47 UTC
(rev 56927)
+++ trunk/blender/intern/cycles/kernel/svm/svm_types.h 2013-05-20 15:58:37 UTC
(rev 56928)
@@ -51,6 +51,7 @@
NODE_ATTR,
NODE_CONVERT,
NODE_FRESNEL,
+ NODE_WIREFRAME,
NODE_EMISSION_WEIGHT,
NODE_TEX_GRADIENT,
NODE_TEX_VORONOI,
Added: trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h
(rev 0)
+++ trunk/blender/intern/cycles/kernel/svm/svm_wireframe.h 2013-05-20
15:58:37 UTC (rev 56928)
@@ -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
+
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2013-05-20 14:38:47 UTC
(rev 56927)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2013-05-20 15:58:37 UTC
(rev 56928)
@@ -2891,6 +2891,33 @@
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()
Modified: trunk/blender/intern/cycles/render/nodes.h
===================================================================
--- trunk/blender/intern/cycles/render/nodes.h 2013-05-20 14:38:47 UTC (rev
56927)
+++ trunk/blender/intern/cycles/render/nodes.h 2013-05-20 15:58:37 UTC (rev
56928)
@@ -442,6 +442,13 @@
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)
Modified: trunk/blender/release/scripts/startup/nodeitems_builtins.py
===================================================================
--- trunk/blender/release/scripts/startup/nodeitems_builtins.py 2013-05-20
14:38:47 UTC (rev 56927)
+++ trunk/blender/release/scripts/startup/nodeitems_builtins.py 2013-05-20
15:58:37 UTC (rev 56928)
@@ -136,6 +136,7 @@
NodeItem("ShaderNodeValue"),
NodeItem("ShaderNodeTangent"),
NodeItem("ShaderNodeNewGeometry"),
+ NodeItem("ShaderNodeWireframe"),
NodeItem("ShaderNodeObjectInfo"),
NodeItem("ShaderNodeHairInfo"),
NodeItem("ShaderNodeParticleInfo"),
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
