Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fluid: Cleanup use of std in MANTA wrapper

Browse Source 
Moved std namespace to beginning of class.
This commit is contained in:
Sebastián Barschkis
2020-05-03 21:10:38 +02:00
parent 82f9ed9305
commit 70fe988dc4
2 changed files with 565 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1086
intern/mantaflow/intern/MANTA_main.cpp
View File

File diff suppressed because it is too large Load Diff

65
intern/mantaflow/intern/MANTA_main.h
View File

@@ -30,6 +30,11 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
using std::atomic;
using std::string;
using std::unordered_map;
using std::vector;
struct MANTA { struct MANTA {
public: public:
MANTA(int *res, struct FluidModifierData *mmd); MANTA(int *res, struct FluidModifierData *mmd);
@@ -415,7 +420,7 @@ struct MANTA {
return mPhi; return mPhi;
} }
static std::atomic<int> solverID; static atomic<int> solverID;
static int with_debug; // on or off (1 or 0), also sets manta debug level static int with_debug; // on or off (1 or 0), also sets manta debug level
// Mesh getters // Mesh getters
@@ -742,7 +747,7 @@ struct MANTA {
size_t mTotalCellsMesh; size_t mTotalCellsMesh;
size_t mTotalCellsParticles; size_t mTotalCellsParticles;
std::unordered_map<std::string, std::string> mRNAMap; unordered_map<string, string> mRNAMap;
int mCurrentID; int mCurrentID;
@@ -855,17 +860,17 @@ struct MANTA {
float *mPhi; float *mPhi;
// Mesh fields // Mesh fields
std::vector<Node> *mMeshNodes; vector<Node> *mMeshNodes;
std::vector<Triangle> *mMeshTriangles; vector<Triangle> *mMeshTriangles;
std::vector<pVel> *mMeshVelocities; vector<pVel> *mMeshVelocities;
// Particle fields // Particle fields
std::vector<pData> *mFlipParticleData; vector<pData> *mFlipParticleData;
std::vector<pVel> *mFlipParticleVelocity; vector<pVel> *mFlipParticleVelocity;
std::vector<pData> *mSndParticleData; vector<pData> *mSndParticleData;
std::vector<pVel> *mSndParticleVelocity; vector<pVel> *mSndParticleVelocity;
std::vector<float> *mSndParticleLife; vector<float> *mSndParticleLife;
void initializeRNAMap(struct FluidModifierData *mmd = NULL); void initializeRNAMap(struct FluidModifierData *mmd = NULL);
void initDomain(struct FluidModifierData *mmd = NULL); void initDomain(struct FluidModifierData *mmd = NULL);
@@ -875,26 +880,26 @@ struct MANTA {
void initSmokeNoise(struct FluidModifierData *mmd = NULL); void initSmokeNoise(struct FluidModifierData *mmd = NULL);
void initializeMantaflow(); void initializeMantaflow();
void terminateMantaflow(); void terminateMantaflow();
bool runPythonString(std::vector<std::string> commands); bool runPythonString(vector<string> commands);
std::string getRealValue(const std::string &varName); string getRealValue(const string &varName);
std::string parseLine(const std::string &line); string parseLine(const string &line);
std::string parseScript(const std::string &setup_string, FluidModifierData *mmd = NULL); string parseScript(const string &setup_string, FluidModifierData *mmd = NULL);
bool updateMeshFromBobj(std::string filename); bool updateMeshFromBobj(string filename);
bool updateMeshFromObj(std::string filename); bool updateMeshFromObj(string filename);
bool updateMeshFromUni(std::string filename); bool updateMeshFromUni(string filename);
bool updateParticlesFromUni(std::string filename, bool isSecondarySys, bool isVelData); bool updateParticlesFromUni(string filename, bool isSecondarySys, bool isVelData);
bool updateGridFromUni(std::string filename, float *grid, bool isNoise); bool updateGridFromUni(string filename, float *grid, bool isNoise);
bool updateGridFromVDB(std::string filename, float *grid, bool isNoise); bool updateGridFromVDB(string filename, float *grid, bool isNoise);
bool updateGridFromRaw(std::string filename, float *grid, bool isNoise); bool updateGridFromRaw(string filename, float *grid, bool isNoise);
bool updateMeshFromFile(std::string filename); bool updateMeshFromFile(string filename);
bool updateParticlesFromFile(std::string filename, bool isSecondarySys, bool isVelData); bool updateParticlesFromFile(string filename, bool isSecondarySys, bool isVelData);
bool updateGridFromFile(std::string filename, float *grid, bool isNoise); bool updateGridFromFile(string filename, float *grid, bool isNoise);
std::string getDirectory(struct FluidModifierData *mmd, std::string subdirectory); string getDirectory(struct FluidModifierData *mmd, string subdirectory);
std::string getFile(struct FluidModifierData *mmd, string getFile(struct FluidModifierData *mmd,
std::string subdirectory, string subdirectory,
std::string fname, string fname,
std::string extension, string extension,
int framenr); int framenr);
}; };
#endif #endif