← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/nodes/shader/nodes/node_shader_tex_coord.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/shader/nodes/node_shader_tex_coord.c
31
31
 
32
32
/* **************** OUTPUT ******************** */
33
33
 
34
 
static bNodeSocketTemplate sh_node_tex_coord_out[]= {
35
 
        {       SOCK_VECTOR, 0, "Generated",            0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
36
 
        {       SOCK_VECTOR, 0, "UV",                           0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
37
 
        {       SOCK_VECTOR, 0, "Object",                       0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
38
 
        {       SOCK_VECTOR, 0, "Camera",                       0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
39
 
        {       SOCK_VECTOR, 0, "Window",                       0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
40
 
        {       SOCK_VECTOR, 0, "Reflection",           0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
34
static bNodeSocketTemplate sh_node_tex_coord_out[] = {
 
35
        {       SOCK_VECTOR, 0, N_("Generated"),                0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
36
        {       SOCK_VECTOR, 0, N_("Normal"),                   0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
37
        {       SOCK_VECTOR, 0, N_("UV"),                               0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
38
        {       SOCK_VECTOR, 0, N_("Object"),                   0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
39
        {       SOCK_VECTOR, 0, N_("Camera"),                   0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
40
        {       SOCK_VECTOR, 0, N_("Window"),                   0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 
41
        {       SOCK_VECTOR, 0, N_("Reflection"),               0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
41
42
        {       -1, 0, ""       }
42
43
};
43
44
 
48
49
 
49
50
        return GPU_stack_link(mat, "node_tex_coord", in, out,
50
51
                GPU_builtin(GPU_VIEW_POSITION), GPU_builtin(GPU_VIEW_NORMAL),
51
 
                GPU_builtin(GPU_INVERSE_VIEW_MATRIX), orco, mtface);
 
52
                GPU_builtin(GPU_INVERSE_VIEW_MATRIX), GPU_builtin(GPU_INVERSE_OBJECT_MATRIX), orco, mtface);
52
53
}
53
54
 
54
55
/* node type definition */
56
57
{
57
58
        static bNodeType ntype;
58
59
 
59
 
        node_type_base(ttype, &ntype, SH_NODE_TEX_COORD, "Texture Coordinate", NODE_CLASS_INPUT, 0);
 
60
        node_type_base(ttype, &ntype, SH_NODE_TEX_COORD, "Texture Coordinate", NODE_CLASS_INPUT, NODE_OPTIONS);
60
61
        node_type_compatibility(&ntype, NODE_NEW_SHADING);
61
62
        node_type_socket_templates(&ntype, NULL, sh_node_tex_coord_out);
62
63
        node_type_size(&ntype, 150, 60, 200);