archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fluid: Naming cleanup for flags grid

Browse Source 
Use flags instead of obstacle to avoid confusion with obstacle levelset grid.
This commit is contained in:
Sebastián Barschkis
2020-03-04 17:32:47 +01:00
parent 6958ec3f7f
commit bf8a73b4a7
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/mantaflow/extern/manta_fluid_API.h vendored
View File

@@ -112,7 +112,7 @@ void manta_smoke_export(struct MANTA *smoke,
float **r,
float **g,
float **b,
int **obstacles,
int **flags,
float **shadow);
void manta_smoke_turbulence_export(struct MANTA *smoke,
float **dens,
@@ -152,7 +152,7 @@ float *manta_smoke_get_shadow(struct MANTA *fluid);
float *manta_smoke_get_color_r(struct MANTA *smoke);
float *manta_smoke_get_color_g(struct MANTA *smoke);
float *manta_smoke_get_color_b(struct MANTA *smoke);
int *manta_smoke_get_obstacle(struct MANTA *smoke);
int *manta_smoke_get_flags(struct MANTA *smoke);
float *manta_smoke_get_density_in(struct MANTA *smoke);
float *manta_smoke_get_heat_in(struct MANTA *smoke);
float *manta_smoke_get_color_r_in(struct MANTA *smoke);

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

@@ -103,7 +103,7 @@ MANTA::MANTA(int *res, FluidModifierData *mmd) : mCurrentID(++solverID)
mColorR = nullptr;
mColorG = nullptr;
mColorB = nullptr;
mObstacle = nullptr;
mFlags = nullptr;
mDensityIn = nullptr;
mHeatIn = nullptr;
mColorRIn = nullptr;
@@ -3005,7 +3005,7 @@ void MANTA::updatePointers()
std::string mesh_ext2 = "_" + mesh2;
std::string noise_ext = "_" + noise;
mObstacle = (int *)pyObjectToPointer(callPythonFunction("flags" + solver_ext, func));
mFlags = (int *)pyObjectToPointer(callPythonFunction("flags" + solver_ext, func));
mPhiIn = (float *)pyObjectToPointer(callPythonFunction("phiIn" + solver_ext, func));
mVelocityX = (float *)pyObjectToPointer(callPythonFunction("x_vel" + solver_ext, func));
mVelocityY = (float *)pyObjectToPointer(callPythonFunction("y_vel" + solver_ext, func));

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

@@ -246,9 +246,9 @@ struct MANTA {
{
return mForceZ;
}
inline int *getObstacle()
inline int *getFlags()
{
return mObstacle;
return mFlags;
}
inline float *getNumObstacle()
{
@@ -785,7 +785,7 @@ struct MANTA {
float *mForceX;
float *mForceY;
float *mForceZ;
int *mObstacle;
int *mFlags;
float *mNumObstacle;
float *mNumGuide;

8
intern/mantaflow/intern/manta_fluid_API.cpp
View File

@@ -363,7 +363,7 @@ void manta_smoke_export(MANTA *smoke,
float **r,
float **g,
float **b,
int **obstacle,
int **flags,
float **shadow)
{
if (dens)
@@ -385,7 +385,7 @@ void manta_smoke_export(MANTA *smoke,
*g = smoke->getColorG();
if (b)
*b = smoke->getColorB();
*obstacle = smoke->getObstacle();
*flags = smoke->getFlags();
if (shadow)
*shadow = smoke->getShadow();
*dt = 1; // dummy value, not needed for smoke
@@ -590,9 +590,9 @@ float *manta_smoke_get_color_b(MANTA *smoke)
return smoke->getColorB();
}
int *manta_smoke_get_obstacle(MANTA *smoke)
int *manta_smoke_get_flags(MANTA *smoke)
{
return smoke->getObstacle();
return smoke->getFlags();
}
float *manta_smoke_get_density_in(MANTA *smoke)

2
source/blender/blenkernel/intern/fluid.c
View File

@@ -2834,7 +2834,7 @@ static void update_effectors(
data.velocity_x = manta_get_velocity_x(mds->fluid);
data.velocity_y = manta_get_velocity_y(mds->fluid);
data.velocity_z = manta_get_velocity_z(mds->fluid);
data.flags = manta_smoke_get_obstacle(mds->fluid);
data.flags = manta_smoke_get_flags(mds->fluid);
data.phi_obs_in = manta_get_phiobs_in(mds->fluid);
TaskParallelSettings settings;