diff options
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 0fad110d64b..c7301d4f974 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -73,10 +73,19 @@ typedef struct Material { short har; char seed1, seed2; + float gloss_mir, gloss_tra; + short samp_gloss_mir, samp_gloss_tra; + float adapt_thresh_mir, adapt_thresh_tra; + float aniso_gloss_mir; + float dist_mir; + short fadeto_mir; + short pad1; + int mode, mode_l; /* mode_l is the or-ed result of all layer modes */ short flarec, starc, linec, ringc; float hasize, flaresize, subsize, flareboost; float strand_sta, strand_end, strand_ease; + char strand_uvname[32]; float sbias; /* shadow bias */ float shad_alpha, padf; /* in use for irregular shadowbuffer */ @@ -105,7 +114,8 @@ typedef struct Material { struct bNodeTree *nodetree; struct Ipo *ipo; struct Group *group; /* light group */ - + struct PreviewImage * preview; + /* dynamic properties */ float friction, fh, reflect; float fhdist, xyfrict; @@ -179,8 +189,14 @@ typedef struct Material { /* qdn: a bit clumsy this, tangents needed for normal maps separated from shading */ #define MA_NORMAP_TANG 0x8000000 #define MA_GROUP_NOLAY 0x10000000 +#define MA_FACETEXTURE_ALPHA 0x20000000 +#define MA_STR_B_UNITS 0x40000000 + +#define MA_MODE_MASK 0x4fffffff /* all valid mode bits */ -#define MA_MODE_MASK 0x1fffffff /* all valid mode bits */ +/* ray mirror fadeout */ +#define MA_RAYMIR_FADETOSKY 0 +#define MA_RAYMIR_FADETOMAT 1 /* diff_shader */ #define MA_DIFF_LAMBERT 0 @@ -260,6 +276,30 @@ typedef struct Material { #define MAP_WARP 8192 #define MAP_LAYER 16384 +/* mapto for halo */ +//#define MAP_HA_COL 1 +//#define MAP_HA_ALPHA 128 +//#define MAP_HA_HAR 256 +//#define MAP_HA_SIZE 2 +//#define MAP_HA_ADD 64 + +/* pmapto */ +/* init */ +#define MAP_PA_INIT 31 +#define MAP_PA_TIME 1 +#define MAP_PA_LIFE 2 +#define MAP_PA_DENS 4 +#define MAP_PA_SIZE 8 +#define MAP_PA_LENGTH 16 +/* reset */ +#define MAP_PA_IVEL 32 +/* physics */ +#define MAP_PA_PVEL 64 +/* path cache */ +#define MAP_PA_CACHE 384 +#define MAP_PA_CLUMP 128 +#define MAP_PA_KINK 256 + /* pr_type */ #define MA_FLAT 0 #define MA_SPHERE 1 |