diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/mantaflow/intern/MANTA_main.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/intern/mantaflow/intern/MANTA_main.cpp b/intern/mantaflow/intern/MANTA_main.cpp index a93242b29b9..6c252f9f8e4 100644 --- a/intern/mantaflow/intern/MANTA_main.cpp +++ b/intern/mantaflow/intern/MANTA_main.cpp @@ -70,7 +70,7 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID) mUsingObstacle = (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE); mUsingInvel = (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL); mUsingOutflow = (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OUTFLOW); - mUsingGuiding = (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDING); + mUsingGuiding = (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDE); // Simulation constants mTempAmb = 0; // TODO: Maybe use this later for buoyancy calculation @@ -200,7 +200,7 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID) } if (mUsingGuiding) { - mResGuiding = (mmd->domain->guiding_parent) ? mmd->domain->guide_res : mmd->domain->res; + mResGuiding = (mmd->domain->guide_parent) ? mmd->domain->guide_res : mmd->domain->res; initGuiding(mmd); } if (mUsingFractions) { @@ -226,7 +226,7 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID) initOutflow(mmd); if (mUsingGuiding) { - mResGuiding = (mmd->domain->guiding_parent) ? mmd->domain->guide_res : mmd->domain->res; + mResGuiding = (mmd->domain->guide_parent) ? mmd->domain->guide_res : mmd->domain->res; initGuiding(mmd); } @@ -603,7 +603,7 @@ std::string MANTA::getRealValue(const std::string &varName, FluidModifierData *m else if (varName == "USING_OBSTACLE") ss << (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE ? "True" : "False"); else if (varName == "USING_GUIDING") - ss << (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDING ? "True" : "False"); + ss << (mmd->domain->flags & FLUID_DOMAIN_USE_GUIDE ? "True" : "False"); else if (varName == "USING_INVEL") ss << (mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL ? "True" : "False"); else if (varName == "USING_OUTFLOW") @@ -920,11 +920,11 @@ std::string MANTA::getRealValue(const std::string &varName, FluidModifierData *m ss << (((mmd->domain->particle_type & tmpVar)) ? "True" : "False"); } else if (varName == "GUIDING_ALPHA") - ss << mmd->domain->guiding_alpha; + ss << mmd->domain->guide_alpha; else if (varName == "GUIDING_BETA") - ss << mmd->domain->guiding_beta; + ss << mmd->domain->guide_beta; else if (varName == "GUIDING_FACTOR") - ss << mmd->domain->guiding_vel_factor; + ss << mmd->domain->guide_vel_factor; else if (varName == "GRAVITY_X") ss << mmd->domain->gravity[0]; else if (varName == "GRAVITY_Y") @@ -1535,7 +1535,7 @@ int MANTA::readGuiding(FluidModifierData *mmd, int framenr, bool sourceDomain) targetFile[0] = '\0'; std::string gformat = getCacheFileEnding(mmd->domain->cache_data_format); - const char *subdir = (sourceDomain) ? FLUID_DOMAIN_DIR_DATA : FLUID_DOMAIN_DIR_GUIDING; + const char *subdir = (sourceDomain) ? FLUID_DOMAIN_DIR_DATA : FLUID_DOMAIN_DIR_GUIDE; BLI_path_join( cacheDirGuiding, sizeof(cacheDirGuiding), mmd->domain->cache_directory, subdir, NULL); @@ -1590,7 +1590,7 @@ int MANTA::bakeData(FluidModifierData *mmd, int framenr) BLI_path_join(cacheDirGuiding, sizeof(cacheDirGuiding), mmd->domain->cache_directory, - FLUID_DOMAIN_DIR_GUIDING, + FLUID_DOMAIN_DIR_GUIDE, NULL); BLI_path_make_safe(cacheDirData); BLI_path_make_safe(cacheDirGuiding); @@ -1736,7 +1736,7 @@ int MANTA::bakeGuiding(FluidModifierData *mmd, int framenr) BLI_path_join(cacheDirGuiding, sizeof(cacheDirGuiding), mmd->domain->cache_directory, - FLUID_DOMAIN_DIR_GUIDING, + FLUID_DOMAIN_DIR_GUIDE, NULL); BLI_path_make_safe(cacheDirGuiding); @@ -1804,7 +1804,7 @@ void MANTA::exportSmokeScript(FluidModifierData *mmd) bool colors = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_COLORS; bool fire = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_FIRE; bool obstacle = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE; - bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDING; + bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDE; bool invel = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL; std::string manta_script; @@ -1912,7 +1912,7 @@ void MANTA::exportLiquidScript(FluidModifierData *mmd) bool floater = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_FOAM; bool tracer = mmd->domain->particle_type & FLUID_DOMAIN_PARTICLE_TRACER; bool obstacle = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_OBSTACLE; - bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDING; + bool guiding = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_GUIDE; bool invel = mmd->domain->active_fields & FLUID_DOMAIN_ACTIVE_INVEL; std::string manta_script; |