Revision: 42681
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42681
Author: campbellbarton
Date: 2011-12-17 02:41:53 +0000 (Sat, 17 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42670:42680
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42670
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/avi/intern/avi.c
branches/bmesh/blender/source/blender/avi/intern/codecs.c
branches/bmesh/blender/source/blender/avi/intern/endian.c
branches/bmesh/blender/source/blender/avi/intern/mjpeg.c
branches/bmesh/blender/source/blender/avi/intern/options.c
branches/bmesh/blender/source/blender/avi/intern/rgb32.c
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/ocean.c
branches/bmesh/blender/source/blender/blenkernel/intern/suggestions.c
branches/bmesh/blender/source/blender/blenkernel/intern/text.c
branches/bmesh/blender/source/blender/blenlib/BLI_ghash.h
branches/bmesh/blender/source/blender/blenlib/intern/BLI_dynstr.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_linklist.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_memarena.c
branches/bmesh/blender/source/blender/blenlib/intern/edgehash.c
branches/bmesh/blender/source/blender/blenlib/intern/rand.c
branches/bmesh/blender/source/blender/blenlib/intern/winstuff.c
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_navmesh.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/physics/physics_pointcache.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_select.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_constraints.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/imbuf/intern/bmp.c
branches/bmesh/blender/source/blender/imbuf/intern/jp2.c
branches/bmesh/blender/source/blender/imbuf/intern/util.c
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/python/mathutils/mathutils_geometry.c
branches/bmesh/blender/source/blender/quicktime/apple/qtkit_export.m
branches/bmesh/blender/source/blender/quicktime/apple/quicktime_export.c
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/bmesh/blender/intern/cycles/kernel/svm/svm_gamma.h
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_gamma.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42670
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42680
Modified: branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp 2011-12-17
01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp 2011-12-17
02:41:53 UTC (rev 42681)
@@ -446,6 +446,9 @@
xml_read_enum(&mix->type, MixNode::type_enum, node,
"type");
snode = mix;
}
+ else if(string_iequals(node.name(), "gamma")) {
+ snode = new GammaNode();
+ }
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
2011-12-17 01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
2011-12-17 02:41:53 UTC (rev 42681)
@@ -160,6 +160,10 @@
node = new InvertNode();
break;
}
+ case BL::ShaderNode::type_GAMMA: {
+ node = new GammaNode();
+ 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 2011-12-17
01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt 2011-12-17
02:41:53 UTC (rev 42681)
@@ -59,6 +59,7 @@
svm/svm_convert.h
svm/svm_displace.h
svm/svm_fresnel.h
+ svm/svm_gamma.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
2011-12-17 01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
2011-12-17 02:41:53 UTC (rev 42681)
@@ -19,6 +19,7 @@
node_emission.osl
node_environment_texture.osl
node_fresnel.osl
+ node_gamma.osl
node_geometry.osl
node_glass_bsdf.osl
node_glossy_bsdf.osl
Copied: branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
(from rev 42680, trunk/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl)
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
(rev 0)
+++ branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
2011-12-17 02:41:53 UTC (rev 42681)
@@ -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_gamma(
+ color ColorIn = color(0.8, 0.8, 0.8),
+ float Gamma = 1.0,
+ output ColorOut = color(0.8, 0.8, 0.8)
+{
+ int i;
+ for (i=0;i<3;i++) {
+ if (ColorIn[i] > 0.0)
+ ColorIn[i] = powf(ColorIn[i], Gamma);
+ }
+
+ ColorOut = ColorIn;
+}
Modified: branches/bmesh/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm.h 2011-12-17
01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm.h 2011-12-17
02:41:53 UTC (rev 42681)
@@ -130,6 +130,7 @@
#include "svm_geometry.h"
#include "svm_hsv.h"
#include "svm_image.h"
+#include "svm_gamma.h"
#include "svm_invert.h"
#include "svm_light_path.h"
#include "svm_magic.h"
@@ -262,6 +263,9 @@
case NODE_INVERT:
svm_node_invert(sd, stack, node.y, node.z,
node.w);
break;
+ case NODE_GAMMA:
+ svm_node_gamma(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_gamma.h (from rev
42680, trunk/blender/intern/cycles/kernel/svm/svm_gamma.h)
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/svm/svm_gamma.h
(rev 0)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm_gamma.h 2011-12-17
02:41:53 UTC (rev 42681)
@@ -0,0 +1,37 @@
+/*
+ * 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_gamma(ShaderData *sd, float *stack, uint in_gamma, uint
in_color, uint out_color)
+{
+ float3 color = stack_load_float3(stack, in_color);
+ float gamma = stack_load_float(stack, in_gamma);
+
+ if (color.x > 0.0)
+ color.x = powf(color.x, gamma);
+ if (color.y > 0.0)
+ color.y = powf(color.y, gamma);
+ if (color.z > 0.0)
+ color.z = powf(color.z, gamma);
+
+ 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 2011-12-17
01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h 2011-12-17
02:41:53 UTC (rev 42681)
@@ -85,7 +85,8 @@
NODE_HSV = 5200,
NODE_CAMERA = 5300,
NODE_INVERT = 5400,
- NODE_NORMAL = 5500
+ NODE_NORMAL = 5500,
+ NODE_GAMMA = 5600
} NodeType;
typedef enum NodeAttributeType {
Modified: branches/bmesh/blender/intern/cycles/render/nodes.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/render/nodes.cpp 2011-12-17
01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/intern/cycles/render/nodes.cpp 2011-12-17
02:41:53 UTC (rev 42681)
@@ -1726,6 +1726,33 @@
compiler.add(this, "node_combine_rgb");
}
+/* Gamma */
+GammaNode::GammaNode()
+: ShaderNode("gamma")
+{
+ add_input("Color", SHADER_SOCKET_COLOR);
+ add_input("Gamma", SHADER_SOCKET_FLOAT);
+ add_output("Color", SHADER_SOCKET_COLOR);
+}
+
+void GammaNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *color_in = input("Color");
+ ShaderInput *gamma_in = input("Gamma");
+ ShaderOutput *color_out = output("Color");
+
+ compiler.stack_assign(color_in);
+ compiler.stack_assign(gamma_in);
+ compiler.stack_assign(color_out);
+
+ compiler.add_node(NODE_GAMMA, gamma_in->stack_offset,
color_in->stack_offset, color_out->stack_offset);
+}
+
+void GammaNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_gamma");
+}
+
/* Separate RGB */
SeparateRGBNode::SeparateRGBNode()
: ShaderNode("separate_rgb")
Modified: branches/bmesh/blender/intern/cycles/render/nodes.h
===================================================================
--- branches/bmesh/blender/intern/cycles/render/nodes.h 2011-12-17 01:13:02 UTC
(rev 42680)
+++ branches/bmesh/blender/intern/cycles/render/nodes.h 2011-12-17 02:41:53 UTC
(rev 42681)
@@ -302,6 +302,11 @@
SHADER_NODE_CLASS(CombineRGBNode)
};
+class GammaNode : public ShaderNode {
+public:
+ SHADER_NODE_CLASS(GammaNode)
+};
+
class SeparateRGBNode : public ShaderNode {
public:
SHADER_NODE_CLASS(SeparateRGBNode)
Modified: branches/bmesh/blender/source/blender/avi/intern/avi.c
===================================================================
--- branches/bmesh/blender/source/blender/avi/intern/avi.c 2011-12-17
01:13:02 UTC (rev 42680)
+++ branches/bmesh/blender/source/blender/avi/intern/avi.c 2011-12-17
02:41:53 UTC (rev 42681)
@@ -63,7 +63,8 @@
/* implemetation */
-unsigned int GET_FCC (FILE *fp) {
+unsigned int GET_FCC (FILE *fp)
+{
unsigned char tmp[4];
tmp[0] = getc(fp);
@@ -74,7 +75,8 @@
return FCC (tmp);
}
-unsigned int GET_TCC (FILE *fp) {
+unsigned int GET_TCC (FILE *fp)
+{
char tmp[5];
tmp[0] = getc(fp);
@@ -85,7 +87,8 @@
return FCC (tmp);
}
-char *fcc_to_char (unsigned int fcc) {
+char *fcc_to_char (unsigned int fcc)
+{
DEBUG_FCC[0]= (fcc)&127;
DEBUG_FCC[1]= (fcc>>8)&127;
DEBUG_FCC[2]= (fcc>>16)&127;
@@ -94,7 +97,8 @@
return DEBUG_FCC;
}
-char *tcc_to_char (unsigned int tcc) {
+char *tcc_to_char (unsigned int tcc)
+{
DEBUG_FCC[0]= (tcc)&127;
DEBUG_FCC[1]= (tcc>>8)&127;
DEBUG_FCC[2]= 0;
@@ -103,7 +107,8 @@
return DEBUG_FCC;
}
-int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num) {
+int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num)
+{
int cur_stream;
if (movie == NULL)
@@ -121,7 +126,8 @@
return -AVI_ERROR_FOUND;
}
-static int fcc_get_stream (int fcc) {
+static int fcc_get_stream (int fcc)
+{
char fccs[4];
fccs[0] = fcc;
@@ -132,7 +138,8 @@
return 10*(fccs[0]-'0') + (fccs[1]-'0');
}
-static int fcc_is_data (int fcc) {
+static int fcc_is_data (int fcc)
+{
char fccs[4];
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
