diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-06-05 19:51:45 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-06-05 19:52:33 +0300 |
commit | b91b90f0dd3c9bff3b1a6e563c2cce293722ed16 (patch) | |
tree | 635eb9b802845521b9170a8ef2e917c395f8ed9a /source | |
parent | b16a85fe0b0fe5c5637c4ee8c9c2bfd5f906e5d5 (diff) |
Fluid: Cleanup internal Python object names
Manta Python objects should not carry the global ID in their names.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesdna/DNA_fluid_types.h | 188 |
1 files changed, 139 insertions, 49 deletions
diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h index 7da33a369f3..e8a22d8c821 100644 --- a/source/blender/makesdna/DNA_fluid_types.h +++ b/source/blender/makesdna/DNA_fluid_types.h @@ -215,55 +215,145 @@ enum { #define FLUID_DOMAIN_SMOKE_SCRIPT "smoke_script.py" #define FLUID_DOMAIN_LIQUID_SCRIPT "liquid_script.py" -#define FLUID_FILENAME_CONFIG "config_####" - -#define FLUID_FILENAME_DATA "fluid_data_####" -#define FLUID_FILENAME_NOISE "fluid_noise_####" -#define FLUID_FILENAME_DENSITY "density_####" -#define FLUID_FILENAME_SHADOW "shadow_####" -#define FLUID_FILENAME_VELOCITY "vel_####" -#define FLUID_FILENAME_HEAT "heat_####" -#define FLUID_FILENAME_COLORR "color_r_####" -#define FLUID_FILENAME_COLORG "color_g_####" -#define FLUID_FILENAME_COLORB "color_b_####" -#define FLUID_FILENAME_FLAME "flame_####" -#define FLUID_FILENAME_FUEL "fuel_####" -#define FLUID_FILENAME_REACT "react_####" -#define FLUID_FILENAME_PHI "phi_####" -#define FLUID_FILENAME_PP "pp_####" -#define FLUID_FILENAME_PVEL "pVel_####" -#define FLUID_FILENAME_DENSITYNOISE "density_noise_####" -#define FLUID_FILENAME_COLORRNOISE "color_r_noise_####" -#define FLUID_FILENAME_COLORGNOISE "color_g_noise_####" -#define FLUID_FILENAME_COLORBNOISE "color_b_noise_####" -#define FLUID_FILENAME_FLAMENOISE "flame_noise_####" -#define FLUID_FILENAME_FUELNOISE "fuel_noise_####" -#define FLUID_FILENAME_REACTNOISE "react_noise_####" -#define FLUID_FILENAME_MESH "lMesh_####" -#define FLUID_FILENAME_MESHVEL "lVelMesh_####" -#define FLUID_FILENAME_PPSND "ppSnd_####" -#define FLUID_FILENAME_PVELSND "pVelSnd_####" -#define FLUID_FILENAME_PLIFESND "pLifeSnd_####" -#define FLUID_FILENAME_GUIDEVEL "guidevel_####" - -#define FLUID_GRIDNAME_DENSITY "density" -#define FLUID_GRIDNAME_SHADOW "shadow" -#define FLUID_GRIDNAME_VELOCITY "velocity" -#define FLUID_GRIDNAME_HEAT "heat" -#define FLUID_GRIDNAME_COLORR "color_r" -#define FLUID_GRIDNAME_COLORG "color_g" -#define FLUID_GRIDNAME_COLORB "color_b" -#define FLUID_GRIDNAME_FLAME "flame" -#define FLUID_GRIDNAME_FUEL "fuel" -#define FLUID_GRIDNAME_REACT "react" -#define FLUID_GRIDNAME_DENSITYNOISE "density_noise" -#define FLUID_GRIDNAME_COLORRNOISE "color_r_noise" -#define FLUID_GRIDNAME_COLORGNOISE "color_g_noise" -#define FLUID_GRIDNAME_COLORBNOISE "color_b_noise" -#define FLUID_GRIDNAME_FLAMENOISE "flame_noise" -#define FLUID_GRIDNAME_FUELNOISE "fuel_noise" -#define FLUID_GRIDNAME_REACTNOISE "react_noise" - +/* Cache file names. */ +#define FLUID_NAME_CONFIG "config" +#define FLUID_NAME_DATA "fluid_data" +#define FLUID_NAME_NOISE "fluid_noise" +#define FLUID_NAME_MESH "fluid_mesh" +#define FLUID_NAME_PARTICLES "fluid_particles" +#define FLUID_NAME_GUIDING "fluid_guiding" + +/* Fluid object names.*/ +#define FLUID_NAME_FLAGS "flags" +#define FLUID_NAME_VELOCITY "vel" +#define FLUID_NAME_VELOCITYTMP "velocityTmp" +#define FLUID_NAME_VELOCITYX "x_vel" +#define FLUID_NAME_VELOCITYY "y_vel" +#define FLUID_NAME_VELOCITYZ "z_vel" +#define FLUID_NAME_PRESSURE "pressure" +#define FLUID_NAME_PHIOBS "phiObs" +#define FLUID_NAME_PHISIN "phiSIn" +#define FLUID_NAME_PHIIN "phiIn" +#define FLUID_NAME_PHIOUT "phiOut" +#define FLUID_NAME_FORCES "forces" +#define FLUID_NAME_FORCE_X "x_force" +#define FLUID_NAME_FORCE_Y "y_force" +#define FLUID_NAME_FORCE_Z "z_force" +#define FLUID_NAME_NUMOBS "numObs" +#define FLUID_NAME_PHIOBSSIN "phiObsSIn" +#define FLUID_NAME_PHIOBSIN "phiObsIn" +#define FLUID_NAME_OBVEL "obvel" +#define FLUID_NAME_OBVELC "obvelC" +#define FLUID_NAME_OBVEL_X "x_obvel" +#define FLUID_NAME_OBVEL_Y "y_obvel" +#define FLUID_NAME_OBVEL_Z "z_obvel" +#define FLUID_NAME_FRACTIONS "fractions" +#define FLUID_NAME_INVELC "invelC" +#define FLUID_NAME_INVEL "invel" +#define FLUID_NAME_INVEL_X "x_invel" +#define FLUID_NAME_INVEL_Y "y_invel" +#define FLUID_NAME_INVEL_Z "z_invel" +#define FLUID_NAME_PHIOUTSIN "phiOutSIn" +#define FLUID_NAME_PHIOUTIN "phiOutIn" + +/* Smoke object names. */ +#define FLUID_NAME_SHADOW "shadow" +#define FLUID_NAME_EMISSION "emission" +#define FLUID_NAME_EMISSIONIN "emissionIn" +#define FLUID_NAME_DENSITY "density" +#define FLUID_NAME_DENSITYIN "densityIn" +#define FLUID_NAME_HEAT "heat" +#define FLUID_NAME_HEATIN "heatIn" +#define FLUID_NAME_COLORR "color_r" +#define FLUID_NAME_COLORG "color_g" +#define FLUID_NAME_COLORB "color_b" +#define FLUID_NAME_COLORRIN "color_r_in" +#define FLUID_NAME_COLORGIN "color_g_in" +#define FLUID_NAME_COLORBIN "color_b_in" +#define FLUID_NAME_FLAME "flame" +#define FLUID_NAME_FUEL "fuel" +#define FLUID_NAME_REACT "react" +#define FLUID_NAME_FUELIN "fuelIn" +#define FLUID_NAME_REACTIN "reactIn" + +/* Liquid object names. */ +#define FLUID_NAME_PHIPARTS "phiParts" +#define FLUID_NAME_PHI "phi" +#define FLUID_NAME_PHITMP "phiTmp" +#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_PINDEX "pindex" +#define FLUID_NAME_GPI "gpi" +#define FLUID_NAME_CURVATURE "gpi" + +/* Noise object names. */ +#define FLUID_NAME_VELOCITY_NOISE "velocity_noise" +#define FLUID_NAME_DENSITY_NOISE "density_noise" +#define FLUID_NAME_PHIIN_NOISE "phiIn_noise" +#define FLUID_NAME_PHIOUT_NOISE "phiOut_noise" +#define FLUID_NAME_PHIOBS_NOISE "phiObs_noise" +#define FLUID_NAME_FLAGS_NOISE "flags_noise" +#define FLUID_NAME_TMPIN_NOISE "tmpIn_noise" +#define FLUID_NAME_EMISSIONIN_NOISE "emissionIn_noise" +#define FLUID_NAME_ENERGY "energy" +#define FLUID_NAME_TMPFLAGS "tmpFlags" +#define FLUID_NAME_TEXTURE_U "textureU" +#define FLUID_NAME_TEXTURE_V "textureV" +#define FLUID_NAME_TEXTURE_W "textureW" +#define FLUID_NAME_TEXTURE_U2 "textureU2" +#define FLUID_NAME_TEXTURE_V2 "textureV2" +#define FLUID_NAME_TEXTURE_W2 "textureW2" +#define FLUID_NAME_UV0 "uvGrid0" +#define FLUID_NAME_UV1 "uvGrid1" +#define FLUID_NAME_COLORR_NOISE "color_r_noise" +#define FLUID_NAME_COLORG_NOISE "color_g_noise" +#define FLUID_NAME_COLORB_NOISE "color_b_noise" +#define FLUID_NAME_FLAME_NOISE "flame_noise" +#define FLUID_NAME_FUEL_NOISE "fuel_noise" +#define FLUID_NAME_REACT_NOISE "react_noise" + +/* Mesh object names. */ +#define FLUID_NAME_PHIPARTS_MESH "phiParts_mesh" +#define FLUID_NAME_PHI_MESH "phi_mesh" +#define FLUID_NAME_PP_MESH "pp_mesh" +#define FLUID_NAME_FLAGS_MESH "flags_mesh" +#define FLUID_NAME_LMESH "lMesh" +#define FLUID_NAME_VELOCITYVEC_MESH "lVelMesh" +#define FLUID_NAME_VELOCITY_MESH "velocity_mesh" +#define FLUID_NAME_PINDEX_MESH "pindex_mesh" +#define FLUID_NAME_GPI_MESH "gpi_mesh" + +/* Particles object names. */ +#define FLUID_NAME_PP_PARTICLES "ppSnd" +#define FLUID_NAME_PVEL_PARTICLES "pVelSnd" +#define FLUID_NAME_PFORCE_PARTICLES "pForceSnd" +#define FLUID_NAME_PLIFE_PARTICLES "pLifeSnd" +#define FLUID_NAME_VELOCITY_PARTICLES "velocity_particles" +#define FLUID_NAME_FLAGS_PARTICLES "flags_particles" +#define FLUID_NAME_PHI_PARTICLES "phi_particles" +#define FLUID_NAME_PHIOBS_PARTICLES "phiObs_particles" +#define FLUID_NAME_PHIOUT_PARTICLES "phiOut_particles" +#define FLUID_NAME_NORMAL_PARTICLES "normal_particles" +#define FLUID_NAME_NEIGHBORRATIO_PARTICLES "neighborRatio_particles" +#define FLUID_NAME_TRAPPEDAIR_PARTICLES "trappedAir_particles" +#define FLUID_NAME_WAVECREST_PARTICLES "waveCrest_particles" +#define FLUID_NAME_KINETICENERGY_PARTICLES "kineticEnergy_particles" + +/* Guiding object names. */ +#define FLUID_NAME_VELT "velT" +#define FLUID_NAME_WEIGHTGUIDE "weightGuide" +#define FLUID_NAME_NUMGUIDES "numGuides" +#define FLUID_NAME_PHIGUIDEIN "phiGuideIn" +#define FLUID_NAME_GUIDEVELC "guidevelC" +#define FLUID_NAME_GUIDEVEL_X "x_guidevel" +#define FLUID_NAME_GUIDEVEL_Y "Y_guidevel" +#define FLUID_NAME_GUIDEVEL_Z "z_guidevel" +#define FLUID_NAME_GUIDEVEL "guidevel" + +/* Cache file extensions. */ #define FLUID_DOMAIN_EXTENSION_UNI ".uni" #define FLUID_DOMAIN_EXTENSION_OPENVDB ".vdb" #define FLUID_DOMAIN_EXTENSION_RAW ".raw" |