diff options
author | Bartosz Moniewski <monio> | 2020-02-17 14:31:38 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-02-17 15:24:07 +0300 |
commit | 67d12bb5192d04a596e216f63cff2875fdd8cfbf (patch) | |
tree | c4d866f343ec9b87f713ebd004a8f343ab6f5307 /source/blender/makesdna | |
parent | ae9bbb4d0360aea694b46ee698d24dbc1476ebf3 (diff) |
Shading: add direction modes and phase offset to wave texture node
* Direction mode X, Y and Z to align with axes rather than diagonal or
spherical as previously. X is the new default, existing files will
use diagonal or spherical for compatibility.
* Phase offset to offset the wave along its direction, for purposes like
animation and distortion.
https://developer.blender.org/D6382
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index b7bb267db11..a8f33072915 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -896,6 +896,8 @@ typedef struct NodeTexMusgrave { typedef struct NodeTexWave { NodeTexBase base; int wave_type; + int bands_direction; + int rings_direction; int wave_profile; } NodeTexWave; @@ -1139,8 +1141,25 @@ enum { #define SHD_WAVE_BANDS 0 #define SHD_WAVE_RINGS 1 -#define SHD_WAVE_PROFILE_SIN 0 -#define SHD_WAVE_PROFILE_SAW 1 +enum { + SHD_WAVE_BANDS_DIRECTION_X = 0, + SHD_WAVE_BANDS_DIRECTION_Y = 1, + SHD_WAVE_BANDS_DIRECTION_Z = 2, + SHD_WAVE_BANDS_DIRECTION_DIAGONAL = 3, +}; + +enum { + SHD_WAVE_RINGS_DIRECTION_X = 0, + SHD_WAVE_RINGS_DIRECTION_Y = 1, + SHD_WAVE_RINGS_DIRECTION_Z = 2, + SHD_WAVE_RINGS_DIRECTION_SPHERICAL = 3, +}; + +enum { + SHD_WAVE_PROFILE_SIN = 0, + SHD_WAVE_PROFILE_SAW = 1, + SHD_WAVE_PROFILE_TRI = 2, +}; /* sky texture */ #define SHD_SKY_OLD 0 |