[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45173] trunk/blender: Cycles: add ColorRamp node.
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Mar 26 14:45:14 CEST 2012
Revision: 45173
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45173
Author: blendix
Date: 2012-03-26 12:45:14 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Cycles: add ColorRamp node.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/blender/blender_util.h
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/kernel_types.h
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/intern/cycles/render/svm.cpp
trunk/blender/intern/cycles/render/svm.h
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
Added Paths:
-----------
trunk/blender/intern/cycles/kernel/svm/svm_ramp.h
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-03-26 12:45:14 UTC (rev 45173)
@@ -105,7 +105,6 @@
switch(b_node.type()) {
/* not supported */
- case BL::ShaderNode::type_CURVE_RGB: break;
case BL::ShaderNode::type_CURVE_VEC: break;
case BL::ShaderNode::type_GEOMETRY: break;
case BL::ShaderNode::type_MATERIAL: break;
@@ -114,10 +113,21 @@
case BL::ShaderNode::type_SCRIPT: break;
case BL::ShaderNode::type_SQUEEZE: break;
case BL::ShaderNode::type_TEXTURE: break;
- case BL::ShaderNode::type_VALTORGB: break;
/* handled outside this function */
case BL::ShaderNode::type_GROUP: break;
/* existing blender nodes */
+ case BL::ShaderNode::type_CURVE_RGB: {
+ RGBCurvesNode *ramp = new RGBCurvesNode();
+ node = ramp;
+ break;
+ }
+ case BL::ShaderNode::type_VALTORGB: {
+ RGBRampNode *ramp = new RGBRampNode();
+ BL::ShaderNodeValToRGB b_ramp_node(b_node);
+ colorramp_to_array(b_ramp_node.color_ramp(), ramp->ramp, RAMP_TABLE_SIZE);
+ node = ramp;
+ break;
+ }
case BL::ShaderNode::type_RGB: {
ColorNode *color = new ColorNode();
color->value = get_node_output_rgba(b_node, "Color");
Modified: trunk/blender/intern/cycles/blender/blender_util.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_util.h 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/blender/blender_util.h 2012-03-26 12:45:14 UTC (rev 45173)
@@ -50,6 +50,7 @@
void engine_tag_update(void *engine);
int rna_Object_is_modified(void *ob, void *scene, int settings);
void BLI_timestr(double _time, char *str);
+void rna_ColorRamp_eval(void *coba, float position, float color[4]);
}
@@ -63,6 +64,16 @@
return BL::Mesh(ptr);
}
+static inline void colorramp_to_array(BL::ColorRamp ramp, float4 *data, int size)
+{
+ for(int i = 0; i < size; i++) {
+ float color[4];
+
+ rna_ColorRamp_eval(ramp.ptr.data, i/(float)(size-1), color);
+ data[i] = make_float4(color[0], color[1], color[2], color[3]);
+ }
+}
+
static inline void object_remove_mesh(BL::BlendData data, BL::Mesh mesh)
{
rna_Main_meshes_remove(data.ptr.data, NULL, mesh.ptr.data);
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-03-26 12:45:14 UTC (rev 45173)
@@ -78,6 +78,7 @@
svm/svm_noise.h
svm/svm_noisetex.h
svm/svm_normal.h
+ svm/svm_ramp.h
svm/svm_sepcomb_rgb.h
svm/svm_sky.h
svm/svm_tex_coord.h
Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h 2012-03-26 12:45:14 UTC (rev 45173)
@@ -29,6 +29,7 @@
#define OBJECT_SIZE 16
#define LIGHT_SIZE 4
#define FILTER_TABLE_SIZE 256
+#define RAMP_TABLE_SIZE 256
/* device capabilities */
#ifdef __KERNEL_CPU__
Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h 2012-03-26 12:45:14 UTC (rev 45173)
@@ -104,6 +104,12 @@
return f;
}
+__device_inline float4 fetch_node_float(KernelGlobals *kg, int offset)
+{
+ uint4 node = kernel_tex_fetch(__svm_nodes, offset);
+ return make_float4(__int_as_float(node.x), __int_as_float(node.y), __int_as_float(node.z), __int_as_float(node.w));
+}
+
__device_inline void decode_node_uchar4(uint i, uint *x, uint *y, uint *z, uint *w)
{
if(x) *x = (i & 0xFF);
@@ -140,6 +146,7 @@
#include "svm_wave.h"
#include "svm_math.h"
#include "svm_mix.h"
+#include "svm_ramp.h"
#include "svm_sepcomb_rgb.h"
#include "svm_musgrave.h"
#include "svm_sky.h"
@@ -331,6 +338,12 @@
case NODE_EMISSION_SET_WEIGHT_TOTAL:
svm_node_emission_set_weight_total(kg, sd, node.y, node.z, node.w);
break;
+ case NODE_RGB_RAMP:
+ svm_node_rgb_ramp(kg, sd, stack, node, &offset);
+ break;
+ case NODE_RGB_CURVES:
+ svm_node_rgb_curves(kg, sd, stack, node, &offset);
+ break;
case NODE_END:
default:
#ifndef __MULTI_CLOSURE__
Added: trunk/blender/intern/cycles/kernel/svm/svm_ramp.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_ramp.h (rev 0)
+++ trunk/blender/intern/cycles/kernel/svm/svm_ramp.h 2012-03-26 12:45:14 UTC (rev 45173)
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+#ifndef __SVM_RAMP_H__
+#define __SVM_RAMP_H__
+
+CCL_NAMESPACE_BEGIN
+
+__device float4 rgb_ramp_lookup(KernelGlobals *kg, int offset, float f)
+{
+ f = clamp(f, 0.0f, 1.0f)*(RAMP_TABLE_SIZE-1);
+
+ int i = (int)f;
+ float t = f - (float)i;
+
+ float4 a = fetch_node_float(kg, offset+i);
+
+ if(t > 0.0f)
+ a = (1.0f - t)*a + t*fetch_node_float(kg, offset+i+1);
+
+ return a;
+}
+
+__device void svm_node_rgb_ramp(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
+{
+ uint fac_offset = node.y;
+ uint color_offset = node.z;
+
+ float fac = stack_load_float(stack, fac_offset);
+ float4 color = rgb_ramp_lookup(kg, *offset, fac);
+
+ stack_store_float3(stack, color_offset, float4_to_float3(color));
+
+ *offset += RAMP_TABLE_SIZE;
+}
+
+__device void svm_node_rgb_curves(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
+{
+ uint fac_offset = node.y;
+ uint color_offset = node.z;
+ uint out_offset = node.w;
+
+ float fac = stack_load_float(stack, fac_offset);
+ float3 color = stack_load_float3(stack, color_offset);
+
+ float r = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.x).w).x;
+ float g = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.y).w).y;
+ float b = rgb_ramp_lookup(kg, *offset, rgb_ramp_lookup(kg, *offset, color.z).w).z;
+
+ color = (1.0f - fac)*color + fac*make_float3(r, g, b);
+ stack_store_float3(stack, out_offset, color);
+
+ *offset += RAMP_TABLE_SIZE;
+}
+
+CCL_NAMESPACE_END
+
+#endif /* __SVM_RAMP_H__ */
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_types.h 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/kernel/svm/svm_types.h 2012-03-26 12:45:14 UTC (rev 45173)
@@ -88,7 +88,9 @@
NODE_NORMAL = 5500,
NODE_GAMMA = 5600,
NODE_TEX_CHECKER = 5700,
- NODE_BRIGHTCONTRAST = 5800
+ NODE_BRIGHTCONTRAST = 5800,
+ NODE_RGB_RAMP = 5900,
+ NODE_RGB_CURVES = 6000
} NodeType;
typedef enum NodeAttributeType {
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2012-03-26 12:45:14 UTC (rev 45173)
@@ -2352,5 +2352,60 @@
compiler.add(this, "node_bump");
}
+/* RGBCurvesNode */
+
+RGBCurvesNode::RGBCurvesNode()
+: ShaderNode("rgb_curves")
+{
+ add_input("Fac", SHADER_SOCKET_FLOAT);
+ add_input("Color", SHADER_SOCKET_COLOR);
+ add_output("Color", SHADER_SOCKET_COLOR);
+}
+
+void RGBCurvesNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *fac_in = input("Fac");
+ ShaderInput *color_in = input("Color");
+ ShaderOutput *color_out = output("Color");
+
+ compiler.stack_assign(fac_in);
+ compiler.stack_assign(color_in);
+ compiler.stack_assign(color_out);
+
+ compiler.add_node(NODE_RGB_CURVES, fac_in->stack_offset, color_in->stack_offset, color_out->stack_offset);
+ compiler.add_array(curves, RAMP_TABLE_SIZE);
+}
+
+void RGBCurvesNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_rgb_curves");
+}
+
+/* RGBRampNode */
+
+RGBRampNode::RGBRampNode()
+: ShaderNode("rgb_ramp")
+{
+ add_input("Fac", SHADER_SOCKET_FLOAT);
+ add_output("Color", SHADER_SOCKET_COLOR);
+}
+
+void RGBRampNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *fac_in = input("Fac");
+ ShaderOutput *color_out = output("Color");
+
+ compiler.stack_assign(fac_in);
+ compiler.stack_assign(color_out);
+
+ compiler.add_node(NODE_RGB_RAMP, fac_in->stack_offset, color_out->stack_offset);
+ compiler.add_array(ramp, RAMP_TABLE_SIZE);
+}
+
+void RGBRampNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_rgb_ramp");
+}
+
CCL_NAMESPACE_END
Modified: trunk/blender/intern/cycles/render/nodes.h
===================================================================
--- trunk/blender/intern/cycles/render/nodes.h 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/render/nodes.h 2012-03-26 12:45:14 UTC (rev 45173)
@@ -390,6 +390,18 @@
SHADER_NODE_CLASS(BumpNode)
};
+class RGBCurvesNode : public ShaderNode {
+public:
+ SHADER_NODE_CLASS(RGBCurvesNode)
+ float4 curves[RAMP_TABLE_SIZE];
+};
+
+class RGBRampNode : public ShaderNode {
+public:
+ SHADER_NODE_CLASS(RGBRampNode)
+ float4 ramp[RAMP_TABLE_SIZE];
+};
+
CCL_NAMESPACE_END
#endif /* __NODES_H__ */
Modified: trunk/blender/intern/cycles/render/svm.cpp
===================================================================
--- trunk/blender/intern/cycles/render/svm.cpp 2012-03-26 12:43:48 UTC (rev 45172)
+++ trunk/blender/intern/cycles/render/svm.cpp 2012-03-26 12:45:14 UTC (rev 45173)
@@ -326,6 +326,12 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list