[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57424] branches/soc-2013-dingto: Cycles / Blackbody node:
Thomas Dinges
blender at dingto.org
Thu Jun 13 10:55:51 CEST 2013
Revision: 57424
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57424
Author: dingto
Date: 2013-06-13 08:55:51 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Cycles / Blackbody node:
* First step towards a Blackbody to RGB converter. You can specify a color in Kelvin inside the node.
* Only implemented for OSL atm, SVM will follow.
Modified Paths:
--------------
branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-dingto/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
branches/soc-2013-dingto/intern/cycles/render/nodes.h
branches/soc-2013-dingto/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c
branches/soc-2013-dingto/source/blender/nodes/CMakeLists.txt
branches/soc-2013-dingto/source/blender/nodes/NOD_shader.h
branches/soc-2013-dingto/source/blender/nodes/NOD_static_types.h
Added Paths:
-----------
branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_blackbody.osl
branches/soc-2013-dingto/source/blender/nodes/shader/nodes/node_shader_blackbody.c
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_shader.cpp 2013-06-13 08:55:51 UTC (rev 57424)
@@ -400,6 +400,9 @@
else if (b_node.is_a(&RNA_ShaderNodeWavelength)) {
node = new WavelengthNode();
}
+ else if (b_node.is_a(&RNA_ShaderNodeBlackbody)) {
+ node = new BlackbodyNode();
+ }
else if (b_node.is_a(&RNA_ShaderNodeLightPath)) {
node = new LightPathNode();
}
Modified: branches/soc-2013-dingto/intern/cycles/kernel/shaders/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/shaders/CMakeLists.txt 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/intern/cycles/kernel/shaders/CMakeLists.txt 2013-06-13 08:55:51 UTC (rev 57424)
@@ -68,6 +68,7 @@
node_voronoi_texture.osl
node_ward_bsdf.osl
node_wavelength.osl
+ node_blackbody.osl
node_wave_texture.osl
node_wireframe.osl
)
Added: branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_blackbody.osl
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_blackbody.osl (rev 0)
+++ branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_blackbody.osl 2013-06-13 08:55:51 UTC (rev 57424)
@@ -0,0 +1,27 @@
+/*
+ * 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"
+
+shader node_blackbody(
+ float Temperature = 1200.0,
+ output color Color = 0.0)
+{
+ Color = blackbody(Temperature);
+}
+
Modified: branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_types.h 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_types.h 2013-06-13 08:55:51 UTC (rev 57424)
@@ -53,6 +53,7 @@
NODE_FRESNEL,
NODE_WIREFRAME,
NODE_WAVELENGTH,
+ NODE_BLACKBODY,
NODE_EMISSION_WEIGHT,
NODE_TEX_GRADIENT,
NODE_TEX_VORONOI,
Modified: branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/nodes.cpp 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/intern/cycles/render/nodes.cpp 2013-06-13 08:55:51 UTC (rev 57424)
@@ -2977,6 +2977,32 @@
compiler.add(this, "node_wavelength");
}
+/* Blackbody */
+
+BlackbodyNode::BlackbodyNode()
+: ShaderNode("Blackbody")
+{
+ add_input("Temperature", SHADER_SOCKET_FLOAT, 1200.0f);
+ add_output("Color", SHADER_SOCKET_COLOR);
+}
+
+void BlackbodyNode::compile(SVMCompiler& compiler)
+{
+/*
+ ShaderInput *temperature in = input("Temperature");
+ ShaderOutput *color_out = output("Color");
+
+ compiler.stack_assign(temperature_in);
+ compiler.stack_assign(color_out);
+ compiler.add_node(NODE_BLACKBODY, temperature_in->stack_offset, color_out->stack_offset);
+*/
+}
+
+void BlackbodyNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_blackbody");
+}
+
/* Output */
OutputNode::OutputNode()
Modified: branches/soc-2013-dingto/intern/cycles/render/nodes.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/nodes.h 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/intern/cycles/render/nodes.h 2013-06-13 08:55:51 UTC (rev 57424)
@@ -462,6 +462,11 @@
SHADER_NODE_CLASS(WavelengthNode)
};
+class BlackbodyNode : public ShaderNode {
+public:
+ SHADER_NODE_CLASS(BlackbodyNode)
+};
+
class MathNode : public ShaderNode {
public:
SHADER_NODE_CLASS(MathNode)
Modified: branches/soc-2013-dingto/release/scripts/startup/nodeitems_builtins.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/nodeitems_builtins.py 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/release/scripts/startup/nodeitems_builtins.py 2013-06-13 08:55:51 UTC (rev 57424)
@@ -219,6 +219,7 @@
NodeItem("ShaderNodeSeparateRGB"),
NodeItem("ShaderNodeCombineRGB"),
NodeItem("ShaderNodeWavelength"),
+ NodeItem("ShaderNodeBlackbody"),
]),
ShaderNewNodeCategory("SH_NEW_SCRIPT", "Script", items=[
NodeItem("ShaderNodeScript"),
Modified: branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h 2013-06-13 08:55:51 UTC (rev 57424)
@@ -742,6 +742,7 @@
#define SH_NODE_WIREFRAME 178
#define SH_NODE_BSDF_TOON 179
#define SH_NODE_WAVELENGTH 180
+#define SH_NODE_BLACKBODY 181
/* custom defines options for Material node */
#define SH_NODE_MAT_DIFF 1
Modified: branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c 2013-06-13 08:55:51 UTC (rev 57424)
@@ -3403,6 +3403,7 @@
register_node_type_sh_rgb();
register_node_type_sh_wireframe();
register_node_type_sh_wavelength();
+ register_node_type_sh_blackbody();
register_node_type_sh_mix_rgb();
register_node_type_sh_valtorgb();
register_node_type_sh_rgbtobw();
Modified: branches/soc-2013-dingto/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/source/blender/nodes/CMakeLists.txt 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/source/blender/nodes/CMakeLists.txt 2013-06-13 08:55:51 UTC (rev 57424)
@@ -146,6 +146,7 @@
shader/nodes/node_shader_value.c
shader/nodes/node_shader_wireframe.c
shader/nodes/node_shader_wavelength.c
+ shader/nodes/node_shader_blackbody.c
shader/nodes/node_shader_vectMath.c
shader/nodes/node_shader_add_shader.c
shader/nodes/node_shader_ambient_occlusion.c
Modified: branches/soc-2013-dingto/source/blender/nodes/NOD_shader.h
===================================================================
--- branches/soc-2013-dingto/source/blender/nodes/NOD_shader.h 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/source/blender/nodes/NOD_shader.h 2013-06-13 08:55:51 UTC (rev 57424)
@@ -81,6 +81,7 @@
void register_node_type_sh_fresnel(void);
void register_node_type_sh_wireframe(void);
void register_node_type_sh_wavelength(void);
+void register_node_type_sh_blackbody(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);
Modified: branches/soc-2013-dingto/source/blender/nodes/NOD_static_types.h
===================================================================
--- branches/soc-2013-dingto/source/blender/nodes/NOD_static_types.h 2013-06-13 08:06:09 UTC (rev 57423)
+++ branches/soc-2013-dingto/source/blender/nodes/NOD_static_types.h 2013-06-13 08:55:51 UTC (rev 57424)
@@ -97,6 +97,7 @@
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_WAVELENGTH, 0, "WAVELENGTH", Wavelength, "Wavelength", "" )
+DefNode( ShaderNode, SH_NODE_BLACKBODY, 0, "BLACKBODY", Blackbody, "Blackbody", "" )
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", "" )
Added: branches/soc-2013-dingto/source/blender/nodes/shader/nodes/node_shader_blackbody.c
===================================================================
--- branches/soc-2013-dingto/source/blender/nodes/shader/nodes/node_shader_blackbody.c (rev 0)
+++ branches/soc-2013-dingto/source/blender/nodes/shader/nodes/node_shader_blackbody.c 2013-06-13 08:55:51 UTC (rev 57424)
@@ -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.
+ *
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list