Revision: 43679
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43679
Author: campbellbarton
Date: 2012-01-24 20:19:09 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43664:43676
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43664
Modified Paths:
--------------
branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp
branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/svm/svm.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h
branches/bmesh/blender/intern/cycles/render/nodes.cpp
branches/bmesh/blender/intern/cycles/render/nodes.h
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/interface/resources.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c
branches/bmesh/blender/source/blender/editors/space_file/filesel.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_edit.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_info/info_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree_types.h
branches/bmesh/blender/source/blender/nodes/CMakeLists.txt
branches/bmesh/blender/source/blender/nodes/NOD_shader.h
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl
branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
Property Changed:
----------------
branches/bmesh/blender/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43664
+
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43676
Modified: branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp 2012-01-24
20:13:44 UTC (rev 43678)
+++ branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp 2012-01-24
20:19:09 UTC (rev 43679)
@@ -462,6 +462,9 @@
else if(string_iequals(node.name(), "gamma")) {
snode = new GammaNode();
}
+ else if(string_iequals(node.name(), "brightness")) {
+ snode = new BrightContrastNode();
+ }
else if(string_iequals(node.name(), "combine_rgb")) {
snode = new CombineRGBNode();
}
Modified: branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
2012-01-24 20:13:44 UTC (rev 43678)
+++ branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
2012-01-24 20:19:09 UTC (rev 43679)
@@ -142,6 +142,10 @@
node = new GammaNode();
break;
}
+ case BL::ShaderNode::type_BRIGHTCONTRAST: {
+ node = new BrightContrastNode();
+ break;
+ }
case BL::ShaderNode::type_MIX_RGB: {
BL::ShaderNodeMixRGB b_mix_node(b_node);
MixNode *mix = new MixNode();
Modified: branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt 2012-01-24
20:13:44 UTC (rev 43678)
+++ branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt 2012-01-24
20:19:09 UTC (rev 43679)
@@ -61,6 +61,7 @@
svm/svm_displace.h
svm/svm_fresnel.h
svm/svm_gamma.h
+ svm/svm_brightness.h
svm/svm_geometry.h
svm/svm_gradient.h
svm/svm_hsv.h
Modified: branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
2012-01-24 20:13:44 UTC (rev 43678)
+++ branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
2012-01-24 20:19:09 UTC (rev 43679)
@@ -20,6 +20,7 @@
node_environment_texture.osl
node_fresnel.osl
node_gamma.osl
+ node_brightness.osl
node_geometry.osl
node_glass_bsdf.osl
node_glossy_bsdf.osl
Copied:
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl (from
rev 43676, trunk/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl)
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl
(rev 0)
+++ branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl
2012-01-24 20:19:09 UTC (rev 43679)
@@ -0,0 +1,50 @@
+/*
+ * 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_brightness(
+ color ColorIn = color(0.8, 0.8, 0.8),
+ float Bright = 0.0,
+ float Contrast = 0.0,
+ output ColorOut = color(0.8, 0.8, 0.8)
+{
+ float delta = Contrast * (1.0/200.0);
+ float a = 1.0 - delta * 2.0;
+ float b;
+
+ Bright *= 1.0/100.0;
+
+ /*
+ * The algorithm is by Werner D. Streidt
+ * (http://visca.com/ffactory/archives/5-99/msg00021.html)
+ * Extracted of OpenCV demhist.c
+ */
+
+ if (Contrast > 0.0) {
+ a = (a < 0.0 ? 1.0/a : 0.0);
+ b = a * (Brightness - delta);
+ }
+ else {
+ delta *= -1.0;
+ b = a * (Brightness + delta);
+ }
+
+ ColorOut = a * ColorIn + b;
+}
+
Modified: branches/bmesh/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm.h 2012-01-24
20:13:44 UTC (rev 43678)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm.h 2012-01-24
20:19:09 UTC (rev 43679)
@@ -131,6 +131,7 @@
#include "svm_hsv.h"
#include "svm_image.h"
#include "svm_gamma.h"
+#include "svm_brightness.h"
#include "svm_invert.h"
#include "svm_light_path.h"
#include "svm_magic.h"
@@ -270,6 +271,9 @@
case NODE_GAMMA:
svm_node_gamma(sd, stack, node.y, node.z,
node.w);
break;
+ case NODE_BRIGHTCONTRAST:
+ svm_node_brightness(sd, stack, node.y, node.z,
node.w);
+ break;
case NODE_MIX:
svm_node_mix(kg, sd, stack, node.y, node.z,
node.w, &offset);
break;
Copied: branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h (from
rev 43676, trunk/blender/intern/cycles/kernel/svm/svm_brightness.h)
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h
(rev 0)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h
2012-01-24 20:19:09 UTC (rev 43679)
@@ -0,0 +1,57 @@
+/*
+ * 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_brightness(ShaderData *sd, float *stack, uint in_color,
uint out_color, uint node)
+{
+ uint bright_offset, contrast_offset;
+ float3 color = stack_load_float3(stack, in_color);
+
+ decode_node_uchar4(node, &bright_offset, &contrast_offset, NULL, NULL);
+ float brightness = stack_load_float(stack, bright_offset);
+ float contrast = stack_load_float(stack, contrast_offset);
+
+ brightness *= 1.0f/100.0f;
+ float delta = contrast * (1.0f/200.0f);
+ float a = 1.0f - delta * 2.0f;
+ float b;
+
+ /*
+ * The algorithm is by Werner D. Streidt
+ * (http://visca.com/ffactory/archives/5-99/msg00021.html)
+ * Extracted of OpenCV demhist.c
+ */
+ if (contrast > 0.0f) {
+ a = (a > 0.0f? (1.0f / a): 0.0f);
+ b = a * (brightness - delta);
+ }
+ else {
+ delta *= -1.0f;
+ b = a * (brightness + delta);
+ }
+
+ color.x = a*color.x + b;
+ color.y = a*color.y + b;
+ color.z = a*color.z + b;
+
+ if (stack_valid(out_color))
+ stack_store_float3(stack, out_color, color);
+}
+
+CCL_NAMESPACE_END
Modified: branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h 2012-01-24
20:13:44 UTC (rev 43678)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h 2012-01-24
20:19:09 UTC (rev 43679)
@@ -87,7 +87,8 @@
NODE_INVERT = 5400,
NODE_NORMAL = 5500,
NODE_GAMMA = 5600,
- NODE_TEX_CHECKER = 5700
+ NODE_TEX_CHECKER = 5700,
+ NODE_BRIGHTCONTRAST = 5800
} NodeType;
typedef enum NodeAttributeType {
Modified: branches/bmesh/blender/intern/cycles/render/nodes.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/render/nodes.cpp 2012-01-24
20:13:44 UTC (rev 43678)
+++ branches/bmesh/blender/intern/cycles/render/nodes.cpp 2012-01-24
20:19:09 UTC (rev 43679)
@@ -1820,6 +1820,38 @@
compiler.add(this, "node_gamma");
}
+/* Bright Contrast */
+BrightContrastNode::BrightContrastNode()
+: ShaderNode("brightness")
+{
+ add_input("Color", SHADER_SOCKET_COLOR);
+ add_input("Bright", SHADER_SOCKET_FLOAT);
+ add_input("Contrast", SHADER_SOCKET_FLOAT);
+ add_output("Color", SHADER_SOCKET_COLOR);
+}
+
+void BrightContrastNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *color_in = input("Color");
+ ShaderInput *bright_in = input("Bright");
+ ShaderInput *contrast_in = input("Contrast");
+ ShaderOutput *color_out = output("Color");
+
+ compiler.stack_assign(color_in);
+ compiler.stack_assign(bright_in);
+ compiler.stack_assign(contrast_in);
+ compiler.stack_assign(color_out);
+
+ compiler.add_node(NODE_BRIGHTCONTRAST,
+ color_in->stack_offset, color_out->stack_offset,
+ compiler.encode_uchar4(bright_in->stack_offset,
contrast_in->stack_offset));
+}
+
+void BrightContrastNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_brightness");
+}
+
/* Separate RGB */
SeparateRGBNode::SeparateRGBNode()
: ShaderNode("separate_rgb")
Modified: branches/bmesh/blender/intern/cycles/render/nodes.h
===================================================================
--- branches/bmesh/blender/intern/cycles/render/nodes.h 2012-01-24 20:13:44 UTC
(rev 43678)
+++ branches/bmesh/blender/intern/cycles/render/nodes.h 2012-01-24 20:19:09 UTC
(rev 43679)
@@ -320,6 +320,11 @@
SHADER_NODE_CLASS(GammaNode)
};
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
