[Bf-blender-cvs] [b91b90f0dd3] master: Fluid: Cleanup internal Python object names
Sebastián Barschkis
noreply at git.blender.org
Fri Jun 5 18:52:48 CEST 2020
Commit: b91b90f0dd3c9bff3b1a6e563c2cce293722ed16
Author: Sebastián Barschkis
Date: Fri Jun 5 18:51:45 2020 +0200
Branches: master
https://developer.blender.org/rBb91b90f0dd3c9bff3b1a6e563c2cce293722ed16
Fluid: Cleanup internal Python object names
Manta Python objects should not carry the global ID in their names.
===================================================================
M intern/mantaflow/intern/MANTA_main.cpp
M intern/mantaflow/intern/strings/fluid_script.h
M intern/mantaflow/intern/strings/liquid_script.h
M intern/mantaflow/intern/strings/smoke_script.h
M source/blender/makesdna/DNA_fluid_types.h
===================================================================
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 95013958561..e760cef8641 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -858,23 +858,144 @@ void MANTA::initializeRNAMap(FluidModifierData *mmd)
mRNAMap["GRAVITY_Y"] = to_string(mds->gravity[1]);
mRNAMap["GRAVITY_Z"] = to_string(mds->gravity[2]);
mRNAMap["CACHE_DIR"] = cacheDirectory;
- mRNAMap["NAME_DENSITY"] = FLUID_GRIDNAME_DENSITY;
- mRNAMap["NAME_SHADOW"] = FLUID_GRIDNAME_SHADOW;
- mRNAMap["NAME_HEAT"] = FLUID_GRIDNAME_HEAT;
- mRNAMap["NAME_VELOCITY"] = FLUID_GRIDNAME_VELOCITY;
- mRNAMap["NAME_COLORR"] = FLUID_GRIDNAME_COLORR;
- mRNAMap["NAME_COLORG"] = FLUID_GRIDNAME_COLORG;
- mRNAMap["NAME_COLORB"] = FLUID_GRIDNAME_COLORB;
- mRNAMap["NAME_FLAME"] = FLUID_GRIDNAME_FLAME;
- mRNAMap["NAME_FUEL"] = FLUID_GRIDNAME_FUEL;
- mRNAMap["NAME_REACT"] = FLUID_GRIDNAME_REACT;
- mRNAMap["NAME_DENSITYNOISE"] = FLUID_GRIDNAME_DENSITYNOISE;
- mRNAMap["NAME_COLORRNOISE"] = FLUID_GRIDNAME_COLORRNOISE;
- mRNAMap["NAME_COLORGNOISE"] = FLUID_GRIDNAME_COLORGNOISE;
- mRNAMap["NAME_COLORBNOISE"] = FLUID_GRIDNAME_COLORBNOISE;
- mRNAMap["NAME_FLAMENOISE"] = FLUID_GRIDNAME_FLAMENOISE;
- mRNAMap["NAME_FUELNOISE"] = FLUID_GRIDNAME_FUELNOISE;
- mRNAMap["NAME_REACTNOISE"] = FLUID_GRIDNAME_REACTNOISE;
+
+ /* Fluid object names. */
+ mRNAMap["NAME_FLAGS"] = FLUID_NAME_FLAGS;
+ mRNAMap["NAME_VELOCITY"] = FLUID_NAME_VELOCITY;
+ mRNAMap["NAME_VELOCITYTMP"] = FLUID_NAME_VELOCITYTMP;
+ mRNAMap["NAME_VELOCITY_X"] = FLUID_NAME_VELOCITYX;
+ mRNAMap["NAME_VELOCITY_Y"] = FLUID_NAME_VELOCITYY;
+ mRNAMap["NAME_VELOCITY_Z"] = FLUID_NAME_VELOCITYZ;
+ mRNAMap["NAME_PRESSURE"] = FLUID_NAME_PRESSURE;
+ mRNAMap["NAME_PHIOBS"] = FLUID_NAME_PHIOBS;
+ mRNAMap["NAME_PHISIN"] = FLUID_NAME_PHISIN;
+ mRNAMap["NAME_PHIIN"] = FLUID_NAME_PHIIN;
+ mRNAMap["NAME_PHIOUT"] = FLUID_NAME_PHIOUT;
+ mRNAMap["NAME_FORCES"] = FLUID_NAME_FORCES;
+ mRNAMap["NAME_FORCES_X"] = FLUID_NAME_FORCE_X;
+ mRNAMap["NAME_FORCES_Y"] = FLUID_NAME_FORCE_Y;
+ mRNAMap["NAME_FORCES_Z"] = FLUID_NAME_FORCE_Z;
+ mRNAMap["NAME_NUMOBS"] = FLUID_NAME_NUMOBS;
+ mRNAMap["NAME_PHIOBSSIN"] = FLUID_NAME_PHIOBSSIN;
+ mRNAMap["NAME_PHIOBSIN"] = FLUID_NAME_PHIOBSIN;
+ mRNAMap["NAME_OBVEL"] = FLUID_NAME_OBVEL;
+ mRNAMap["NAME_OBVELC"] = FLUID_NAME_OBVELC;
+ mRNAMap["NAME_OBVEL_X"] = FLUID_NAME_OBVEL_X;
+ mRNAMap["NAME_OBVEL_Y"] = FLUID_NAME_OBVEL_Y;
+ mRNAMap["NAME_OBVEL_Z"] = FLUID_NAME_OBVEL_Z;
+ mRNAMap["NAME_FRACTIONS"] = FLUID_NAME_FRACTIONS;
+ mRNAMap["NAME_INVELC"] = FLUID_NAME_INVELC;
+ mRNAMap["NAME_INVEL"] = FLUID_NAME_INVEL;
+ mRNAMap["NAME_INVEL_X"] = FLUID_NAME_INVEL_X;
+ mRNAMap["NAME_INVEL_Y"] = FLUID_NAME_INVEL_Y;
+ mRNAMap["NAME_INVEL_Z"] = FLUID_NAME_INVEL_Z;
+ mRNAMap["NAME_PHIOUTSIN"] = FLUID_NAME_PHIOUTSIN;
+ mRNAMap["NAME_PHIOUTIN"] = FLUID_NAME_PHIOUTIN;
+
+ /* Smoke object names. */
+ mRNAMap["NAME_SHADOW"] = FLUID_NAME_SHADOW;
+ mRNAMap["NAME_EMISSION"] = FLUID_NAME_EMISSION;
+ mRNAMap["NAME_EMISSIONIN"] = FLUID_NAME_EMISSIONIN;
+ mRNAMap["NAME_DENSITY"] = FLUID_NAME_DENSITY;
+ mRNAMap["NAME_DENSITYIN"] = FLUID_NAME_DENSITYIN;
+ mRNAMap["NAME_HEAT"] = FLUID_NAME_HEAT;
+ mRNAMap["NAME_HEATIN"] = FLUID_NAME_HEATIN;
+ mRNAMap["NAME_COLORR"] = FLUID_NAME_COLORR;
+ mRNAMap["NAME_COLORG"] = FLUID_NAME_COLORG;
+ mRNAMap["NAME_COLORB"] = FLUID_NAME_COLORB;
+ mRNAMap["NAME_COLORRIN"] = FLUID_NAME_COLORRIN;
+ mRNAMap["NAME_COLORGIN"] = FLUID_NAME_COLORGIN;
+ mRNAMap["NAME_COLORBIN"] = FLUID_NAME_COLORBIN;
+ mRNAMap["NAME_FLAME"] = FLUID_NAME_FLAME;
+ mRNAMap["NAME_FUEL"] = FLUID_NAME_FUEL;
+ mRNAMap["NAME_REACT"] = FLUID_NAME_REACT;
+ mRNAMap["NAME_FUELIN"] = FLUID_NAME_FUELIN;
+ mRNAMap["NAME_REACTIN"] = FLUID_NAME_REACTIN;
+
+ /* Liquid object names. */
+ mRNAMap["NAME_PHIPARTS"] = FLUID_NAME_PHIPARTS;
+ mRNAMap["NAME_PHI"] = FLUID_NAME_PHI;
+ mRNAMap["NAME_PHITMP"] = FLUID_NAME_PHITMP;
+ mRNAMap["NAME_VELOLD"] = FLUID_NAME_VELOCITYOLD;
+ mRNAMap["NAME_VELPARTS"] = FLUID_NAME_VELOCITYPARTS;
+ mRNAMap["NAME_MAPWEIGHTS"] = FLUID_NAME_MAPWEIGHTS;
+ mRNAMap["NAME_PP"] = FLUID_NAME_PP;
+ mRNAMap["NAME_PVEL"] = FLUID_NAME_PVEL;
+ mRNAMap["NAME_PINDEX"] = FLUID_NAME_PINDEX;
+ mRNAMap["NAME_GPI"] = FLUID_NAME_GPI;
+ mRNAMap["NAME_CURVATURE"] = FLUID_NAME_CURVATURE;
+
+ /* Noise object names. */
+ mRNAMap["NAME_VELOCITY_NOISE"] = FLUID_NAME_VELOCITY_NOISE;
+ mRNAMap["NAME_DENSITY_NOISE"] = FLUID_NAME_DENSITY_NOISE;
+ mRNAMap["NAME_PHIIN_NOISE"] = FLUID_NAME_PHIIN_NOISE;
+ mRNAMap["NAME_PHIOUT_NOISE"] = FLUID_NAME_PHIOUT_NOISE;
+ mRNAMap["NAME_PHIOBS_NOISE"] = FLUID_NAME_PHIOBS_NOISE;
+ mRNAMap["NAME_FLAGS_NOISE"] = FLUID_NAME_FLAGS_NOISE;
+ mRNAMap["NAME_TMPIN_NOISE"] = FLUID_NAME_TMPIN_NOISE;
+ mRNAMap["NAME_EMISSIONIN_NOISE"] = FLUID_NAME_EMISSIONIN_NOISE;
+ mRNAMap["NAME_ENERGY"] = FLUID_NAME_ENERGY;
+ mRNAMap["NAME_TMPFLAGS"] = FLUID_NAME_TMPFLAGS;
+ mRNAMap["NAME_TEXTURE_U"] = FLUID_NAME_TEXTURE_U;
+ mRNAMap["NAME_TEXTURE_V"] = FLUID_NAME_TEXTURE_V;
+ mRNAMap["NAME_TEXTURE_W"] = FLUID_NAME_TEXTURE_W;
+ mRNAMap["NAME_TEXTURE_U2"] = FLUID_NAME_TEXTURE_U2;
+ mRNAMap["NAME_TEXTURE_V2"] = FLUID_NAME_TEXTURE_V2;
+ mRNAMap["NAME_TEXTURE_W2"] = FLUID_NAME_TEXTURE_W2;
+ mRNAMap["NAME_UV0"] = FLUID_NAME_UV0;
+ mRNAMap["NAME_UV1"] = FLUID_NAME_UV1;
+ mRNAMap["NAME_COLORR_NOISE"] = FLUID_NAME_COLORR_NOISE;
+ mRNAMap["NAME_COLORG_NOISE"] = FLUID_NAME_COLORG_NOISE;
+ mRNAMap["NAME_COLORB_NOISE"] = FLUID_NAME_COLORB_NOISE;
+ mRNAMap["NAME_FLAME_NOISE"] = FLUID_NAME_FLAME_NOISE;
+ mRNAMap["NAME_FUEL_NOISE"] = FLUID_NAME_FUEL_NOISE;
+ mRNAMap["NAME_REACT_NOISE"] = FLUID_NAME_REACT_NOISE;
+
+ /* Mesh object names. */
+ mRNAMap["NAME_PHIPARTS_MESH"] = FLUID_NAME_PHIPARTS_MESH;
+ mRNAMap["NAME_PHI_MESH"] = FLUID_NAME_PHI_MESH;
+ mRNAMap["NAME_PP_MESH"] = FLUID_NAME_PP_MESH;
+ mRNAMap["NAME_FLAGS_MESH"] = FLUID_NAME_FLAGS_MESH;
+ mRNAMap["NAME_LMESH"] = FLUID_NAME_LMESH;
+ mRNAMap["NAME_VELOCITYVEC_MESH"] = FLUID_NAME_VELOCITYVEC_MESH;
+ mRNAMap["NAME_VELOCITY_MESH"] = FLUID_NAME_VELOCITY_MESH;
+ mRNAMap["NAME_PINDEX_MESH"] = FLUID_NAME_PINDEX_MESH;
+ mRNAMap["NAME_GPI_MESH"] = FLUID_NAME_GPI_MESH;
+
+ /* Particles object names. */
+ mRNAMap["NAME_PP_PARTICLES"] = FLUID_NAME_PP_PARTICLES;
+ mRNAMap["NAME_PVEL_PARTICLES"] = FLUID_NAME_PVEL_PARTICLES;
+ mRNAMap["NAME_PFORCE_PARTICLES"] = FLUID_NAME_PFORCE_PARTICLES;
+ mRNAMap["NAME_PLIFE_PARTICLES"] = FLUID_NAME_PLIFE_PARTICLES;
+ mRNAMap["NAME_VELOCITY_PARTICLES"] = FLUID_NAME_VELOCITY_PARTICLES;
+ mRNAMap["NAME_FLAGS_PARTICLES"] = FLUID_NAME_FLAGS_PARTICLES;
+ mRNAMap["NAME_PHI_PARTICLES"] = FLUID_NAME_PHI_PARTICLES;
+ mRNAMap["NAME_PHIOBS_PARTICLES"] = FLUID_NAME_PHIOBS_PARTICLES;
+ mRNAMap["NAME_PHIOUT_PARTICLES"] = FLUID_NAME_PHIOUT_PARTICLES;
+ mRNAMap["NAME_NORMAL_PARTICLES"] = FLUID_NAME_NORMAL_PARTICLES;
+ mRNAMap["NAME_NEIGHBORRATIO_PARTICLES"] = FLUID_NAME_NEIGHBORRATIO_PARTICLES;
+ mRNAMap["NAME_TRAPPEDAIR_PARTICLES"] = FLUID_NAME_TRAPPEDAIR_PARTICLES;
+ mRNAMap["NAME_WAVECREST_PARTICLES"] = FLUID_NAME_WAVECREST_PARTICLES;
+ mRNAMap["NAME_KINETICENERGY_PARTICLES"] = FLUID_NAME_KINETICENERGY_PARTICLES;
+
+ /* Guiding object names. */
+ mRNAMap["NAME_VELT"] = FLUID_NAME_VELT;
+ mRNAMap["NAME_WEIGHTGUIDE"] = FLUID_NAME_WEIGHTGUIDE;
+ mRNAMap["NAME_NUMGUIDES"] = FLUID_NAME_NUMGUIDES;
+ mRNAMap["NAME_PHIGUIDEIN"] = FLUID_NAME_PHIGUIDEIN;
+ mRNAMap["NAME_GUIDEVELC"] = FLUID_NAME_GUIDEVELC;
+ mRNAMap["NAME_GUIDEVEL_X"] = FLUID_NAME_GUIDEVEL_X;
+ mRNAMap["NAME_GUIDEVEL_Y"] = FLUID_NAME_GUIDEVEL_Y;
+ mRNAMap["NAME_GUIDEVEL_Z"] = FLUID_NAME_GUIDEVEL_Z;
+ mRNAMap["NAME_GUIDEVEL"] = FLUID_NAME_GUIDEVEL;
+
+ /* Cache file names. */
+ mRNAMap["NAME_CONFIG"] = FLUID_NAME_CONFIG;
+ mRNAMap["NAME_DATA"] = FLUID_NAME_DATA;
+ mRNAMap["NAME_NOISE"] = FLUID_NAME_NOISE;
+ mRNAMap["NAME_MESH"] = FLUID_NAME_MESH;
+ mRNAMap["NAME_PARTICLES"] = FLUID_NAME_PARTICLES;
+ mRNAMap["NAME_GUIDING"] = FLUID_NAME_GUIDING;
}
string MANTA::getRealValue(const string &varName)
@@ -965,7 +1086,7 @@ bool MANTA::updateFlipStructures(FluidModifierData *mmd, int framenr)
mFlipParticleVelocity->clear();
string pformat = getCacheFileEnding(mds->cache_particle_format);
- string file = getFile(mmd, FLUID_DOMAIN_DIR_DATA, FLUID_FILENAME_PP, pformat, framenr);
+ string file = getFile(mmd, FLUID_DOMAIN_DIR_DATA, FLUID_NAME_PP, pformat, framenr);
expected += 1;
if (BLI_exists(file.c_str())) {
@@ -973,7 +1094,7 @@ bool MANTA::updateFlipStructures(FluidModifierData *mmd, int framenr)
assert(result == expected);
}
- file = getFile(mmd, FLUID_DOMAIN_DIR_DATA, FLUID_FILENAME_PVEL, pformat, framenr);
+ file = getFile(mmd, FLUID_DOMAIN_DIR_DATA, FLUID_NAME_PVEL, pformat, framenr);
expected += 1;
if (BLI_exists(file.c_str())) {
result += updateParticlesFromFile(file, false, true);
@@ -1011,7 +1132,7 @@ bool MANTA::updateMeshStructures(FluidModifierData *mmd, int framenr)
string mformat = getCacheFileEnding(mds->cache_mesh_format);
string dformat = getCacheFileEnding(mds->cache_data_format);
- string file = getFile(mmd, FLUID_DOMAIN_DIR_MESH, FLUID_FILENAME_MESH, mformat, framenr);
+ string file = getFile(mmd, FLUID_DOMAIN_DIR_MESH, FLUID_NAME_LMESH, mformat, framenr);
expected += 1;
if (BLI_exists(file.c_str())) {
@@ -1020,7 +1141,7 @@ bool MANTA::updateMeshStructures(FluidModifierData *mmd, int framenr)
}
if (mUsingMVel) {
- file = getFile(mmd, FLUID_DOMAIN_DIR_MESH, FLUID_FILENAME_MESHVEL, dformat, framenr);
+ file = getFile(mmd, FLUID_DOMAIN_DIR_MESH, FLUID_NAME_VELOCITYVEC_MESH, dformat, framenr);
expected += 1;
if (BLI_exists(file.c_str())) {
result += updateMeshFromFile(file);
@@ -1056,7 +1177,8 @@ bool MANTA::updateParticleStructures(FluidModifierData *mmd, int framenr)
mSndParticleLife->clear();
string pformat = getCacheFileEnding(mds->cache_particle_format);
- string file = getFile(mmd, FLUID_DOMAIN_DIR_PARTICLES, FLUID_FILENAME_PPSND, pformat, framenr);
+ string file = getFile(
+ mmd, FLUID_DOMAIN_DIR_PARTICLES, FLUID_NAME_PP_PART
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list