[Bf-blender-cvs] [6b7b619f06a] fluid-mantaflow: Mantaflow: Cleaned up extern C in implementation file
Sebastián Barschkis
noreply at git.blender.org
Wed Nov 27 11:39:50 CET 2019
Commit: 6b7b619f06af6d64ab75a6dcad11d246c2ce7c04
Author: Sebastián Barschkis
Date: Wed Nov 27 11:39:33 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB6b7b619f06af6d64ab75a6dcad11d246c2ce7c04
Mantaflow: Cleaned up extern C in implementation file
No need to duplicate it, it is already declared in header file
===================================================================
M intern/mantaflow/intern/manta_fluid_API.cpp
===================================================================
diff --git a/intern/mantaflow/intern/manta_fluid_API.cpp b/intern/mantaflow/intern/manta_fluid_API.cpp
index e79fc5846ff..09485046df5 100644
--- a/intern/mantaflow/intern/manta_fluid_API.cpp
+++ b/intern/mantaflow/intern/manta_fluid_API.cpp
@@ -33,38 +33,38 @@
#include "manta_fluid_API.h"
/* Fluid functions */
-extern "C" MANTA *manta_init(int *res, struct MantaModifierData *mmd)
+MANTA *manta_init(int *res, struct MantaModifierData *mmd)
{
return new MANTA(res, mmd);
}
-extern "C" void manta_free(MANTA *fluid)
+void manta_free(MANTA *fluid)
{
delete fluid;
fluid = NULL;
}
-extern "C" void manta_ensure_obstacle(MANTA *fluid, struct MantaModifierData *mmd)
+void manta_ensure_obstacle(MANTA *fluid, struct MantaModifierData *mmd)
{
if (fluid) {
fluid->initObstacle(mmd);
fluid->updatePointers();
}
}
-extern "C" void manta_ensure_guiding(MANTA *fluid, struct MantaModifierData *mmd)
+void manta_ensure_guiding(MANTA *fluid, struct MantaModifierData *mmd)
{
if (fluid) {
fluid->initGuiding(mmd);
fluid->updatePointers();
}
}
-extern "C" void manta_ensure_invelocity(MANTA *fluid, struct MantaModifierData *mmd)
+void manta_ensure_invelocity(MANTA *fluid, struct MantaModifierData *mmd)
{
if (fluid) {
fluid->initInVelocity(mmd);
fluid->updatePointers();
}
}
-extern "C" void manta_ensure_outflow(MANTA *fluid, struct MantaModifierData *mmd)
+void manta_ensure_outflow(MANTA *fluid, struct MantaModifierData *mmd)
{
if (fluid) {
fluid->initOutflow(mmd);
@@ -72,56 +72,56 @@ extern "C" void manta_ensure_outflow(MANTA *fluid, struct MantaModifierData *mmd
}
}
-extern "C" int manta_write_config(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_write_config(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->writeConfiguration(mmd, framenr);
}
-extern "C" int manta_write_data(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_write_data(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->writeData(mmd, framenr);
}
-extern "C" int manta_read_config(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_read_config(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->readConfiguration(mmd, framenr);
}
-extern "C" int manta_read_data(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_read_data(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->readData(mmd, framenr);
}
-extern "C" int manta_read_noise(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_read_noise(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->readNoise(mmd, framenr);
}
-extern "C" int manta_read_mesh(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_read_mesh(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->readMesh(mmd, framenr);
}
-extern "C" int manta_read_particles(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_read_particles(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->readParticles(mmd, framenr);
}
-extern "C" int manta_read_guiding(MANTA *fluid,
+int manta_read_guiding(MANTA *fluid,
MantaModifierData *mmd,
int framenr,
bool sourceDomain)
@@ -131,89 +131,89 @@ extern "C" int manta_read_guiding(MANTA *fluid,
return fluid->readGuiding(mmd, framenr, sourceDomain);
}
-extern "C" int manta_update_liquid_structures(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_update_liquid_structures(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->updateFlipStructures(mmd, framenr);
}
-extern "C" int manta_update_mesh_structures(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_update_mesh_structures(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->updateMeshStructures(mmd, framenr);
}
-extern "C" int manta_update_particle_structures(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_update_particle_structures(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->updateParticleStructures(mmd, framenr);
}
-extern "C" int manta_bake_data(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_bake_data(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->bakeData(mmd, framenr);
}
-extern "C" int manta_bake_noise(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_bake_noise(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->bakeNoise(mmd, framenr);
}
-extern "C" int manta_bake_mesh(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_bake_mesh(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->bakeMesh(mmd, framenr);
}
-extern "C" int manta_bake_particles(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_bake_particles(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->bakeParticles(mmd, framenr);
}
-extern "C" int manta_bake_guiding(MANTA *fluid, MantaModifierData *mmd, int framenr)
+int manta_bake_guiding(MANTA *fluid, MantaModifierData *mmd, int framenr)
{
if (!fluid || !mmd)
return 0;
return fluid->bakeGuiding(mmd, framenr);
}
-extern "C" void manta_update_variables(MANTA *fluid, MantaModifierData *mmd)
+void manta_update_variables(MANTA *fluid, MantaModifierData *mmd)
{
if (fluid)
fluid->updateVariables(mmd);
}
-extern "C" int manta_get_frame(MANTA *fluid)
+int manta_get_frame(MANTA *fluid)
{
if (!fluid)
return 0;
return fluid->getFrame();
}
-extern "C" float manta_get_timestep(MANTA *fluid)
+float manta_get_timestep(MANTA *fluid)
{
if (!fluid)
return 0;
return fluid->getTimestep();
}
-extern "C" void manta_adapt_timestep(MANTA *fluid)
+void manta_adapt_timestep(MANTA *fluid)
{
if (fluid)
fluid->adaptTimestep();
}
-extern "C" bool manta_needs_realloc(MANTA *fluid, MantaModifierData *mmd)
+bool manta_needs_realloc(MANTA *fluid, MantaModifierData *mmd)
{
if (fluid)
return fluid->needsRealloc(mmd);
@@ -221,128 +221,128 @@ extern "C" bool manta_needs_realloc(MANTA *fluid, MantaModifierData *mmd)
}
/* Fluid accessors */
-extern "C" size_t manta_get_index(int x, int max_x, int y, int max_y, int z /*, int max_z */)
+size_t manta_get_index(int x, int max_x, int y, int max_y, int z /*, int max_z */)
{
return x + y * max_x + z * max_x * max_y;
}
-extern "C" size_t manta_get_index2d(int x, int max_x, int y /*, int max_y, int z, int max_z */)
+size_t manta_get_index2d(int x, int max_x, int y /*, int max_y, int z, int max_z */)
{
return x + y * max_x;
}
-extern "C" float *manta_get_velocity_x(MANTA *fluid)
+float *manta_get_velocity_x(MANTA *fluid)
{
return fluid->getVelocityX();
}
-extern "C" float *manta_get_velocity_y(MANTA *fluid)
+float *manta_get_velocity_y(MANTA *fluid)
{
return fluid->getVelocityY();
}
-extern "C" float *manta_get_velocity_z(MANTA *fluid)
+float *manta_get_velocity_z(MANTA *fluid)
{
return fluid->getVelocityZ();
}
-extern "C" float *manta_get_ob_velocity_x(MANTA *fluid)
+float *manta_get_ob_velocity_x(MANTA *fluid)
{
return fluid->getObVelocityX();
}
-extern "C" float *manta_get_ob_velocity_y(MANTA *fluid)
+float *manta_get_ob_velocity_y(MANTA *fluid)
{
return fluid->getObVelocityY();
}
-extern "C" float *manta_get_ob_velocity_z(MANTA *fluid)
+float *manta_get_ob_velocity_z(MANTA *fluid)
{
return fluid->getObVelocityZ();
}
-extern "C" float *manta_get_guide_velocity_x(MANTA *fluid)
+float *manta_get_guide_velocity_x(MANTA *fluid)
{
return fluid->getGuideVelocityX();
}
-extern "C" float *manta_get_guide_velocity_y(MANTA *fluid)
+float *manta_get_guide_velocity_y(MANTA *fluid)
{
return fluid->getGuideVelocityY();
}
-extern "C" float *manta_get_guide_velocity_z(MANTA *fluid)
+float *manta_get_guide_velocity_z(MANTA *fluid)
{
return fluid->getGuideVelocityZ();
}
-extern "C" float *manta_get_in_velocity_x(MANTA *fluid)
+float *manta_get_in_velocity_x(MANTA *fluid)
{
return fluid->getInVelocityX();
}
-extern "C" float *manta_get_in_velocity_y(MANTA *fluid)
+float *manta_get_in_velocity_y(MANTA *fluid)
{
return fluid->getInVelocityY();
}
-extern "C" float *manta_get_in_velocity_z(MANTA *fluid)
+float *manta_get_in_velocity_z(MANTA *fluid)
{
return fluid->getInVelocityZ();
}
-extern "C" float *manta_get_force_x(MANTA *fluid)
+float *manta_get_force_x(MANTA *fluid)
{
return fluid->getForceX();
}
-extern "C" float *manta_get_force_y(MANTA *fluid)
+float *manta_get_force_y(MANTA *fluid)
{
return fluid->getForceY();
}
-extern "C" float *manta_get_force_z(MANTA *fluid)
+float *manta_get_force_z(MANTA *fluid)
{
return fluid->getForceZ();
}
-extern "C" float *manta_get_phiguide_in(MANTA *fluid)
+float *manta_get_phiguide_in(MANTA *fluid)
{
return fluid->getPhiGuideIn();
}
-extern "C" int *manta_get_num_obstacle(MANTA *fluid)
+int *manta_get_num_obstacle(MANTA *fluid)
{
return fluid->getNumObstacle();
}
-extern "C" int *manta_get_num_guide(MANTA *fluid)
+int *manta_get_num_guide(MANTA *fluid)
{
return fluid->getNumGuide();
}
-extern "C" int manta_get_res_x(MANTA *fluid)
+int manta_get_res_x(MANTA *fluid)
{
return fluid->getResX();
}
-extern "C" int manta_get_res_y(MANTA *fluid)
+int manta_get_res_y(MANTA *fluid)
{
return fluid->getResY();
}
-extern "C" int manta_get_res_z(MANTA *fluid)
+int manta_get_res_z(MANTA *fluid)
{
return fluid->getResZ();
}
-extern "C" float *manta_get_phi_in(MANTA *fluid)
+float *manta_get_phi_i
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list