[Bf-blender-cvs] [6c50e82efb3] blender-v2.82-release: Fluid: Refactored the Mantaflow <-> Blender pointer exchange function and switched to from NULL to nullptr in cpp files
Sebastián Barschkis
noreply at git.blender.org
Tue Jan 21 18:31:20 CET 2020
Commit: 6c50e82efb3e46ef0a2a1b63bd4e1c8a64d559d0
Author: Sebastián Barschkis
Date: Tue Jan 21 18:30:55 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB6c50e82efb3e46ef0a2a1b63bd4e1c8a64d559d0
Fluid: Refactored the Mantaflow <-> Blender pointer exchange function and switched to from NULL to nullptr in cpp files
===================================================================
M intern/mantaflow/intern/MANTA_main.cpp
M intern/mantaflow/intern/MANTA_main.h
M intern/mantaflow/intern/manta_fluid_API.cpp
===================================================================
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp
index 0e0a0ddf021..79363126aff 100644
--- a/intern/mantaflow/intern/MANTA_main.cpp
+++ b/intern/mantaflow/intern/MANTA_main.cpp
@@ -84,81 +84,81 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID)
mResGuiding = mmd->domain->res;
// Smoke low res grids
- mDensity = NULL;
- mShadow = NULL;
- mHeat = NULL;
- mVelocityX = NULL;
- mVelocityY = NULL;
- mVelocityZ = NULL;
- mForceX = NULL;
- mForceY = NULL;
- mForceZ = NULL;
- mFlame = NULL;
- mFuel = NULL;
- mReact = NULL;
- mColorR = NULL;
- mColorG = NULL;
- mColorB = NULL;
- mObstacle = NULL;
- mDensityIn = NULL;
- mHeatIn = NULL;
- mColorRIn = NULL;
- mColorGIn = NULL;
- mColorBIn = NULL;
- mFuelIn = NULL;
- mReactIn = NULL;
- mEmissionIn = NULL;
+ mDensity = nullptr;
+ mShadow = nullptr;
+ mHeat = nullptr;
+ mVelocityX = nullptr;
+ mVelocityY = nullptr;
+ mVelocityZ = nullptr;
+ mForceX = nullptr;
+ mForceY = nullptr;
+ mForceZ = nullptr;
+ mFlame = nullptr;
+ mFuel = nullptr;
+ mReact = nullptr;
+ mColorR = nullptr;
+ mColorG = nullptr;
+ mColorB = nullptr;
+ mObstacle = nullptr;
+ mDensityIn = nullptr;
+ mHeatIn = nullptr;
+ mColorRIn = nullptr;
+ mColorGIn = nullptr;
+ mColorBIn = nullptr;
+ mFuelIn = nullptr;
+ mReactIn = nullptr;
+ mEmissionIn = nullptr;
// Smoke high res grids
- mDensityHigh = NULL;
- mFlameHigh = NULL;
- mFuelHigh = NULL;
- mReactHigh = NULL;
- mColorRHigh = NULL;
- mColorGHigh = NULL;
- mColorBHigh = NULL;
- mTextureU = NULL;
- mTextureV = NULL;
- mTextureW = NULL;
- mTextureU2 = NULL;
- mTextureV2 = NULL;
- mTextureW2 = NULL;
+ mDensityHigh = nullptr;
+ mFlameHigh = nullptr;
+ mFuelHigh = nullptr;
+ mReactHigh = nullptr;
+ mColorRHigh = nullptr;
+ mColorGHigh = nullptr;
+ mColorBHigh = nullptr;
+ mTextureU = nullptr;
+ mTextureV = nullptr;
+ mTextureW = nullptr;
+ mTextureU2 = nullptr;
+ mTextureV2 = nullptr;
+ mTextureW2 = nullptr;
// Fluid low res grids
- mPhiIn = NULL;
- mPhiOutIn = NULL;
- mPhi = NULL;
+ mPhiIn = nullptr;
+ mPhiOutIn = nullptr;
+ mPhi = nullptr;
// Mesh
- mMeshNodes = NULL;
- mMeshTriangles = NULL;
- mMeshVelocities = NULL;
+ mMeshNodes = nullptr;
+ mMeshTriangles = nullptr;
+ mMeshVelocities = nullptr;
// Fluid obstacle
- mPhiObsIn = NULL;
- mNumObstacle = NULL;
- mObVelocityX = NULL;
- mObVelocityY = NULL;
- mObVelocityZ = NULL;
+ mPhiObsIn = nullptr;
+ mNumObstacle = nullptr;
+ mObVelocityX = nullptr;
+ mObVelocityY = nullptr;
+ mObVelocityZ = nullptr;
// Fluid guiding
- mPhiGuideIn = NULL;
- mNumGuide = NULL;
- mGuideVelocityX = NULL;
- mGuideVelocityY = NULL;
- mGuideVelocityZ = NULL;
+ mPhiGuideIn = nullptr;
+ mNumGuide = nullptr;
+ mGuideVelocityX = nullptr;
+ mGuideVelocityY = nullptr;
+ mGuideVelocityZ = nullptr;
// Fluid initial velocity
- mInVelocityX = NULL;
- mInVelocityY = NULL;
- mInVelocityZ = NULL;
+ mInVelocityX = nullptr;
+ mInVelocityY = nullptr;
+ mInVelocityZ = nullptr;
// Secondary particles
- mFlipParticleData = NULL;
- mFlipParticleVelocity = NULL;
- mSndParticleData = NULL;
- mSndParticleVelocity = NULL;
- mSndParticleLife = NULL;
+ mFlipParticleData = nullptr;
+ mFlipParticleVelocity = nullptr;
+ mSndParticleData = nullptr;
+ mSndParticleVelocity = nullptr;
+ mSndParticleLife = nullptr;
// Cache read success indicators
mFlipFromFile = false;
@@ -1029,7 +1029,7 @@ int MANTA::updateFlipStructures(FluidModifierData *mmd, int framenr)
std::string pformat = getCacheFileEnding(mmd->domain->cache_particle_format);
BLI_path_join(
- cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_DATA, NULL);
+ cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_DATA, nullptr);
// TODO (sebbas): Use pp_xl and pVel_xl when using upres simulation?
@@ -1081,7 +1081,7 @@ int MANTA::updateMeshStructures(FluidModifierData *mmd, int framenr)
std::string mformat = getCacheFileEnding(mmd->domain->cache_mesh_format);
std::string dformat = getCacheFileEnding(mmd->domain->cache_data_format);
BLI_path_join(
- cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_MESH, NULL);
+ cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_MESH, nullptr);
ss << "lMesh_####" << mformat;
BLI_join_dirfile(targetFile, sizeof(targetFile), cacheDir, ss.str().c_str());
@@ -1131,8 +1131,11 @@ int MANTA::updateParticleStructures(FluidModifierData *mmd, int framenr)
targetFile[0] = '\0';
std::string pformat = getCacheFileEnding(mmd->domain->cache_particle_format);
- BLI_path_join(
- cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_PARTICLES, NULL);
+ BLI_path_join(cacheDir,
+ sizeof(cacheDir),
+ mmd->domain->cache_directory,
+ FLUID_DOMAIN_DIR_PARTICLES,
+ nullptr);
ss << "ppSnd_####" << pformat;
BLI_join_dirfile(targetFile, sizeof(targetFile), cacheDir, ss.str().c_str());
@@ -1192,7 +1195,7 @@ int MANTA::writeConfiguration(FluidModifierData *mmd, int framenr)
std::string dformat = getCacheFileEnding(mmd->domain->cache_data_format);
BLI_path_join(
- cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_CONFIG, NULL);
+ cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_CONFIG, nullptr);
BLI_path_make_safe(cacheDir);
BLI_dir_create_recursive(cacheDir); /* Create 'config' subdir if it does not exist already */
@@ -1246,7 +1249,7 @@ int MANTA::writeData(FluidModifierData *mmd, int framenr)
sizeof(cacheDirData),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_DATA,
- NULL);
+ nullptr);
BLI_path_make_safe(cacheDirData);
ss.str("");
@@ -1285,7 +1288,7 @@ int MANTA::readConfiguration(FluidModifierData *mmd, int framenr)
std::string dformat = getCacheFileEnding(mmd->domain->cache_data_format);
BLI_path_join(
- cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_CONFIG, NULL);
+ cacheDir, sizeof(cacheDir), mmd->domain->cache_directory, FLUID_DOMAIN_DIR_CONFIG, nullptr);
BLI_path_make_safe(cacheDir);
ss.str("");
@@ -1345,16 +1348,25 @@ int MANTA::readData(FluidModifierData *mmd, int framenr)
sizeof(cacheDirData),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_DATA,
- NULL);
+ nullptr);
BLI_path_make_safe(cacheDirData);
/* Exit early if there is nothing present in the cache for this frame */
ss.str("");
- ss << "vel_####" << dformat;
- BLI_join_dirfile(targetFile, sizeof(targetFile), cacheDirData, ss.str().c_str());
- BLI_path_frame(targetFile, framenr, 0);
- if (!BLI_exists(targetFile))
- return 0;
+ if (mUsingSmoke) {
+ ss << "density_####" << dformat;
+ BLI_join_dirfile(targetFile, sizeof(targetFile), cacheDirData, ss.str().c_str());
+ BLI_path_frame(targetFile, framenr, 0);
+ if (!BLI_exists(targetFile))
+ return 0;
+ }
+ if (mUsingLiquid) {
+ ss << "phi_####" << dformat;
+ BLI_join_dirfile(targetFile, sizeof(targetFile), cacheDirData, ss.str().c_str());
+ BLI_path_frame(targetFile, framenr, 0);
+ if (!BLI_exists(targetFile))
+ return 0;
+ }
ss.str("");
ss << "fluid_load_data_" << mCurrentID << "('" << escapeSlashes(cacheDirData) << "', " << framenr
@@ -1402,7 +1414,7 @@ int MANTA::readNoise(FluidModifierData *mmd, int framenr)
sizeof(cacheDirNoise),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_NOISE,
- NULL);
+ nullptr);
BLI_path_make_safe(cacheDirNoise);
/* Exit early if there is nothing present in the cache for this frame */
@@ -1447,7 +1459,7 @@ int MANTA::readMesh(FluidModifierData *mmd, int framenr)
sizeof(cacheDirMesh),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_MESH,
- NULL);
+ nullptr);
BLI_path_make_safe(cacheDirMesh);
/* Exit early if there is nothing present in the cache for this frame */
@@ -1503,7 +1515,7 @@ int MANTA::readParticles(FluidModifierData *mmd, int framenr)
sizeof(cacheDirParticles),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_PARTICLES,
- NULL);
+ nullptr);
BLI_path_make_safe(cacheDirParticles);
/* Exit early if there is nothing present in the cache for this frame */
@@ -1544,7 +1556,7 @@ int MANTA::readGuiding(FluidModifierData *mmd, int framenr, bool sourceDomain)
const char *subdir = (sourceDomain) ? FLUID_DOMAIN_DIR_DATA : FLUID_DOMAIN_DIR_GUIDE;
BLI_path_join(
- cacheDirGuiding, sizeof(cacheDirGuiding), mmd->domain->cache_directory, subdir, NULL);
+ cacheDirGuiding, sizeof(cacheDirGuiding), mmd->domain->cache_directory, subdir, nullptr);
BLI_path_make_safe(cacheDirGuiding);
/* Exit early if there is nothing present in the cache for this frame */
@@ -1592,12 +1604,12 @@ int MANTA::bakeData(FluidModifierData *mmd, int framenr)
sizeof(cacheDirData),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_DATA,
- NULL);
+ nullptr);
BLI_path_join(cacheDirGuiding,
sizeof(cacheDirGuiding),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_GUIDE,
- NULL);
+ nullptr);
BLI_path_make_safe(cacheDirData);
BLI_path_make_safe(cacheDirGuiding);
@@ -1633,12 +1645,12 @@ int MANTA::bakeNoise(FluidModifierData *mmd, int framenr)
sizeof(cacheDirData),
mmd->domain->cache_directory,
FLUID_DOMAIN_DIR_DATA,
- NULL);
+ nullptr);
BLI_path_join(cacheDirNoise,
sizeof(cacheDirNoise),
mmd->domain->cache_directory,
FLUID_DO
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list