Cycles: add dedicated UV Map node, easier to find and has convenient auto complete.

Fixes T37954.

Reviewed By: brecht, dingto

Differential Revision: https://developer.blender.org/D230

diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 04408eb6bc09838672137c0f28c4600cf31cde68..1faf290f0ea6d56c5791ccfda28f5831e65ec795 100644 (file)
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -649,6 +649,11 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
                        xml_read_ustring(&attr->attribute, node, "attribute");
                        snode = attr;
                }
+               else if(string_iequals(node.name(), "uv_map")) {
+                       UVMapNode *uvm = new UVMapNode();
+                       xml_read_ustring(&uvm->attribute, node, "uv_map");
+                       snode = uvm;
+               }
                else if(string_iequals(node.name(), "camera")) {
                        snode = new CameraNode();
                }

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 1559a96a3d3392120964c7a7ba75f2b202524665..2eafcecf026ef1edbadd284f0977cc50454ba0ce 100644 (file)
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -668,6 +668,13 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen
                tangent->attribute = b_tangent_node.uv_map();
                node = tangent;
        }
+       else if (b_node.is_a(&RNA_ShaderNodeUVMap)) {
+               BL::ShaderNodeUVMap b_uvmap_node(b_node);
+               UVMapNode *uvm = new UVMapNode();
+               uvm->attribute = b_uvmap_node.uv_map();
+               uvm->from_dupli = b_uvmap_node.from_dupli();
+               node = uvm;
+       }
 
        if(node)
                graph->add(node);

diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt
index 045abdb80af25941cfd43202c8a6f7cc3260e327..5518d652bf95607181c50382199d6874870ae02c 100644 (file)
--- a/intern/cycles/kernel/shaders/CMakeLists.txt
+++ b/intern/cycles/kernel/shaders/CMakeLists.txt
@@ -77,6 +77,7 @@ set(SRC_OSL
        node_wave_texture.osl
        node_wireframe.osl
        node_hair_bsdf.osl
+       node_uv_map.osl
 )
 
 set(SRC_OSL_HEADERS

diff --git a/intern/cycles/kernel/shaders/node_uv_map.osl b/intern/cycles/kernel/shaders/node_uv_map.osl
new file mode 100644 (file)
index 0000000..fd039be
--- /dev/null
+++ b/intern/cycles/kernel/shaders/node_uv_map.osl
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+#include "stdosl.h"
+
+shader node_uv_map(
+       string name = "",
+       int from_dupli = 0,
+       output point UV = point(0.0, 0.0, 0.0))
+
+{
+       if (from_dupli) {
+               getattribute("geom:dupli_uv", UV);
+       }
+       else {
+        if (name == "") 
+                   getattribute("geom:uv", UV);        
+        else 
+            getattribute(name, UV);        
+       }
+}

diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index ad5e1ea6d2ef9a242489f87e31d9a9d8a78b594e..3285ea5cd31d13f252cde7e0b7de4e036f9f2682 100644 (file)
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -102,7 +102,8 @@ typedef enum NodeType {
        NODE_CLOSURE_AMBIENT_OCCLUSION,
        NODE_TANGENT,
        NODE_NORMAL_MAP,
-       NODE_HAIR_INFO
+       NODE_HAIR_INFO,
+       NODE_UVMAP
 } NodeType;
 
 typedef enum NodeAttributeType {

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index f10b956a48231a1c7853deed754c39412408c145..908acb3e6aa8949f97b426a5435d6794061fd272 100644 (file)
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -2328,6 +2328,62 @@ void TextureCoordinateNode::compile(OSLCompiler& compiler)
        compiler.add(this, "node_texture_coordinate");
 }
 
+UVMapNode::UVMapNode()
+: ShaderNode("uvmap")
+{
+       attribute = "";
+       from_dupli = false;
+
+       add_output("UV", SHADER_SOCKET_POINT);
+}
+
+void UVMapNode::attributes(Shader *shader, AttributeRequestSet *attributes)
+{
+       if(shader->has_surface) {
+               if(!from_dupli) {
+                       if(!output("UV")->links.empty()) {
+                               if (attribute != "")
+                                       attributes->add(attribute);
+                               else
+                                       attributes->add(ATTR_STD_UV);
+                       }
+               }
+       }
+
+       ShaderNode::attributes(shader, attributes);
+}
+
+void UVMapNode::compile(SVMCompiler& compiler)
+{
+       ShaderOutput *out = output("UV");
+       NodeType texco_node = NODE_TEX_COORD;
+       NodeType attr_node = NODE_ATTR;
+       int attr;
+
+       if(!out->links.empty()) {
+               if(from_dupli) {
+                       compiler.stack_assign(out);
+                       compiler.add_node(texco_node, NODE_TEXCO_DUPLI_UV, out->stack_offset);
+               }
+               else {
+                       if (attribute != "")
+                               attr = compiler.attribute(attribute);
+                       else
+                               attr = compiler.attribute(ATTR_STD_UV);
+
+                       compiler.stack_assign(out);
+                       compiler.add_node(attr_node, attr, out->stack_offset, NODE_ATTR_FLOAT3);
+               }
+       }
+}
+
+void UVMapNode::compile(OSLCompiler& compiler)
+{
+       compiler.parameter("from_dupli", from_dupli);
+       compiler.parameter("name", attribute.c_str());
+       compiler.add(this, "node_uv_map");
+}
+
 /* Light Path */
 
 LightPathNode::LightPathNode()

diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 497a367a2a61db81004531dba8b971882b5233fc..31caf9507eb170ad5a921f9bbaddc870064481c2 100644 (file)
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -350,6 +350,15 @@ public:
        bool from_dupli;
 };
 
+class UVMapNode : public ShaderNode {
+public:
+       SHADER_NODE_CLASS(UVMapNode)
+       void attributes(Shader *shader, AttributeRequestSet *attributes);
+
+       ustring attribute;
+       bool from_dupli;
+};
+
 class LightPathNode : public ShaderNode {
 public:
        SHADER_NODE_CLASS(LightPathNode)

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index be989f0aee7901c08ea3846aa62b154bc26035f2..34c0739d50c7e2508a754b555ced9bdc764980bc 100644 (file)
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -167,6 +167,7 @@ shader_node_categories = [
         NodeItem("ShaderNodeHairInfo"),
         NodeItem("ShaderNodeParticleInfo"),
         NodeItem("ShaderNodeCameraData"),
+        NodeItem("ShaderNodeUVMap"),
         NodeItem("NodeGroupInput", poll=group_input_output_item_poll),
         ]),
     ShaderNewNodeCategory("SH_NEW_OUTPUT", "Output", items=[

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 09c5776ccf046f03b13ebcd7fb951f6472ced886..1d76cabf78bffe59ed51236382525fb65c2f0ee6 100644 (file)
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -744,6 +744,7 @@ struct ShadeResult;
 #define SH_NODE_COMBHSV                                        184
 #define SH_NODE_BSDF_HAIR                              185
 #define SH_NODE_LAMP                                   186
+#define SH_NODE_UVMAP                   187
 
 /* custom defines options for Material node */
 #define SH_NODE_MAT_DIFF   1

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 2122526988a13e3a32fe78b74c5a40f6f3d654e1..47ef03093b1b4be7842190b699d641d0cdcba13f 100644 (file)
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3520,6 +3520,7 @@ static void registerShaderNodes(void)
        register_node_type_sh_subsurface_scattering();
        register_node_type_sh_mix_shader();
        register_node_type_sh_add_shader();
+       register_node_type_sh_uvmap();
 
        register_node_type_sh_output_lamp();
        register_node_type_sh_output_material();

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 5e3ac42d86552a45636bdd5cb8655e98c2679e47..d64607c5481dc104afffc98e79119124bc1c83b2 100644 (file)
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -873,6 +873,20 @@ static void node_shader_buts_bump(uiLayout *layout, bContext *UNUSED(C), Pointer
        uiItemR(layout, ptr, "invert", 0, NULL, 0);
 }
 
+static void node_shader_buts_uvmap(uiLayout *layout, bContext *C, PointerRNA *ptr)
+{
+       uiItemR(layout, ptr, "from_dupli", 0, NULL, 0);
+
+       if(!RNA_boolean_get(ptr, "from_dupli")) {
+               PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
+
+               if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
+                       PointerRNA dataptr = RNA_pointer_get(&obptr, "data");
+                       uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_textures", "", ICON_NONE);
+               }
+       }
+}
+
 static void node_shader_buts_normal_map(uiLayout *layout, bContext *C, PointerRNA *ptr)
 {
        uiItemR(layout, ptr, "space", 0, "", 0);
@@ -1103,6 +1117,9 @@ static void node_shader_set_butfunc(bNodeType *ntype)
                        ntype->draw_buttons = node_shader_buts_script;
                        ntype->draw_buttons_ex = node_shader_buts_script_ex;
                        break;
+               case SH_NODE_UVMAP:
+                       ntype->draw_buttons = node_shader_buts_uvmap;
+                       break;
        }
 }
 

diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 2d3a0fa2057f8a7e1e6ed0d77592323ddda19cd1..967ec8d8d06abe04ef3c9776d9cd3eba79c240a2 100644 (file)
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -847,6 +847,10 @@ typedef struct NodeShaderNormalMap {
        char uv_map[64];
 } NodeShaderNormalMap;
 
+typedef struct NodeShaderUVMap {
+       char uv_map[64];
+} NodeShaderUVMap;
+
 /* script node mode */
 #define NODE_SCRIPT_INTERNAL           0
 #define NODE_SCRIPT_EXTERNAL           1

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 0664ecf0d34e2063cd7f630a7ba2ef77135df62a..0f2380cbad429dfb44be73d074bf2434d8da3a24 100644 (file)
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3730,6 +3730,24 @@ static void def_hair(StructRNA *srna)
        RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 }
 
+static void def_sh_uvmap(StructRNA *srna)
+{
+       PropertyRNA *prop;
+
+       prop = RNA_def_property(srna, "from_dupli", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1);
+       RNA_def_property_ui_text(prop, "From Dupli", "Use the parent of the dupli object if possible");
+       RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+
+       RNA_def_struct_sdna_from(srna, "NodeShaderUVMap", "storage");
+
+       prop = RNA_def_property(srna, "uv_map", PROP_STRING, PROP_NONE);
+       RNA_def_property_ui_text(prop, "UV Map", "UV coordinates to be used for mapping");
+       RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+
+       RNA_def_struct_sdna_from(srna, "bNode", NULL);
+}
+
 static void def_sh_normal_map(StructRNA *srna)
 {
        static EnumPropertyItem prop_space_items[] = {

diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index fef6762d6959da6060fc089dd563cce3bb740ec8..754a3c11d78bbe531d59b47758d8e64d0c4b7064 100644 (file)
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -200,6 +200,7 @@ set(SRC
        shader/nodes/node_shader_tex_wave.c
        shader/nodes/node_shader_volume_scatter.c
        shader/nodes/node_shader_volume_absorption.c
+       shader/nodes/node_shader_uvmap.c
        shader/node_shader_tree.c
        shader/node_shader_util.c
 

diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h
index 0f388a890a41704ebd4c4ff3b57fca0a866ff31e..91b103da0e228b73fdaf03cd9803c26c79d6c828 100644 (file)
--- a/source/blender/nodes/NOD_shader.h
+++ b/source/blender/nodes/NOD_shader.h
@@ -111,6 +111,7 @@ void register_node_type_sh_bsdf_hair(void);
 void register_node_type_sh_subsurface_scattering(void);
 void register_node_type_sh_mix_shader(void);
 void register_node_type_sh_add_shader(void);
+void register_node_type_sh_uvmap(void);
 
 void register_node_type_sh_output_lamp(void);
 void register_node_type_sh_output_material(void);

diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index b406ac490086d31eb548b8d04ee7fb352938c1b6..434e737772d9500430a528e3bc44989f19fc6943 100644 (file)
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -119,6 +119,7 @@ DefNode( ShaderNode,     SH_NODE_TEX_COORD,          def_sh_tex_coord,       "TE
 DefNode( ShaderNode,     SH_NODE_VECT_TRANSFORM,     def_sh_vect_transform,  "VECT_TRANSFORM",     VectorTransform,  "Vector Transform",  ""       )
 DefNode( ShaderNode,     SH_NODE_SEPHSV,             0,                      "SEPHSV",             SeparateHSV,      "Separate HSV",      ""       )
 DefNode( ShaderNode,     SH_NODE_COMBHSV,            0,                      "COMBHSV",            CombineHSV,       "Combine HSV",       ""       )
+DefNode( ShaderNode,     SH_NODE_UVMAP,              def_sh_uvmap,           "UVMAP",              UVMap,            "UV Map",            ""       )
 
 DefNode( CompositorNode, CMP_NODE_VIEWER,         def_cmp_viewer,         "VIEWER",         Viewer,           "Viewer",            ""              )
 DefNode( CompositorNode, CMP_NODE_RGB,            0,                      "RGB",            RGB,              "RGB",               ""              )

diff --git a/source/blender/nodes/shader/nodes/node_shader_uvmap.c b/source/blender/nodes/shader/nodes/node_shader_uvmap.c
new file mode 100644 (file)
index 0000000..fff1bc1
--- /dev/null
+++ b/source/blender/nodes/shader/nodes/node_shader_uvmap.c
@@ -0,0 +1,58 @@
+/*
+ * ***** 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"
+
+#include "DNA_customdata_types.h"
+
+/* **************** OUTPUT ******************** */
+
+static bNodeSocketTemplate sh_node_uvmap_out[] = {
+       {       SOCK_VECTOR, 0, N_("UV"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+       {       -1, 0, ""       }
+};
+
+static void node_shader_init_uvmap(bNodeTree *UNUSED(ntree), bNode *node)
+{
+       NodeShaderUVMap *attr = MEM_callocN(sizeof(NodeShaderUVMap), "NodeShaderUVMap");
+       node->storage = attr;
+}
+
+/* node type definition */
+void register_node_type_sh_uvmap(void)
+{
+       static bNodeType ntype;
+
+       sh_node_type_base(&ntype, SH_NODE_UVMAP, "UV Map", NODE_CLASS_INPUT, 0);
+       node_type_compatibility(&ntype, NODE_NEW_SHADING);
+       node_type_socket_templates(&ntype, NULL, sh_node_uvmap_out);
+       node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
+       node_type_init(&ntype, node_shader_init_uvmap);
+       node_type_storage(&ntype, "NodeShaderUVMap", node_free_standard_storage, node_copy_standard_storage);
+
+       nodeRegisterType(&ntype);
+}