From 9736061c07491286021b039d1307b3951496cf3b Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Sun, 1 May 2011 03:57:53 +0000 Subject: =trunk= Made some improvements to the point density texture. Added support for tweaking the falloff with a custom curve. Also coded new falloff types based on the age or velocity of particles. Also added a test break check to the volumetric shade cache code, to avoid nasty hangups from the preview render (on render, exit, etc). --- source/blender/makesdna/DNA_texture_types.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source/blender/makesdna/DNA_texture_types.h') diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 572a2282d45..e81a9979c12 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -52,6 +52,7 @@ struct Tex; struct Image; struct PreviewImage; struct ImBuf; +struct CurveMapping; typedef struct MTex { @@ -181,9 +182,10 @@ typedef struct PointDensity { short pdpad3[3]; float noise_fac; - float speed_scale; + float speed_scale, falloff_speed_scale, pdpad2; struct ColorBand *coba; /* for time -> color */ + struct CurveMapping *falloff_curve; /* falloff density curve */ } PointDensity; typedef struct VoxelData { @@ -517,6 +519,8 @@ typedef struct TexMapping { #define TEX_PD_FALLOFF_SOFT 2 #define TEX_PD_FALLOFF_CONSTANT 3 #define TEX_PD_FALLOFF_ROOT 4 +#define TEX_PD_FALLOFF_PARTICLE_AGE 5 +#define TEX_PD_FALLOFF_PARTICLE_VEL 6 /* psys_cache_space */ #define TEX_PD_OBJECTLOC 0 @@ -524,8 +528,8 @@ typedef struct TexMapping { #define TEX_PD_WORLDSPACE 2 /* flag */ -#define TEX_PD_TURBULENCE 1 - +#define TEX_PD_TURBULENCE 1 +#define TEX_PD_FALLOFF_CURVE 2 /* noise_influence */ #define TEX_PD_NOISE_STATIC 0 -- cgit v1.2.3