diff options
author | Ton Roosendaal <ton@blender.org> | 2006-01-04 15:13:13 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-01-04 15:13:13 +0300 |
commit | 3153a238b38573e77fd277abca927d77c8bcce4a (patch) | |
tree | bb4c628956e9c67851e6a4e6fd37cfc06ba975a6 /source/blender/makesdna | |
parent | bd26fe8f94dd0f8ee558df1e7c877eba3db912be (diff) |
Orange: more Node goodies;
- New Node: "Mapping". Allows input vector to be translated, rotated and
scaled. And optional be clipped to a range. Works for colors too!
- The button "Normal" now allows incremental input, so a click in the
button won't change the normal anymore
- Connecting wires now show selection state for Nodes, with nice blended
colors. Both colors were added in Themes, but default to black and white
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 9ebadb6b86d..85db0887f51 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -171,5 +171,6 @@ typedef struct bNodeTree { #define NTREE_TYPE_INIT 1 #define NTREE_EXEC_INIT 2 + #endif diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 21ae86ea68a..3cb37dff29e 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -163,6 +163,23 @@ typedef struct Tex { } Tex; +/* used for mapping node. note: rot is in degrees */ + +typedef struct TexMapping { + float loc[3], rot[3], size[3]; + int flag; + + float mat[4][4]; + float min[3], max[3]; + struct Object *ob; + +} TexMapping; + +/* texmap->flag */ +#define TEXMAP_CLIP_MIN 1 +#define TEXMAP_CLIP_MAX 2 + + /* **************** TEX ********************* */ /* type */ |