diff options
Diffstat (limited to 'source/blender/makesdna/DNA_fluid_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_fluid_types.h | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h index 98007a2b0b1..2ba0d15fbb3 100644 --- a/source/blender/makesdna/DNA_fluid_types.h +++ b/source/blender/makesdna/DNA_fluid_types.h @@ -52,6 +52,7 @@ enum { FLUID_DOMAIN_DELETE_IN_OBSTACLE = (1 << 14), /* Delete fluid inside obstacles. */ FLUID_DOMAIN_USE_DIFFUSION = (1 << 15), /* Use diffusion (e.g. viscosity, surface tension). */ FLUID_DOMAIN_USE_RESUMABLE_CACHE = (1 << 16), /* Determine if cache should be resumable. */ + FLUID_DOMAIN_USE_VISCOSITY = (1 << 17), /* Use viscosity. */ }; /** @@ -289,7 +290,7 @@ enum { #define FLUID_NAME_GUIDING "fluid_guiding" /* Fluid object names.*/ -#define FLUID_NAME_FLAGS "flags" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FLAGS "flags" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_VELOCITY "velocity" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_VEL "vel" #define FLUID_NAME_VELOCITYTMP "velocity_previous" /* == OpenVDB grid attribute name. */ @@ -300,7 +301,7 @@ enum { #define FLUID_NAME_PHIOBS "phi_obstacle" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_PHISIN "phiSIn" #define FLUID_NAME_PHIIN "phi_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_PHIOUT "phi_out" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PHIOUT "phi_out" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_FORCES "forces" #define FLUID_NAME_FORCE_X "x_force" #define FLUID_NAME_FORCE_Y "y_force" @@ -322,37 +323,37 @@ enum { #define FLUID_NAME_PHIOUTIN "phi_out_inflow" /* Smoke object names. */ -#define FLUID_NAME_SHADOW "shadow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_SHADOW "shadow" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_EMISSION "emission" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_EMISSIONIN "emissionIn" -#define FLUID_NAME_DENSITY "density" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_DENSITY "density" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_DENSITYIN "density_inflow" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_HEAT "heat" #define FLUID_NAME_HEATIN "heatIn" -#define FLUID_NAME_TEMPERATURE "temperature" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_TEMPERATURE "temperature" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_TEMPERATUREIN "temperature_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORR "color_r" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORG "color_g" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORB "color_b" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORRIN "color_r_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORGIN "color_g_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORBIN "color_b_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_FLAME "flame" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_FUEL "fuel" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_REACT "react" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_FUELIN "fuel_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_REACTIN "react_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORR "color_r" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORG "color_g" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORB "color_b" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORRIN "color_r_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORGIN "color_g_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORBIN "color_b_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FLAME "flame" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FUEL "fuel" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_REACT "react" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FUELIN "fuel_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_REACTIN "react_inflow" /* == OpenVDB grid attribute name. */ /* Liquid object names. */ #define FLUID_NAME_PHIPARTS "phi_particles" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_PHI "phi" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_PHITMP "phi_previous" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PHI "phi" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PHITMP "phi_previous" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_VELOCITYOLD "velOld" #define FLUID_NAME_VELOCITYPARTS "velParts" #define FLUID_NAME_MAPWEIGHTS "mapWeights" #define FLUID_NAME_PP "pp" #define FLUID_NAME_PVEL "pVel" -#define FLUID_NAME_PARTS "particles" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PARTS "particles" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_PARTSVELOCITY "particles_velocity" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_PINDEX "pindex" #define FLUID_NAME_GPI "gpi" @@ -375,8 +376,8 @@ enum { #define FLUID_NAME_TEXTURE_U2 "textureU2" #define FLUID_NAME_TEXTURE_V2 "textureV2" #define FLUID_NAME_TEXTURE_W2 "textureW2" -#define FLUID_NAME_UV0 "uv_grid_0" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_UV1 "uv_grid_1" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_UV0 "uv_grid_0" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_UV1 "uv_grid_1" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_COLORR_NOISE "color_r_noise" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_COLORG_NOISE "color_g_noise" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_COLORB_NOISE "color_b_noise" /* == OpenVDB grid attribute name. */ @@ -596,6 +597,10 @@ typedef struct FluidDomainSettings { short simulation_method; char _pad4[6]; + /* Viscosity options. */ + float viscosity_value; + char _pad5[4]; + /* Diffusion options. */ float surface_tension; float viscosity_base; @@ -610,7 +615,7 @@ typedef struct FluidDomainSettings { int mesh_scale; int totvert; short mesh_generator; - char _pad5[6]; /* Unused. */ + char _pad6[6]; /* Unused. */ /* Secondary particle options. */ int particle_type; @@ -631,7 +636,7 @@ typedef struct FluidDomainSettings { int sndparticle_update_radius; char sndparticle_boundary; char sndparticle_combined_export; - char _pad6[6]; /* Unused. */ + char _pad7[6]; /* Unused. */ /* Fluid guiding options. */ float guide_alpha; /* Guiding weight scalar (determines strength). */ @@ -639,7 +644,7 @@ typedef struct FluidDomainSettings { float guide_vel_factor; /* Multiply guiding velocity by this factor. */ int guide_res[3]; /* Res for velocity guide grids - independent from base res. */ short guide_source; - char _pad7[2]; /* Unused. */ + char _pad8[2]; /* Unused. */ /* Cache options. */ int cache_frame_start; @@ -659,7 +664,7 @@ typedef struct FluidDomainSettings { char error[64]; /* Bake error description. */ short cache_type; char cache_id[4]; /* Run-time only */ - char _pad8[2]; + char _pad9[2]; /* Unused. */ /* Time options. */ float dt; @@ -694,19 +699,19 @@ typedef struct FluidDomainSettings { char interp_method; char gridlines_color_field; /* Simulation field used to color map onto gridlines. */ char gridlines_cell_filter; - char _pad9[7]; + char _pad10[7]; /* Unused. */ /* OpenVDB cache options. */ int openvdb_compression; float clipping; char openvdb_data_depth; - char _pad10[7]; /* Unused. */ + char _pad11[7]; /* Unused. */ /* -- Deprecated / unsed options (below). -- */ /* View options. */ int viewsettings; - char _pad11[4]; /* Unused. */ + char _pad12[4]; /* Unused. */ /* Pointcache options. */ /* Smoke uses only one cache from now on (index [0]), but keeping the array for now for reading @@ -716,7 +721,7 @@ typedef struct FluidDomainSettings { int cache_comp; int cache_high_comp; char cache_file_format; - char _pad12[7]; /* Unused. */ + char _pad13[7]; /* Unused. */ } FluidDomainSettings; |