[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46408] branches/meshdata_transfer: svn merge ^/trunk/blender -r46380:HEAD
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Tue May 8 02:22:06 CEST 2012
Revision: 46408
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46408
Author: cyborgmuppet
Date: 2012-05-08 00:22:02 +0000 (Tue, 08 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46380:HEAD
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46380
Modified Paths:
--------------
branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp
branches/meshdata_transfer/intern/cycles/kernel/CMakeLists.txt
branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_light_path.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_mapping.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h
branches/meshdata_transfer/intern/cycles/render/nodes.cpp
branches/meshdata_transfer/intern/cycles/render/nodes.h
branches/meshdata_transfer/source/blender/avi/intern/avi.c
branches/meshdata_transfer/source/blender/avi/intern/avirgb.c
branches/meshdata_transfer/source/blender/avi/intern/codecs.c
branches/meshdata_transfer/source/blender/avi/intern/endian.c
branches/meshdata_transfer/source/blender/avi/intern/mjpeg.c
branches/meshdata_transfer/source/blender/avi/intern/options.c
branches/meshdata_transfer/source/blender/avi/intern/rgb32.c
branches/meshdata_transfer/source/blender/blenkernel/BKE_node.h
branches/meshdata_transfer/source/blender/blenkernel/intern/node.c
branches/meshdata_transfer/source/blender/collada/ExportSettings.h
branches/meshdata_transfer/source/blender/collada/GeometryExporter.cpp
branches/meshdata_transfer/source/blender/collada/GeometryExporter.h
branches/meshdata_transfer/source/blender/collada/collada.cpp
branches/meshdata_transfer/source/blender/collada/collada.h
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree_types.h
branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene_api.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_solidify.c
branches/meshdata_transfer/source/blender/nodes/CMakeLists.txt
branches/meshdata_transfer/source/blender/nodes/NOD_shader.h
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46390
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46407
Modified: branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp 2012-05-08 00:22:02 UTC (rev 46408)
@@ -97,6 +97,13 @@
mapping->translation = get_float3(b_mapping.translation());
mapping->rotation = get_float3(b_mapping.rotation());
mapping->scale = get_float3(b_mapping.scale());
+
+ mapping->use_minmax = b_mapping.use_min() || b_mapping.use_max();
+
+ if(b_mapping.use_min())
+ mapping->min = get_float3(b_mapping.min());
+ if(b_mapping.use_max())
+ mapping->max = get_float3(b_mapping.max());
}
static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::ShaderNode b_node)
@@ -323,6 +330,10 @@
node = new LightPathNode();
break;
}
+ case BL::ShaderNode::type_LIGHT_FALLOFF: {
+ node = new LightFalloffNode();
+ break;
+ }
case BL::ShaderNode::type_TEX_IMAGE: {
BL::ShaderNodeTexImage b_image_node(b_node);
BL::Image b_image(b_image_node.image());
Modified: branches/meshdata_transfer/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/CMakeLists.txt 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/kernel/CMakeLists.txt 2012-05-08 00:22:02 UTC (rev 46408)
@@ -33,6 +33,7 @@
kernel_object.h
kernel_passes.h
kernel_path.h
+ kernel_projection.h
kernel_qbvh.h
kernel_random.h
kernel_shader.h
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h 2012-05-08 00:22:02 UTC (rev 46408)
@@ -326,6 +326,9 @@
case NODE_MAPPING:
svm_node_mapping(kg, sd, stack, node.y, node.z, &offset);
break;
+ case NODE_MIN_MAX:
+ svm_node_min_max(kg, sd, stack, node.y, node.z, &offset);
+ break;
case NODE_TEX_COORD:
svm_node_tex_coord(kg, sd, stack, node.y, node.z);
break;
@@ -344,6 +347,9 @@
case NODE_RGB_CURVES:
svm_node_rgb_curves(kg, sd, stack, node, &offset);
break;
+ case NODE_LIGHT_FALLOFF:
+ svm_node_light_falloff(sd, stack, node);
+ break;
case NODE_END:
default:
#ifndef __MULTI_CLOSURE__
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm_light_path.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/svm/svm_light_path.h 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/kernel/svm/svm_light_path.h 2012-05-08 00:22:02 UTC (rev 46408)
@@ -39,5 +39,32 @@
stack_store_float(stack, out_offset, info);
}
+/* Light Falloff Node */
+
+__device void svm_node_light_falloff(ShaderData *sd, float *stack, uint4 node)
+{
+ uint strength_offset, out_offset, smooth_offset;
+
+ decode_node_uchar4(node.z, &strength_offset, &smooth_offset, &out_offset, NULL);
+
+ float strength = stack_load_float(stack, strength_offset);
+ uint type = node.y;
+
+ switch(type) {
+ case NODE_LIGHT_FALLOFF_QUADRATIC: break;
+ case NODE_LIGHT_FALLOFF_LINEAR: strength *= sd->ray_length; break;
+ case NODE_LIGHT_FALLOFF_CONSTANT: strength *= sd->ray_length*sd->ray_length; break;
+ }
+
+ float smooth = stack_load_float(stack, smooth_offset);
+
+ if(smooth > 0.0f) {
+ float squared = sd->ray_length*sd->ray_length;
+ strength *= squared/(smooth + squared);
+ }
+
+ stack_store_float(stack, out_offset, strength);
+}
+
CCL_NAMESPACE_END
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm_mapping.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/svm/svm_mapping.h 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/kernel/svm/svm_mapping.h 2012-05-08 00:22:02 UTC (rev 46408)
@@ -34,5 +34,16 @@
stack_store_float3(stack, out_offset, r);
}
+__device void svm_node_min_max(KernelGlobals *kg, ShaderData *sd, float *stack, uint vec_offset, uint out_offset, int *offset)
+{
+ float3 v = stack_load_float3(stack, vec_offset);
+
+ float3 mn = float4_to_float3(read_node_float(kg, offset));
+ float3 mx = float4_to_float3(read_node_float(kg, offset));
+
+ float3 r = min(max(mn, v), mx);
+ stack_store_float3(stack, out_offset, r);
+}
+
CCL_NAMESPACE_END
Modified: branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h 2012-05-08 00:22:02 UTC (rev 46408)
@@ -90,7 +90,9 @@
NODE_TEX_CHECKER = 5700,
NODE_BRIGHTCONTRAST = 5800,
NODE_RGB_RAMP = 5900,
- NODE_RGB_CURVES = 6000
+ NODE_RGB_CURVES = 6000,
+ NODE_MIN_MAX = 6100,
+ NODE_LIGHT_FALLOFF = 6200
} NodeType;
typedef enum NodeAttributeType {
@@ -119,6 +121,12 @@
NODE_LP_ray_length
} NodeLightPath;
+typedef enum NodeLightFalloff {
+ NODE_LIGHT_FALLOFF_QUADRATIC,
+ NODE_LIGHT_FALLOFF_LINEAR,
+ NODE_LIGHT_FALLOFF_CONSTANT
+} NodeLightFalloff;
+
typedef enum NodeTexCoord {
NODE_TEXCO_NORMAL,
NODE_TEXCO_OBJECT,
Modified: branches/meshdata_transfer/intern/cycles/render/nodes.cpp
===================================================================
--- branches/meshdata_transfer/intern/cycles/render/nodes.cpp 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/render/nodes.cpp 2012-05-08 00:22:02 UTC (rev 46408)
@@ -33,6 +33,11 @@
rotation = make_float3(0.0f, 0.0f, 0.0f);
scale = make_float3(1.0f, 1.0f, 1.0f);
+ min = make_float3(-FLT_MAX, -FLT_MAX, -FLT_MAX);
+ max = make_float3(FLT_MAX, FLT_MAX, FLT_MAX);
+
+ use_minmax = false;
+
x_mapping = X;
y_mapping = Y;
z_mapping = Z;
@@ -69,6 +74,8 @@
if(x_mapping != X || y_mapping != Y || z_mapping != Z)
return false;
+ if(use_minmax)
+ return false;
return true;
}
@@ -85,6 +92,12 @@
compiler.add_node(tfm.y);
compiler.add_node(tfm.z);
compiler.add_node(tfm.w);
+
+ if(use_minmax) {
+ compiler.add_node(NODE_MIN_MAX, offset_out, offset_out);
+ compiler.add_node(float3_to_float4(min));
+ compiler.add_node(float3_to_float4(max));
+ }
}
/* Image Texture */
@@ -1686,6 +1699,54 @@
compiler.add(this, "node_light_path");
}
+/* Light Path */
+
+LightFalloffNode::LightFalloffNode()
+: ShaderNode("light_path")
+{
+ add_input("Strength", SHADER_SOCKET_FLOAT, 100.0f);
+ add_input("Smooth", SHADER_SOCKET_FLOAT, 0.0f);
+ add_output("Quadratic", SHADER_SOCKET_FLOAT);
+ add_output("Linear", SHADER_SOCKET_FLOAT);
+ add_output("Constant", SHADER_SOCKET_FLOAT);
+}
+
+void LightFalloffNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *strength_in = input("Strength");
+ ShaderInput *smooth_in = input("Smooth");
+
+ compiler.stack_assign(strength_in);
+ compiler.stack_assign(smooth_in);
+
+ ShaderOutput *out = output("Quadratic");
+ if(!out->links.empty()) {
+ compiler.stack_assign(out);
+ compiler.add_node(NODE_LIGHT_FALLOFF, NODE_LIGHT_FALLOFF_QUADRATIC,
+ compiler.encode_uchar4(strength_in->stack_offset, smooth_in->stack_offset, out->stack_offset));
+ }
+
+ out = output("Linear");
+ if(!out->links.empty()) {
+ compiler.stack_assign(out);
+ compiler.add_node(NODE_LIGHT_FALLOFF, NODE_LIGHT_FALLOFF_LINEAR,
+ compiler.encode_uchar4(strength_in->stack_offset, smooth_in->stack_offset, out->stack_offset));
+ compiler.add_node(NODE_LIGHT_FALLOFF, NODE_LIGHT_FALLOFF_LINEAR, out->stack_offset);
+ }
+
+ out = output("Constant");
+ if(!out->links.empty()) {
+ compiler.stack_assign(out);
+ compiler.add_node(NODE_LIGHT_FALLOFF, NODE_LIGHT_FALLOFF_CONSTANT,
+ compiler.encode_uchar4(strength_in->stack_offset, smooth_in->stack_offset, out->stack_offset));
+ }
+}
+
+void LightFalloffNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_light_falloff");
+}
+
/* Value */
ValueNode::ValueNode()
Modified: branches/meshdata_transfer/intern/cycles/render/nodes.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/render/nodes.h 2012-05-08 00:12:47 UTC (rev 46407)
+++ branches/meshdata_transfer/intern/cycles/render/nodes.h 2012-05-08 00:22:02 UTC (rev 46408)
@@ -41,6 +41,9 @@
float3 rotation;
float3 scale;
+ float3 min, max;
+ bool use_minmax;
+
enum Mapping { NONE=0, X=1, Y=2, Z=3 };
Mapping x_mapping, y_mapping, z_mapping;
@@ -277,6 +280,11 @@
SHADER_NODE_CLASS(LightPathNode)
};
+class LightFalloffNode : public ShaderNode {
+public:
+ SHADER_NODE_CLASS(LightFalloffNode)
+};
+
class ValueNode : public ShaderNode {
public:
SHADER_NODE_CLASS(ValueNode)
Modified: branches/meshdata_transfer/source/blender/avi/intern/avi.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list