[Bf-blender-cvs] [b885c42] fluid-mantaflow: smoke api now matching new SMOKE names
Sebastián Barschkis
noreply at git.blender.org
Mon May 23 23:45:47 CEST 2016
Commit: b885c421a5067cf6ff7155f766569096aec8ae3d
Author: Sebastián Barschkis
Date: Mon May 9 00:17:40 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBb885c421a5067cf6ff7155f766569096aec8ae3d
smoke api now matching new SMOKE names
===================================================================
M intern/mantaflow/extern/manta_smoke_API.h
M intern/mantaflow/intern/manta_smoke_API.cpp
===================================================================
diff --git a/intern/mantaflow/extern/manta_smoke_API.h b/intern/mantaflow/extern/manta_smoke_API.h
index dce8625..0f0fdee 100644
--- a/intern/mantaflow/extern/manta_smoke_API.h
+++ b/intern/mantaflow/extern/manta_smoke_API.h
@@ -34,59 +34,59 @@
extern "C" {
#endif
-struct MANTA;
+struct SMOKE;
-int *smoke_get_manta_flags(struct MANTA *manta);
-struct MANTA *smoke_init(int *res, struct SmokeModifierData *smd);
-void smoke_free(struct MANTA *manta);
+int *smoke_get_manta_flags(struct SMOKE *smoke);
+struct SMOKE *smoke_init(int *res, struct SmokeModifierData *smd);
+void smoke_free(struct SMOKE *smoke);
size_t smoke_get_index(int x, int max_x, int y, int max_y, int z /*, int max_z */);
size_t smoke_get_index2d(int x, int max_x, int y /*, int max_y, int z, int max_z */);
-void smoke_manta_export(struct MANTA* manta, SmokeModifierData *smd);
-void smoke_step(struct MANTA *manta, SmokeModifierData *smd);
-void smoke_dissolve(struct MANTA *manta, int speed, int log);
-void smoke_dissolve_wavelet(struct MANTA *manta, int speed, int log);
-void smoke_export(struct MANTA *manta, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat, float **manta_inflow, float **vx, float **vy, float **vz, float **r, float **g, float **b, unsigned char **obstacles);
-void smoke_turbulence_export(struct MANTA *manta, float **dens, float **react, float **flame, float **fuel, float **r, float **g, float **b , float **tcu, float **tcv, float **tcw, float **tcu2, float **tcv2, float **tcw2);
-float *smoke_get_density(struct MANTA *manta);
-float *smoke_get_fuel(struct MANTA *manta);
-float *smoke_get_react(struct MANTA *manta);
-float *smoke_get_heat(struct MANTA *manta);
-float *smoke_get_velocity_x(struct MANTA *manta);
-float *smoke_get_velocity_y(struct MANTA *manta);
-float *smoke_get_velocity_z(struct MANTA *manta);
-float *smoke_get_force_x(struct MANTA *manta);
-float *smoke_get_force_y(struct MANTA *manta);
-float *smoke_get_force_z(struct MANTA *manta);
-float *smoke_get_flame(struct MANTA *manta);
-float *smoke_get_color_r(struct MANTA *manta);
-float *smoke_get_color_g(struct MANTA *manta);
-float *smoke_get_color_b(struct MANTA *manta);
-void smoke_get_rgba(struct MANTA *manta, float *data, int sequential);
-void smoke_turbulence_get_rgba(struct MANTA *manta, float *data, int sequential);
-void smoke_get_rgba_from_density(struct MANTA *manta, float color[3], float *data, int sequential);
-void smoke_turbulence_get_rgba_from_density(struct MANTA *manta, float color[3], float *data, int sequential);
-float *smoke_turbulence_get_density(struct MANTA *manta);
-float *smoke_turbulence_get_fuel(struct MANTA *manta);
-float *smoke_turbulence_get_react(struct MANTA *manta);
-float *smoke_turbulence_get_color_r(struct MANTA *manta);
-float *smoke_turbulence_get_color_g(struct MANTA *manta);
-float *smoke_turbulence_get_color_b(struct MANTA *manta);
-float *smoke_turbulence_get_flame(struct MANTA *manta);
-void smoke_turbulence_get_res(struct MANTA *manta, int *res);
-int smoke_turbulence_get_cells(struct MANTA *manta);
-unsigned char *smoke_get_obstacle(struct MANTA *manta);
-void smoke_get_ob_velocity(struct MANTA *manta, float **x, float **y, float **z);
+void smoke_manta_export(struct SMOKE* manta, SmokeModifierData *smd);
+void smoke_step(struct SMOKE *smoke, SmokeModifierData *smd);
+void smoke_dissolve(struct SMOKE *smoke, int speed, int log);
+void smoke_dissolve_wavelet(struct SMOKE *smoke, int speed, int log);
+void smoke_export(struct SMOKE *smoke, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat, float **smoke_inflow, float **vx, float **vy, float **vz, float **r, float **g, float **b, unsigned char **obstacles);
+void smoke_turbulence_export(struct SMOKE *smoke, float **dens, float **react, float **flame, float **fuel, float **r, float **g, float **b , float **tcu, float **tcv, float **tcw, float **tcu2, float **tcv2, float **tcw2);
+float *smoke_get_density(struct SMOKE *smoke);
+float *smoke_get_fuel(struct SMOKE *smoke);
+float *smoke_get_react(struct SMOKE *smoke);
+float *smoke_get_heat(struct SMOKE *smoke);
+float *smoke_get_velocity_x(struct SMOKE *smoke);
+float *smoke_get_velocity_y(struct SMOKE *smoke);
+float *smoke_get_velocity_z(struct SMOKE *smoke);
+float *smoke_get_force_x(struct SMOKE *smoke);
+float *smoke_get_force_y(struct SMOKE *smoke);
+float *smoke_get_force_z(struct SMOKE *smoke);
+float *smoke_get_flame(struct SMOKE *smoke);
+float *smoke_get_color_r(struct SMOKE *smoke);
+float *smoke_get_color_g(struct SMOKE *smoke);
+float *smoke_get_color_b(struct SMOKE *smoke);
+void smoke_get_rgba(struct SMOKE *smoke, float *data, int sequential);
+void smoke_turbulence_get_rgba(struct SMOKE *smoke, float *data, int sequential);
+void smoke_get_rgba_from_density(struct SMOKE *smoke, float color[3], float *data, int sequential);
+void smoke_turbulence_get_rgba_from_density(struct SMOKE *smoke, float color[3], float *data, int sequential);
+float *smoke_turbulence_get_density(struct SMOKE *smoke);
+float *smoke_turbulence_get_fuel(struct SMOKE *smoke);
+float *smoke_turbulence_get_react(struct SMOKE *smoke);
+float *smoke_turbulence_get_color_r(struct SMOKE *smoke);
+float *smoke_turbulence_get_color_g(struct SMOKE *smoke);
+float *smoke_turbulence_get_color_b(struct SMOKE *smoke);
+float *smoke_turbulence_get_flame(struct SMOKE *smoke);
+void smoke_turbulence_get_res(struct SMOKE *smoke, int *res);
+int smoke_turbulence_get_cells(struct SMOKE *smoke);
+unsigned char *smoke_get_obstacle(struct SMOKE *smoke);
+void smoke_get_ob_velocity(struct SMOKE *smoke, float **x, float **y, float **z);
void flame_get_spectrum(unsigned char *spec, int width, float t1, float t2);
-int smoke_has_heat(struct MANTA *manta);
-int smoke_has_fuel(struct MANTA *manta);
-int smoke_has_colors(struct MANTA *manta);
-int smoke_turbulence_has_fuel(struct MANTA *manta);
-int smoke_turbulence_has_colors(struct MANTA *manta);
-void smoke_ensure_heat(struct MANTA *manta, struct SmokeModifierData *smd);
-void smoke_ensure_fire(struct MANTA *manta, struct SmokeModifierData *smd);
-void smoke_ensure_colors(struct MANTA *manta, struct SmokeModifierData *smd);
-float *smoke_get_inflow_grid(struct MANTA *manta);
-float *smoke_get_fuel_inflow(struct MANTA *manta);
+int smoke_has_heat(struct SMOKE *smoke);
+int smoke_has_fuel(struct SMOKE *smoke);
+int smoke_has_colors(struct SMOKE *smoke);
+int smoke_turbulence_has_fuel(struct SMOKE *smoke);
+int smoke_turbulence_has_colors(struct SMOKE *smoke);
+void smoke_ensure_heat(struct SMOKE *smoke, struct SmokeModifierData *smd);
+void smoke_ensure_fire(struct SMOKE *smoke, struct SmokeModifierData *smd);
+void smoke_ensure_colors(struct SMOKE *smoke, struct SmokeModifierData *smd);
+float *smoke_get_inflow_grid(struct SMOKE *smoke);
+float *smoke_get_fuel_inflow(struct SMOKE *smoke);
#ifdef __cplusplus
}
diff --git a/intern/mantaflow/intern/manta_smoke_API.cpp b/intern/mantaflow/intern/manta_smoke_API.cpp
index 66a39e0..3b4c7f3 100644
--- a/intern/mantaflow/intern/manta_smoke_API.cpp
+++ b/intern/mantaflow/intern/manta_smoke_API.cpp
@@ -29,21 +29,21 @@
#include <cmath>
-#include "MANTA.h"
+#include "SMOKE.h"
#include "manta_smoke_API.h"
#include "spectrum.h"
-extern "C" int *smoke_get_manta_flags(struct MANTA *manta) {
+extern "C" int *smoke_get_manta_flags(struct SMOKE *smoke) {
return manta->getMantaFlags();
}
-extern "C" MANTA *smoke_init(int *res, struct SmokeModifierData *smd)
+extern "C" SMOKE *smoke_init(int *res, struct SmokeModifierData *smd)
{
- MANTA *manta = new MANTA(res, smd);
+ SMOKE *smoke = new SMOKE(res, smd);
return manta;
}
-extern "C" void smoke_free(MANTA *manta)
+extern "C" void smoke_free(SMOKE *smoke)
{
delete manta;
manta = NULL;
@@ -59,14 +59,14 @@ extern "C" size_t smoke_get_index2d(int x, int max_x, int y /*, int max_y, int z
return x + y * max_x;
}
-extern "C" void smoke_manta_export(MANTA* manta, SmokeModifierData *smd)
+extern "C" void smoke_manta_export(SMOKE* manta, SmokeModifierData *smd)
{
if (!manta && !smd) return;
manta->exportScript(smd);
manta->exportGrids(smd);
}
-extern "C" void smoke_step(MANTA *manta, SmokeModifierData *smd)
+extern "C" void smoke_step(SMOKE *smoke, SmokeModifierData *smd)
{
manta->step(smd);
manta->updatePointers(smd);
@@ -128,18 +128,18 @@ static void data_dissolve(float *density, float *heat, float *r, float *g, float
}
}
-extern "C" void smoke_dissolve(MANTA *manta, int speed, int log)
+extern "C" void smoke_dissolve(SMOKE *smoke, int speed, int log)
{
data_dissolve(manta->getDensity(), manta->getHeat(), manta->getColorR(), manta->getColorG(), manta->getColorB(), manta->getTotalCells(), speed, log);
}
-extern "C" void smoke_dissolve_wavelet(MANTA *manta, int speed, int log)
+extern "C" void smoke_dissolve_wavelet(SMOKE *smoke, int speed, int log)
{
data_dissolve(manta->getDensityHigh(), 0, manta->getColorRHigh(), manta->getColorGHigh(), manta->getColorBHigh(), manta->getTotalCellsHigh(), speed, log);
}
-extern "C" void smoke_export(MANTA *manta, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat,
- float **manta_inflow, float **vx, float **vy, float **vz, float **r, float **g, float **b, unsigned char **obstacles)
+extern "C" void smoke_export(SMOKE *smoke, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat,
+ float **smoke_inflow, float **vx, float **vy, float **vz, float **r, float **g, float **b, unsigned char **obstacles)
{
*dens = manta->getDensity();
if (fuel)
@@ -151,7 +151,7 @@ extern "C" void smoke_export(MANTA *manta, float *dt, float *dx, float **dens, f
if( heat)
*heat = manta->getHeat();
if (manta_inflow)
- *manta_inflow = manta->getDensityInflow();
+ *smoke_inflow = manta->getDensityInflow();
*vx = manta->getVelocityX();
*vy = manta->getVelocityY();
*vz = manta->getVelocityZ();
@@ -166,7 +166,7 @@ extern "C" void smoke_export(MANTA *manta, float *dt, float *dx, float **dens, f
*dx = 1; //dummy value, not needed for manta
}
-extern "C" void smoke_turbulence_export(MANTA *manta, float **d
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list