diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-26 01:53:52 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-26 01:53:52 +0400 |
| commit | 6a5773d4a8633374a1f54864c077a0cd5fa122ea (patch) | |
| tree | 72454f9913ebf63c561f9c9e8ddefbb5190771c0 /source/blender/makesdna/DNA_smoke_types.h | |
| parent | cfcd355c27ba1f923d04dec1f735989b260b190c (diff) | |
Smoke:
* Deleting high res modifier again
* fixing smoke + continue physics drawing
* fixing cache reset when changing dissolve
Diffstat (limited to 'source/blender/makesdna/DNA_smoke_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_smoke_types.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index 2d8b21b86de..542281e1960 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -32,10 +32,15 @@ /* flags */ #define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */ #define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */ -#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve */ +#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve * + +/* noise */ +#define MOD_SMOKE_NOISEWAVE (1<<0) +#define MOD_SMOKE_NOISEFFT (1<<1) +#define MOD_SMOKE_NOISECURL (1<<2) /* viewsettings */ -/* nothing so far */ +#define MOD_SMOKE_SHOWHIGHRES (1<<0) /* show high resolution */ typedef struct SmokeDomainSettings { struct SmokeModifierData *smd; /* for fast RNA access */ @@ -64,6 +69,14 @@ typedef struct SmokeDomainSettings { int diss_speed;/* in frames */ struct PointCache *point_cache; /* definition is in DNA_object_force.h */ struct ListBase ptcaches; + struct WTURBULENCE *wt; // WTURBULENCE object, if active + int pad3; + float strength; + int res_wt[3]; + int maxres_wt; + short noise; /* noise type: wave, curl, anisotropic */ + short pad2; + int amplify; } SmokeDomainSettings; |