diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-20 04:33:59 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-08-20 04:33:59 +0400 |
commit | 286c2ca80be4ae46dc220ada2fcc5bf636d5ff49 (patch) | |
tree | 91492852f1b0f8d6bc70d8b88113325e218e7f9d /source/blender/makesdna/DNA_smoke_types.h | |
parent | c21627e31b0e82f28e35af51cec681897285ff78 (diff) |
Smoke:
* cache for low res (deactivating high res for now)
* new way of view3d rendering of smoke (no longer 3 axes) -using 3dtexture now (introduced into gpu/intern)
* introducing LZO and LZMA libs into extern (makefiles missing for now)
* reducing memory usage after simulating for the frame ended (freeing temporary buffers)
* splitting smoke into 2 modifier for the cache-sake (it cannot handle more than 1 cache on the same modifier-index)
* no color on gui anymore
* fixing non-power-of-2 resolutions (hopefully)
* fixing select-deselect of domain drawing bug
* fixing drawobject.c coding style (making Ton happy) ;-)
HINT #1: If scons doesn't work -> cmakefiles are up-to-date, couldn't test scons (but i tried to mantain them, too)
CODERS HINT #1: we really need a way to disable adding all modifiers through "Add Modifiers" dropdown!
WARNING #1: before applying this commit, deactivate your SMOKE DOMAIN in your old files and save them then. You can open them then savely after that.
WARNING #2: File and cache format of smoke can be changed, this is not final!
Diffstat (limited to 'source/blender/makesdna/DNA_smoke_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_smoke_types.h | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index c7f49d3ddd2..2d8b21b86de 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -30,24 +30,12 @@ #define DNA_SMOKE_TYPES_H /* flags */ -#define MOD_SMOKE_HIGHRES (1<<1) /* compute high resolution */ +#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 */ -/* noise */ -#define MOD_SMOKE_NOISEWAVE (1<<0) -#define MOD_SMOKE_NOISEFFT (1<<1) -#define MOD_SMOKE_NOISECURL (1<<2) /* viewsettings */ -#define MOD_SMOKE_VIEW_X (1<<0) -#define MOD_SMOKE_VIEW_Y (1<<1) -#define MOD_SMOKE_VIEW_Z (1<<2) -#define MOD_SMOKE_VIEW_SMALL (1<<3) -#define MOD_SMOKE_VIEW_BIG (1<<4) -#define MOD_SMOKE_VIEW_CHANGETOBIG (1<<5) -#define MOD_SMOKE_VIEW_REDRAWNICE (1<<6) -#define MOD_SMOKE_VIEW_REDRAWALL (1<<7) -#define MOD_SMOKE_VIEW_USEBIG (1<<8) +/* nothing so far */ typedef struct SmokeDomainSettings { struct SmokeModifierData *smd; /* for fast RNA access */ @@ -55,33 +43,27 @@ typedef struct SmokeDomainSettings { struct Group *fluid_group; struct Group *eff_group; // effector group for e.g. wind force struct Group *coll_group; // collision objects group - unsigned int *bind; - float *tvox; - float *tray; - float *tvoxbig; - float *traybig; + struct GPUTexture *tex; + float *view3d; /* voxel data for display */ + unsigned int v3dnum; /* number of frame in view3d buffer */ float p0[3]; /* start point of BB */ float p1[3]; /* end point of BB */ float dx; /* edge length of one cell */ float firstframe; float lastframe; - float omega; /* smoke color - from 0 to 1 */ float temp; /* fluid temperature */ float tempAmb; /* ambient temperature */ float alpha; float beta; int res[3]; /* domain resolution */ - int amplify; /* wavelet amplification */ int maxres; /* longest axis on the BB gets this resolution assigned */ int flags; /* show up-res or low res, etc */ - int visibility; /* how many billboards to show (every 2nd, 3rd, 4th,..) */ int viewsettings; - int max_textures; - short noise; /* noise type: wave, curl, anisotropic */ short diss_percent; + short pad; int diss_speed;/* in frames */ - float strength; - struct WTURBULENCE *wt; // WTURBULENCE object, if active + struct PointCache *point_cache; /* definition is in DNA_object_force.h */ + struct ListBase ptcaches; } SmokeDomainSettings; |