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

renamed old smoke api functions in header because of name conflicts

Browse Source
This commit is contained in:
Sebastián Barschkis
2016-03-17 01:11:35 +01:00
parent f5200ea512
commit 81b646de8b
1 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
intern/smoke/extern/smoke_API.h vendored
View File

@@ -40,91 +40,91 @@ struct FLUID_3D;
// low res
#ifndef WITH_MANTA
struct FLUID_3D *smoke_init(int *res, float dx, float dtdef, int use_heat, int use_fire, int use_colors);
struct FLUID_3D *old_smoke_init(int *res, float dx, float dtdef, int use_heat, int use_fire, int use_colors);
#else
struct FLUID_3D *smoke_init(int *res, float dx, float dtdef, int use_heat, int use_fire, int use_colors, struct SmokeModifierData *smd);
struct FLUID_3D *old_smoke_init(int *res, float dx, float dtdef, int use_heat, int use_fire, int use_colors, struct SmokeModifierData *smd);
#endif
void smoke_free(struct FLUID_3D *fluid);
void old_smoke_free(struct FLUID_3D *fluid);
void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta, float *dt_factor, float *vorticity, int *border_colli, float *burning_rate,
void old_smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta, float *dt_factor, float *vorticity, int *border_colli, float *burning_rate,
float *flame_smoke, float *flame_smoke_color, float *flame_vorticity, float *flame_ignition_temp, float *flame_max_temp);
void smoke_step(struct FLUID_3D *fluid, float gravity[3], float dtSubdiv);
void old_smoke_step(struct FLUID_3D *fluid, float gravity[3], float dtSubdiv);
float *smoke_get_density(struct FLUID_3D *fluid);
float *smoke_get_flame(struct FLUID_3D *fluid);
float *smoke_get_fuel(struct FLUID_3D *fluid);
float *smoke_get_react(struct FLUID_3D *fluid);
float *smoke_get_color_r(struct FLUID_3D *fluid);
float *smoke_get_color_g(struct FLUID_3D *fluid);
float *smoke_get_color_b(struct FLUID_3D *fluid);
void smoke_get_rgba(struct FLUID_3D *fluid, float *data, int sequential);
void smoke_get_rgba_from_density(struct FLUID_3D *fluid, float color[3], float *data, int sequential);
float *smoke_get_heat(struct FLUID_3D *fluid);
float *smoke_get_velocity_x(struct FLUID_3D *fluid);
float *smoke_get_velocity_y(struct FLUID_3D *fluid);
float *smoke_get_velocity_z(struct FLUID_3D *fluid);
float *old_smoke_get_density(struct FLUID_3D *fluid);
float *old_smoke_get_flame(struct FLUID_3D *fluid);
float *old_smoke_get_fuel(struct FLUID_3D *fluid);
float *old_smoke_get_react(struct FLUID_3D *fluid);
float *old_smoke_get_color_r(struct FLUID_3D *fluid);
float *old_smoke_get_color_g(struct FLUID_3D *fluid);
float *old_smoke_get_color_b(struct FLUID_3D *fluid);
void old_smoke_get_rgba(struct FLUID_3D *fluid, float *data, int sequential);
void old_smoke_get_rgba_from_density(struct FLUID_3D *fluid, float color[3], float *data, int sequential);
float *old_smoke_get_heat(struct FLUID_3D *fluid);
float *old_smoke_get_velocity_x(struct FLUID_3D *fluid);
float *old_smoke_get_velocity_y(struct FLUID_3D *fluid);
float *old_smoke_get_velocity_z(struct FLUID_3D *fluid);
/* Moving obstacle velocity provided by blender */
void smoke_get_ob_velocity(struct FLUID_3D *fluid, float **x, float **y, float **z);
void old_smoke_get_ob_velocity(struct FLUID_3D *fluid, float **x, float **y, float **z);
float *smoke_get_force_x(struct FLUID_3D *fluid);
float *smoke_get_force_y(struct FLUID_3D *fluid);
float *smoke_get_force_z(struct FLUID_3D *fluid);
float *old_smoke_get_force_x(struct FLUID_3D *fluid);
float *old_smoke_get_force_y(struct FLUID_3D *fluid);
float *old_smoke_get_force_z(struct FLUID_3D *fluid);
int *smoke_get_manta_flags(struct FLUID_3D *fluid);
float *smoke_get_inflow_grid(struct FLUID_3D *fluid);
float *smoke_get_fuel_inflow(struct FLUID_3D *fluid);
void smoke_manta_export(struct SmokeModifierData *smd);
int *old_smoke_get_manta_flags(struct FLUID_3D *fluid);
float *old_smoke_get_inflow_grid(struct FLUID_3D *fluid);
float *old_smoke_get_fuel_inflow(struct FLUID_3D *fluid);
void old_smoke_manta_export(struct SmokeModifierData *smd);
unsigned char *smoke_get_obstacle(struct FLUID_3D *fluid);
unsigned char *old_smoke_get_obstacle(struct FLUID_3D *fluid);
size_t smoke_get_index(int x, int max_x, int y, int max_y, int z);
size_t smoke_get_index2d(int x, int max_x, int y);
void smoke_dissolve(struct FLUID_3D *fluid, int speed, int log);
size_t old_smoke_get_index(int x, int max_x, int y, int max_y, int z);
size_t old_smoke_get_index2d(int x, int max_x, int y);
void old_smoke_dissolve(struct FLUID_3D *fluid, int speed, int log);
// wavelet turbulence functions
#ifndef WITH_MANTA
struct WTURBULENCE *smoke_turbulence_init(int *res, int amplify, int noisetype, const char *noisefile_path, int use_fire, int use_colors);
struct WTURBULENCE *old_smoke_turbulence_init(int *res, int amplify, int noisetype, const char *noisefile_path, int use_fire, int use_colors);
#else
struct WTURBULENCE *smoke_turbulence_init(int *res, int amplify, int noisetype, const char *noisefile_path, int use_fire, int use_colors, struct SmokeDomainSettings *sds);
struct WTURBULENCE *old_smoke_turbulence_init(int *res, int amplify, int noisetype, const char *noisefile_path, int use_fire, int use_colors, struct SmokeDomainSettings *sds);
#endif
void smoke_turbulence_free(struct WTURBULENCE *wt);
void smoke_turbulence_step(struct WTURBULENCE *wt, struct FLUID_3D *fluid);
float *smoke_turbulence_get_density(struct WTURBULENCE *wt);
float *smoke_turbulence_get_color_r(struct WTURBULENCE *wt);
float *smoke_turbulence_get_color_g(struct WTURBULENCE *wt);
float *smoke_turbulence_get_color_b(struct WTURBULENCE *wt);
void smoke_turbulence_get_rgba(struct WTURBULENCE *wt, float *data, int sequential);
void smoke_turbulence_get_rgba_from_density(struct WTURBULENCE *wt, float color[3], float *data, int sequential);
float *smoke_turbulence_get_flame(struct WTURBULENCE *wt);
float *smoke_turbulence_get_fuel(struct WTURBULENCE *wt);
float *smoke_turbulence_get_react(struct WTURBULENCE *wt);
void smoke_turbulence_get_res(struct WTURBULENCE *wt, int *res);
int smoke_turbulence_get_cells(struct WTURBULENCE *wt);
void smoke_turbulence_set_noise(struct WTURBULENCE *wt, int type, const char *noisefile_path);
void smoke_initWaveletBlenderRNA(struct WTURBULENCE *wt, float *strength);
void smoke_dissolve_wavelet(struct WTURBULENCE *wt, int speed, int log);
void old_smoke_turbulence_free(struct WTURBULENCE *wt);
void old_smoke_turbulence_step(struct WTURBULENCE *wt, struct FLUID_3D *fluid);
float *old_smoke_turbulence_get_density(struct WTURBULENCE *wt);
float *old_smoke_turbulence_get_color_r(struct WTURBULENCE *wt);
float *old_smoke_turbulence_get_color_g(struct WTURBULENCE *wt);
float *old_smoke_turbulence_get_color_b(struct WTURBULENCE *wt);
void old_smoke_turbulence_get_rgba(struct WTURBULENCE *wt, float *data, int sequential);
void old_smoke_turbulence_get_rgba_from_density(struct WTURBULENCE *wt, float color[3], float *data, int sequential);
float *old_smoke_turbulence_get_flame(struct WTURBULENCE *wt);
float *old_smoke_turbulence_get_fuel(struct WTURBULENCE *wt);
float *old_smoke_turbulence_get_react(struct WTURBULENCE *wt);
void old_smoke_turbulence_get_res(struct WTURBULENCE *wt, int *res);
int old_smoke_turbulence_get_cells(struct WTURBULENCE *wt);
void old_smoke_turbulence_set_noise(struct WTURBULENCE *wt, int type, const char *noisefile_path);
void old_smoke_initWaveletBlenderRNA(struct WTURBULENCE *wt, float *strength);
void old_smoke_dissolve_wavelet(struct WTURBULENCE *wt, int speed, int log);
/* export */
void smoke_export(struct FLUID_3D *fluid, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat, float **heatold,
void old_smoke_export(struct FLUID_3D *fluid, float *dt, float *dx, float **dens, float **react, float **flame, float **fuel, float **heat, float **heatold,
float **vx, float **vy, float **vz, float **r, float **g, float **b, unsigned char **obstacles);
void smoke_turbulence_export(struct WTURBULENCE *wt, float **dens, float **react, float **flame, float **fuel,
void old_smoke_turbulence_export(struct WTURBULENCE *wt, float **dens, float **react, float **flame, float **fuel,
float **r, float **g, float **b, float **tcu, float **tcv, float **tcw);
/* flame spectrum */
void flame_get_spectrum(unsigned char *spec, int width, float t1, float t2);
/* data fields */
int smoke_has_heat(struct FLUID_3D *fluid);
int smoke_has_fuel(struct FLUID_3D *fluid);
int smoke_has_colors(struct FLUID_3D *fluid);
int smoke_turbulence_has_fuel(struct WTURBULENCE *wt);
int smoke_turbulence_has_colors(struct WTURBULENCE *wt);
void smoke_ensure_heat(struct FLUID_3D *fluid);
void smoke_ensure_fire(struct FLUID_3D *fluid, struct WTURBULENCE *wt);
void smoke_ensure_colors(struct FLUID_3D *fluid, struct WTURBULENCE *wt, float init_r, float init_g, float init_b);
int old_smoke_has_heat(struct FLUID_3D *fluid);
int old_smoke_has_fuel(struct FLUID_3D *fluid);
int old_smoke_has_colors(struct FLUID_3D *fluid);
int old_smoke_turbulence_has_fuel(struct WTURBULENCE *wt);
int old_smoke_turbulence_has_colors(struct WTURBULENCE *wt);
void old_smoke_ensure_heat(struct FLUID_3D *fluid);
void old_smoke_ensure_fire(struct FLUID_3D *fluid, struct WTURBULENCE *wt);
void old_smoke_ensure_colors(struct FLUID_3D *fluid, struct WTURBULENCE *wt, float init_r, float init_g, float init_b);
// /*Mantaflow functions*/
//int smoke_mantaflow_read(struct SmokeDomainSettings *sds, char* name, bool with_wavelets); //1:success, 0: no file,error
//void smoke_mantaflow_stop_sim(struct Manta_API *fluid);
//int old_smoke_mantaflow_read(struct SmokeDomainSettings *sds, char* name, bool with_wavelets); //1:success, 0: no file,error
//void old_smoke_mantaflow_stop_sim(struct Manta_API *fluid);
//void manta_write_effectors(struct FLUID_3D *fluid);
//void manta_update_effectors(struct Scene *scene, struct Object *ob,struct SmokeDomainSettings *sds, float dt);
//void manta_write_emitters(struct SmokeFlowSettings *sfs, bool highRes, int min_x, int min_y, int min_z, int max_x, int max_y, int max_z, int d_x, int d_y, int d_z,float *influence, float *vel);