[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42355] trunk/blender: CameraData Input Cycles Node
Dalai Felinto
dfelinto at gmail.com
Fri Dec 2 21:36:18 CET 2011
Revision: 42355
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42355
Author: dfelinto
Date: 2011-12-02 20:36:13 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
CameraData Input Cycles Node
----------------------------
reviewed and approved by Brecht
Important note:
the camera Z is reverted compared to Blender render.
Now it goes from zero (camera) to positive (in front of the camera)
Modified Paths:
--------------
trunk/blender/intern/cycles/app/cycles_xml.cpp
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/nodes/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/source/blender/nodes/shader/nodes/node_shader_camera.c
Added Paths:
-----------
trunk/blender/intern/cycles/kernel/osl/nodes/node_camera.osl
trunk/blender/intern/cycles/kernel/svm/svm_camera.h
Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp 2011-12-02 20:36:13 UTC (rev 42355)
@@ -454,6 +454,9 @@
xml_read_ustring(&attr->attribute, node, "attribute");
snode = attr;
}
+ else if(string_ieuals(node.name(), "camera")) {
+ snode = new CameraNode();
+ }
else if(string_iequals(node.name(), "fresnel")) {
snode = new FresnelNode();
}
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2011-12-02 20:36:13 UTC (rev 42355)
@@ -127,7 +127,6 @@
switch(b_node.type()) {
/* not supported */
- case BL::ShaderNode::type_CAMERA: break;
case BL::ShaderNode::type_CURVE_RGB: break;
case BL::ShaderNode::type_CURVE_VEC: break;
case BL::ShaderNode::type_GEOMETRY: break;
@@ -155,6 +154,10 @@
node = value;
break;
}
+ case BL::ShaderNode::type_CAMERA: {
+ node = new CameraNode();
+ break;
+ }
case BL::ShaderNode::type_MIX_RGB: {
BL::ShaderNodeMixRGB b_mix_node(b_node);
MixNode *mix = new MixNode();
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-12-02 20:36:13 UTC (rev 42355)
@@ -54,6 +54,7 @@
svm/svm.h
svm/svm_attribute.h
svm/svm_bsdf.h
+ svm/svm_camera.h
svm/svm_closure.h
svm/svm_convert.h
svm/svm_displace.h
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-02 20:36:13 UTC (rev 42355)
@@ -7,6 +7,7 @@
node_background.osl
node_blend_texture.osl
node_bump.osl
+ node_camera.osl
node_clouds_texture.osl
node_convert_from_color.osl
node_convert_from_float.osl
Added: trunk/blender/intern/cycles/kernel/osl/nodes/node_camera.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_camera.osl (rev 0)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_camera.osl 2011-12-02 20:36:13 UTC (rev 42355)
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011, 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"
+
+shader node_camera(
+ output vector ViewVector = vector(0.0, 0.0, 0.0),
+ output float ViewZDepth = 0.0,
+ output float ViewDistance = 0.0)
+{
+ ViewVector = (vector)transform("world", "camera", P);
+
+ ViewZDepth = fabs(ViewVector[2]);
+ ViewDistance = lenght(ViewVector);
+
+ ViewVector = normalize(ViewVector);
+}
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h 2011-12-02 20:36:13 UTC (rev 42355)
@@ -126,6 +126,7 @@
#include "svm_convert.h"
#include "svm_displace.h"
#include "svm_fresnel.h"
+#include "svm_camera.h"
#include "svm_geometry.h"
#include "svm_hsv.h"
#include "svm_image.h"
@@ -232,6 +233,9 @@
svm_node_tex_magic(kg, sd, stack, node, &offset);
break;
#endif
+ case NODE_CAMERA:
+ svm_node_camera(kg, sd, stack, node.y, node.z, node.w);
+ break;
case NODE_GEOMETRY:
svm_node_geometry(sd, stack, node.y, node.z);
break;
Added: trunk/blender/intern/cycles/kernel/svm/svm_camera.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_camera.h (rev 0)
+++ trunk/blender/intern/cycles/kernel/svm/svm_camera.h 2011-12-02 20:36:13 UTC (rev 42355)
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2011, 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.
+ */
+
+CCL_NAMESPACE_BEGIN
+
+__device void svm_node_camera(KernelGlobals *kg, ShaderData *sd, float *stack, uint out_vector, uint out_zdepth, uint out_distance)
+{
+ float distance;
+ float zdepth;
+ float3 vector;
+
+ Transform tfm = kernel_data.cam.worldtocamera;
+ vector = transform(&tfm, sd->P);
+ zdepth = vector.z;
+ distance = len(vector);
+
+ if (stack_valid(out_vector))
+ stack_store_float3(stack, out_vector, normalize(vector));
+
+ if (stack_valid(out_zdepth))
+ stack_store_float(stack, out_zdepth, zdepth);
+
+ if (stack_valid(out_distance))
+ stack_store_float(stack, out_distance, distance);
+}
+
+CCL_NAMESPACE_END
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_types.h 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/kernel/svm/svm_types.h 2011-12-02 20:36:13 UTC (rev 42355)
@@ -82,7 +82,8 @@
NODE_CLOSURE_VOLUME = 4900,
NODE_SEPARATE_RGB = 5000,
NODE_COMBINE_RGB = 5100,
- NODE_HSV = 5200
+ NODE_HSV = 5200,
+ NODE_CAMERA = 5300
} NodeType;
typedef enum NodeAttributeType {
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2011-12-02 20:36:13 UTC (rev 42355)
@@ -1804,6 +1804,33 @@
compiler.add(this, "node_attribute");
}
+/* Camera */
+
+CameraNode::CameraNode()
+: ShaderNode("camera")
+{
+ add_output("View Vector", SHADER_SOCKET_VECTOR);
+ add_output("View Z Depth", SHADER_SOCKET_FLOAT);
+ add_output("View Distance", SHADER_SOCKET_FLOAT);
+}
+
+void CameraNode::compile(SVMCompiler& compiler)
+{
+ ShaderOutput *vector_out = output("View Vector");
+ ShaderOutput *z_depth_out = output("View Z Depth");
+ ShaderOutput *distance_out = output("View Distance");
+
+ compiler.stack_assign(vector_out);
+ compiler.stack_assign(z_depth_out);
+ compiler.stack_assign(distance_out);
+ compiler.add_node(NODE_CAMERA, vector_out->stack_offset, z_depth_out->stack_offset, distance_out->stack_offset);
+}
+
+void CameraNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_camera");
+}
+
/* Fresnel */
FresnelNode::FresnelNode()
Modified: trunk/blender/intern/cycles/render/nodes.h
===================================================================
--- trunk/blender/intern/cycles/render/nodes.h 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/intern/cycles/render/nodes.h 2011-12-02 20:36:13 UTC (rev 42355)
@@ -315,6 +315,11 @@
ustring attribute;
};
+class CameraNode : public ShaderNode {
+public:
+ SHADER_NODE_CLASS(CameraNode)
+};
+
class FresnelNode : public ShaderNode {
public:
SHADER_NODE_CLASS(FresnelNode)
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c 2011-12-02 19:49:09 UTC (rev 42354)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_camera.c 2011-12-02 20:36:13 UTC (rev 42355)
@@ -62,7 +62,7 @@
static bNodeType ntype;
node_type_base(ttype, &ntype, SH_NODE_CAMERA, "Camera Data", NODE_CLASS_INPUT, 0);
- node_type_compatibility(&ntype, NODE_OLD_SHADING);
+ node_type_compatibility(&ntype, NODE_OLD_SHADING|NODE_NEW_SHADING);
node_type_socket_templates(&ntype, NULL, sh_node_camera_out);
node_type_size(&ntype, 95, 95, 120);
node_type_storage(&ntype, "node_camera", NULL, NULL);
More information about the Bf-blender-cvs
mailing list