diff options
author | Nils Thuerey <nils@thuerey.de> | 2006-03-29 11:35:54 +0400 |
---|---|---|
committer | Nils Thuerey <nils@thuerey.de> | 2006-03-29 11:35:54 +0400 |
commit | 0a63b3c0ca032d7bb26a97164f034a49499eee68 (patch) | |
tree | c14cbc74d3b0e6136dc060fe4e8a1bf16804a90b /source/blender/makesdna/DNA_object_fluidsim.h | |
parent | 0d2902b1fe50cd27f0046a4c0ecf140e6e1284a8 (diff) |
Several minor fixes:
- Added part of Austin's msvc8 fixes (vector::erase function
was "misused"), hopefully compiles better now.
- Ctrl-b now also bakes a selected fluidsim domain
similar to the softbodies.
- Added surface smoothing option for domains: default is
1, higher values result in a smoother surface (and probably
slightly higher comupation times), while 0 means the surface
is not modified at all.
- Added BLENDER_ELBEEMBOBJABORT environment variable in readBobj,
if >0 quits blender when a not yet existing fluidsim
frame should be loaded. Useful for rendering simulations
as far as possible from the command line.
- Surface normals pointer is now set to NULL in readfile.c
- Fixed win32 error string handling, now uses a function
to return the string from the solver.
- Fixed fluidsim particle halo scaling problem.
- Solver update
Diffstat (limited to 'source/blender/makesdna/DNA_object_fluidsim.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_fluidsim.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h index e2e2ecd5570..eb81ff76d5f 100644 --- a/source/blender/makesdna/DNA_object_fluidsim.h +++ b/source/blender/makesdna/DNA_object_fluidsim.h @@ -96,14 +96,19 @@ typedef struct FluidsimSettings { /* additional flags depending on the type, lower short contains flags * to check validity, higher short additional flags */ - int typeFlags; + short typeFlags; + char domainNovecgen,dummyc; /* boundary "stickiness" for part slip values */ float partSlipValue; /* particle generation - on if >0, then determines amount */ - float generateParticles, dummy; + float generateParticles; + /* smooth fluid surface? */ + float surfaceSmoothing; /* particle display - size scaling, and alpha influence */ float particleInfSize, particleInfAlpha; + /* testing vars */ + float farFieldSize,dummyf; /* save fluidsurface normals in mvert.no, and surface vertex velocities (if available) in mvert.co */ struct MVert *meshSurfNormals; @@ -119,13 +124,12 @@ typedef struct FluidsimSettings { #define OB_FLUIDSIM_OUTFLOW 32 #define OB_FLUIDSIM_PARTICLE 64 -#define OB_TYPEFLAG_START 16 +#define OB_TYPEFLAG_START 0 #define OB_FSGEO_THIN (1<<(OB_TYPEFLAG_START+1)) #define OB_FSBND_NOSLIP (1<<(OB_TYPEFLAG_START+2)) #define OB_FSBND_PARTSLIP (1<<(OB_TYPEFLAG_START+3)) #define OB_FSBND_FREESLIP (1<<(OB_TYPEFLAG_START+4)) #define OB_FSINFLOW_LOCALCOORD (1<<(OB_TYPEFLAG_START+5)) -#define OB_FSDOMAIN_NOVECGEN (1<<(OB_TYPEFLAG_START+6)) // guiDisplayMode particle flags #define OB_FSDOM_GEOM 1 |