forked from bartvdbraak/blender
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.
This commit is contained in:
parent
182914873a
commit
d523d27e62
@ -400,6 +400,9 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen
|
|||||||
else if (b_node.is_a(&RNA_ShaderNodeWavelength)) {
|
else if (b_node.is_a(&RNA_ShaderNodeWavelength)) {
|
||||||
node = new WavelengthNode();
|
node = new WavelengthNode();
|
||||||
}
|
}
|
||||||
|
else if (b_node.is_a(&RNA_ShaderNodeBlackbody)) {
|
||||||
|
node = new BlackbodyNode();
|
||||||
|
}
|
||||||
else if (b_node.is_a(&RNA_ShaderNodeLightPath)) {
|
else if (b_node.is_a(&RNA_ShaderNodeLightPath)) {
|
||||||
node = new LightPathNode();
|
node = new LightPathNode();
|
||||||
}
|
}
|
||||||
|
@ -68,6 +68,7 @@ set(SRC_OSL
|
|||||||
node_voronoi_texture.osl
|
node_voronoi_texture.osl
|
||||||
node_ward_bsdf.osl
|
node_ward_bsdf.osl
|
||||||
node_wavelength.osl
|
node_wavelength.osl
|
||||||
|
node_blackbody.osl
|
||||||
node_wave_texture.osl
|
node_wave_texture.osl
|
||||||
node_wireframe.osl
|
node_wireframe.osl
|
||||||
)
|
)
|
||||||
|
27
intern/cycles/kernel/shaders/node_blackbody.osl
Normal file
27
intern/cycles/kernel/shaders/node_blackbody.osl
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
|
@ -53,6 +53,7 @@ typedef enum NodeType {
|
|||||||
NODE_FRESNEL,
|
NODE_FRESNEL,
|
||||||
NODE_WIREFRAME,
|
NODE_WIREFRAME,
|
||||||
NODE_WAVELENGTH,
|
NODE_WAVELENGTH,
|
||||||
|
NODE_BLACKBODY,
|
||||||
NODE_EMISSION_WEIGHT,
|
NODE_EMISSION_WEIGHT,
|
||||||
NODE_TEX_GRADIENT,
|
NODE_TEX_GRADIENT,
|
||||||
NODE_TEX_VORONOI,
|
NODE_TEX_VORONOI,
|
||||||
|
@ -2977,6 +2977,32 @@ void WavelengthNode::compile(OSLCompiler& compiler)
|
|||||||
compiler.add(this, "node_wavelength");
|
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 */
|
/* Output */
|
||||||
|
|
||||||
OutputNode::OutputNode()
|
OutputNode::OutputNode()
|
||||||
|
@ -462,6 +462,11 @@ public:
|
|||||||
SHADER_NODE_CLASS(WavelengthNode)
|
SHADER_NODE_CLASS(WavelengthNode)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class BlackbodyNode : public ShaderNode {
|
||||||
|
public:
|
||||||
|
SHADER_NODE_CLASS(BlackbodyNode)
|
||||||
|
};
|
||||||
|
|
||||||
class MathNode : public ShaderNode {
|
class MathNode : public ShaderNode {
|
||||||
public:
|
public:
|
||||||
SHADER_NODE_CLASS(MathNode)
|
SHADER_NODE_CLASS(MathNode)
|
||||||
|
@ -219,6 +219,7 @@ shader_node_categories = [
|
|||||||
NodeItem("ShaderNodeSeparateRGB"),
|
NodeItem("ShaderNodeSeparateRGB"),
|
||||||
NodeItem("ShaderNodeCombineRGB"),
|
NodeItem("ShaderNodeCombineRGB"),
|
||||||
NodeItem("ShaderNodeWavelength"),
|
NodeItem("ShaderNodeWavelength"),
|
||||||
|
NodeItem("ShaderNodeBlackbody"),
|
||||||
]),
|
]),
|
||||||
ShaderNewNodeCategory("SH_NEW_SCRIPT", "Script", items=[
|
ShaderNewNodeCategory("SH_NEW_SCRIPT", "Script", items=[
|
||||||
NodeItem("ShaderNodeScript"),
|
NodeItem("ShaderNodeScript"),
|
||||||
|
@ -742,6 +742,7 @@ struct ShadeResult;
|
|||||||
#define SH_NODE_WIREFRAME 178
|
#define SH_NODE_WIREFRAME 178
|
||||||
#define SH_NODE_BSDF_TOON 179
|
#define SH_NODE_BSDF_TOON 179
|
||||||
#define SH_NODE_WAVELENGTH 180
|
#define SH_NODE_WAVELENGTH 180
|
||||||
|
#define SH_NODE_BLACKBODY 181
|
||||||
|
|
||||||
/* custom defines options for Material node */
|
/* custom defines options for Material node */
|
||||||
#define SH_NODE_MAT_DIFF 1
|
#define SH_NODE_MAT_DIFF 1
|
||||||
|
@ -3403,6 +3403,7 @@ static void registerShaderNodes(void)
|
|||||||
register_node_type_sh_rgb();
|
register_node_type_sh_rgb();
|
||||||
register_node_type_sh_wireframe();
|
register_node_type_sh_wireframe();
|
||||||
register_node_type_sh_wavelength();
|
register_node_type_sh_wavelength();
|
||||||
|
register_node_type_sh_blackbody();
|
||||||
register_node_type_sh_mix_rgb();
|
register_node_type_sh_mix_rgb();
|
||||||
register_node_type_sh_valtorgb();
|
register_node_type_sh_valtorgb();
|
||||||
register_node_type_sh_rgbtobw();
|
register_node_type_sh_rgbtobw();
|
||||||
|
@ -146,6 +146,7 @@ set(SRC
|
|||||||
shader/nodes/node_shader_value.c
|
shader/nodes/node_shader_value.c
|
||||||
shader/nodes/node_shader_wireframe.c
|
shader/nodes/node_shader_wireframe.c
|
||||||
shader/nodes/node_shader_wavelength.c
|
shader/nodes/node_shader_wavelength.c
|
||||||
|
shader/nodes/node_shader_blackbody.c
|
||||||
shader/nodes/node_shader_vectMath.c
|
shader/nodes/node_shader_vectMath.c
|
||||||
shader/nodes/node_shader_add_shader.c
|
shader/nodes/node_shader_add_shader.c
|
||||||
shader/nodes/node_shader_ambient_occlusion.c
|
shader/nodes/node_shader_ambient_occlusion.c
|
||||||
|
@ -81,6 +81,7 @@ void register_node_type_sh_object_info(void);
|
|||||||
void register_node_type_sh_fresnel(void);
|
void register_node_type_sh_fresnel(void);
|
||||||
void register_node_type_sh_wireframe(void);
|
void register_node_type_sh_wireframe(void);
|
||||||
void register_node_type_sh_wavelength(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_layer_weight(void);
|
||||||
void register_node_type_sh_tex_coord(void);
|
void register_node_type_sh_tex_coord(void);
|
||||||
void register_node_type_sh_particle_info(void);
|
void register_node_type_sh_particle_info(void);
|
||||||
|
@ -97,6 +97,7 @@ DefNode( ShaderNode, SH_NODE_PARTICLE_INFO, 0, "PA
|
|||||||
DefNode( ShaderNode, SH_NODE_HAIR_INFO, 0, "HAIR_INFO", HairInfo, "Hair 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_WIREFRAME, def_sh_tex_wireframe, "WIREFRAME", Wireframe, "Wireframe", "" )
|
||||||
DefNode( ShaderNode, SH_NODE_WAVELENGTH, 0, "WAVELENGTH", Wavelength, "Wavelength", "" )
|
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_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_NORMAL_MAP, def_sh_normal_map, "NORMAL_MAP", NormalMap, "Normal Map", "" )
|
||||||
DefNode( ShaderNode, SH_NODE_TANGENT, def_sh_tangent, "TANGENT", Tangent, "Tangent", "" )
|
DefNode( ShaderNode, SH_NODE_TANGENT, def_sh_tangent, "TANGENT", Tangent, "Tangent", "" )
|
||||||
|
54
source/blender/nodes/shader/nodes/node_shader_blackbody.c
Normal file
54
source/blender/nodes/shader/nodes/node_shader_blackbody.c
Normal file
@ -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"
|
||||||
|
|
||||||
|
/* **************** Blackbody ******************** */
|
||||||
|
static bNodeSocketTemplate sh_node_blackbody_in[] = {
|
||||||
|
{ SOCK_FLOAT, 1, N_("Temperature"), 1200.0f, 0.0f, 0.0f, 0.0f, 1.0f, 10000.0f},
|
||||||
|
{ -1, 0, "" }
|
||||||
|
};
|
||||||
|
|
||||||
|
static bNodeSocketTemplate sh_node_blackbody_out[] = {
|
||||||
|
{ SOCK_RGBA, 0, N_("Color")},
|
||||||
|
{ -1, 0, "" }
|
||||||
|
};
|
||||||
|
|
||||||
|
/* node type definition */
|
||||||
|
void register_node_type_sh_blackbody(void)
|
||||||
|
{
|
||||||
|
static bNodeType ntype;
|
||||||
|
|
||||||
|
sh_node_type_base(&ntype, SH_NODE_BLACKBODY, "Blackbody", NODE_CLASS_CONVERTOR, 0);
|
||||||
|
node_type_compatibility(&ntype, NODE_NEW_SHADING);
|
||||||
|
node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
|
||||||
|
node_type_socket_templates(&ntype, sh_node_blackbody_in, sh_node_blackbody_out);
|
||||||
|
node_type_init(&ntype, NULL);
|
||||||
|
node_type_storage(&ntype, "", NULL, NULL);
|
||||||
|
|
||||||
|
nodeRegisterType(&ntype);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user