Commit: ac5d656a2731880b18d2915003cefbd6325b6de0
Author: Sebastián Barschkis
Date:   Sat Aug 11 15:01:37 2018 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBac5d656a2731880b18d2915003cefbd6325b6de0

janitorial services for 2.8

cleanups, cleanups, cleanups

===================================================================

M       intern/mantaflow/extern/manta_fluid_API.h
M       intern/mantaflow/intern/FLUID.cpp
M       intern/mantaflow/intern/FLUID.h
M       intern/mantaflow/intern/manta_fluid_API.cpp
R099    intern/mantaflow/intern/strings/shared_script.h 
intern/mantaflow/intern/strings/fluid_script.h
M       intern/mantaflow/intern/strings/liquid_script.h
M       intern/openvdb/openvdb_capi.cc
M       intern/openvdb/openvdb_capi.h
M       intern/smoke/CMakeLists.txt
M       intern/smoke/extern/smoke_API.h
M       release/scripts/addons_contrib
R100    release/scripts/presets/smoke/honey.py  
release/scripts/presets/mantaflow/honey.py
R100    release/scripts/presets/smoke/oil.py    
release/scripts/presets/mantaflow/oil.py
R100    release/scripts/presets/smoke/water.py  
release/scripts/presets/mantaflow/water.py
M       release/scripts/startup/bl_operators/object_quick_effects.py
M       release/scripts/startup/bl_operators/presets.py
M       release/scripts/startup/bl_ui/properties_physics_smoke.py
M       source/blender/blenkernel/BKE_pointcache.h
M       source/blender/blenkernel/BKE_smoke.h
M       source/blender/blenkernel/intern/dynamicpaint.c
M       source/blender/blenkernel/intern/particle.c
M       source/blender/blenkernel/intern/particle_system.c
M       source/blender/blenkernel/intern/pointcache.c
M       source/blender/blenkernel/intern/smoke.c
M       source/blender/blenloader/intern/readfile.c
M       source/blender/blenloader/intern/versioning_250.c
M       source/blender/blenloader/intern/versioning_260.c
M       source/blender/editors/physics/physics_fluid.c
M       source/blender/editors/space_view3d/drawobject.c
M       source/blender/editors/space_view3d/drawvolume.c
M       source/blender/gpu/intern/gpu_draw.c
M       source/blender/makesdna/DNA_particle_types.h
M       source/blender/makesdna/DNA_smoke_types.h
M       source/blender/makesrna/intern/rna_modifier.c
M       source/blender/makesrna/intern/rna_particle.c
M       source/blender/makesrna/intern/rna_smoke.c
M       source/blender/modifiers/intern/MOD_smoke.c
M       source/blender/python/CMakeLists.txt
M       source/blender/render/intern/source/voxeldata.c
M       source/creator/CMakeLists.txt

===================================================================

diff --git a/intern/mantaflow/extern/manta_fluid_API.h 
b/intern/mantaflow/extern/manta_fluid_API.h
index 39234079408..07e54f1fa7c 100644
--- a/intern/mantaflow/extern/manta_fluid_API.h
+++ b/intern/mantaflow/extern/manta_fluid_API.h
@@ -36,40 +36,86 @@ extern "C" {
 
 struct FLUID;
 
-struct FLUID *smoke_init(int *res, struct SmokeModifierData *smd);
-void smoke_free(struct FLUID *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 */);
+/* Fluid functions */
+struct FLUID *fluid_init(int *res, struct SmokeModifierData *smd);
+void fluid_free(struct FLUID *fluid);
+void fluid_ensure_obstacle(struct FLUID *fluid, struct SmokeModifierData *smd);
+void fluid_ensure_guiding(struct FLUID *fluid, struct SmokeModifierData *smd);
+void fluid_ensure_invelocity(struct FLUID *fluid, struct SmokeModifierData 
*smd);
+int fluid_write_data(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+int fluid_read_data(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+int fluid_read_noise(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+int fluid_read_mesh(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+int fluid_read_particles(struct FLUID* fluid, struct SmokeModifierData *smd, 
int framenr);
+int fluid_read_guiding(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr, bool sourceDomain);
+int fluid_update_liquid_structures(struct FLUID* fluid, struct 
SmokeModifierData *smd, int framenr);
+int fluid_update_mesh_structures(struct FLUID* fluid, struct SmokeModifierData 
*smd, int framenr);
+int fluid_update_particle_structures(struct FLUID* fluid, struct 
SmokeModifierData *smd, int framenr);
+int fluid_bake_data(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+int fluid_bake_noise(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+int fluid_bake_mesh(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+int fluid_bake_particles(struct FLUID* fluid, struct SmokeModifierData *smd, 
int framenr);
+int fluid_bake_guiding(struct FLUID* fluid, struct SmokeModifierData *smd, int 
framenr);
+void fluid_update_variables(struct FLUID* fluid, struct SmokeModifierData 
*smd);
+int fluid_get_frame(struct FLUID* fluid);
+float fluid_get_timestep(struct FLUID* fluid);
+void fluid_adapt_timestep(struct FLUID* fluid);
+
+/* Fluid accessors */
+size_t fluid_get_index(int x, int max_x, int y, int max_y, int z /*, int max_z 
*/);
+size_t fluid_get_index2d(int x, int max_x, int y /*, int max_y, int z, int 
max_z */);
+float *fluid_get_velocity_x(struct FLUID *fluid);
+float *fluid_get_velocity_y(struct FLUID *fluid);
+float *fluid_get_velocity_z(struct FLUID *fluid);
+float *fluid_get_ob_velocity_x(struct FLUID *fluid);
+float *fluid_get_ob_velocity_y(struct FLUID *fluid);
+float *fluid_get_ob_velocity_z(struct FLUID *fluid);
+float *fluid_get_guide_velocity_x(struct FLUID *fluid);
+float *fluid_get_guide_velocity_y(struct FLUID *fluid);
+float *fluid_get_guide_velocity_z(struct FLUID *fluid);
+float *fluid_get_in_velocity_x(struct FLUID *fluid);
+float *fluid_get_in_velocity_y(struct FLUID *fluid);
+float *fluid_get_in_velocity_z(struct FLUID *fluid);
+float *fluid_get_force_x(struct FLUID *fluid);
+float *fluid_get_force_y(struct FLUID *fluid);
+float *fluid_get_force_z(struct FLUID *fluid);
+float *fluid_get_phiguidein(struct FLUID *fluid);
+int *fluid_get_num_obstacle(struct FLUID *fluid);
+int *fluid_get_num_guide(struct FLUID *fluid);
+int fluid_get_res_x(struct FLUID *fluid);
+int fluid_get_res_y(struct FLUID *fluid);
+int fluid_get_res_z(struct FLUID *fluid);
+
+
+/* Smoke functions */
 void smoke_manta_export(struct FLUID* smoke, struct SmokeModifierData *smd);
 void smoke_dissolve(struct FLUID *smoke, int speed, int log);
 void smoke_dissolve_wavelet(struct FLUID *smoke, int speed, int log);
 void smoke_export(struct FLUID *smoke, float *dt, float *dx, float **dens, 
float **react, float **flame, float **fuel, float **heat, float **vx, float 
**vy, float **vz, float **r, float **g, float **b, int **obstacles, float 
**shadow);
-void liquid_export(struct FLUID *liquid, float **phi, float **pp, float 
**pvel, float **ppSnd, float **pvelSnd, float **plifeSnd);
 void smoke_turbulence_export(struct FLUID *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);
+void smoke_get_rgba(struct FLUID *smoke, float *data, int sequential);
+void smoke_turbulence_get_rgba(struct FLUID *smoke, float *data, int 
sequential);
+void smoke_get_rgba_from_density(struct FLUID *smoke, float color[3], float 
*data, int sequential);
+void smoke_turbulence_get_rgba_from_density(struct FLUID *smoke, float 
color[3], float *data, int sequential);
+void smoke_ensure_heat(struct FLUID *smoke, struct SmokeModifierData *smd);
+void smoke_ensure_fire(struct FLUID *smoke, struct SmokeModifierData *smd);
+void smoke_ensure_colors(struct FLUID *smoke, struct SmokeModifierData *smd);
+
+/* Smoke accessors */
 float *smoke_get_density(struct FLUID *smoke);
 float *smoke_get_fuel(struct FLUID *smoke);
 float *smoke_get_react(struct FLUID *smoke);
 float *smoke_get_heat(struct FLUID *smoke);
-float *smoke_get_velocity_x(struct FLUID *smoke);
-float *smoke_get_velocity_y(struct FLUID *smoke);
-float *smoke_get_velocity_z(struct FLUID *smoke);
-float *smoke_get_ob_velocity_x(struct FLUID *fluid);
-float *smoke_get_ob_velocity_y(struct FLUID *fluid);
-float *smoke_get_ob_velocity_z(struct FLUID *fluid);
-float *smoke_get_in_velocity_x(struct FLUID *fluid);
-float *smoke_get_in_velocity_y(struct FLUID *fluid);
-float *smoke_get_in_velocity_z(struct FLUID *fluid);
-float *smoke_get_force_x(struct FLUID *smoke);
-float *smoke_get_force_y(struct FLUID *smoke);
-float *smoke_get_force_z(struct FLUID *smoke);
 float *smoke_get_flame(struct FLUID *smoke);
+float *smoke_get_shadow(struct FLUID *fluid);
 float *smoke_get_color_r(struct FLUID *smoke);
 float *smoke_get_color_g(struct FLUID *smoke);
 float *smoke_get_color_b(struct FLUID *smoke);
-void smoke_get_rgba(struct FLUID *smoke, float *data, int sequential);
-void smoke_turbulence_get_rgba(struct FLUID *smoke, float *data, int 
sequential);
-void smoke_get_rgba_from_density(struct FLUID *smoke, float color[3], float 
*data, int sequential);
-void smoke_turbulence_get_rgba_from_density(struct FLUID *smoke, float 
color[3], float *data, int sequential);
+int *smoke_get_obstacle(struct FLUID *smoke);
+float *smoke_get_emission_in(struct FLUID *fluid);
+int smoke_has_heat(struct FLUID *smoke);
+int smoke_has_fuel(struct FLUID *smoke);
+int smoke_has_colors(struct FLUID *smoke);
 float *smoke_turbulence_get_density(struct FLUID *smoke);
 float *smoke_turbulence_get_fuel(struct FLUID *smoke);
 float *smoke_turbulence_get_react(struct FLUID *smoke);
@@ -77,33 +123,28 @@ float *smoke_turbulence_get_color_r(struct FLUID *smoke);
 float *smoke_turbulence_get_color_g(struct FLUID *smoke);
 float *smoke_turbulence_get_color_b(struct FLUID *smoke);
 float *smoke_turbulence_get_flame(struct FLUID *smoke);
-void smoke_turbulence_get_res(struct FLUID *smoke, int *res);
-int smoke_turbulence_get_cells(struct FLUID *smoke);
-int *smoke_get_obstacle(struct FLUID *smoke);
-void smoke_get_ob_velocity(struct FLUID *smoke, float **x, float **y, float 
**z);
-int smoke_has_heat(struct FLUID *smoke);
-int smoke_has_fuel(struct FLUID *smoke);
-int smoke_has_colors(struct FLUID *smoke);
 int smoke_turbulence_has_fuel(struct FLUID *smoke);
 int smoke_turbulence_has_colors(struct FLUID *smoke);
-void smoke_ensure_heat(struct FLUID *smoke, struct SmokeModifierData *smd);
-void smoke_ensure_fire(struct FLUID *smoke, struct SmokeModifierData *smd);
-void smoke_ensure_colors(struct FLUID *smoke, struct SmokeModifierData *smd);
-float *smoke_get_guide_velocity_x(struct FLUID *smoke);
-float *smoke_get_guide_velocity_y(struct FLUID *smoke);
-float *smoke_get_guide_velocity_z(struct FLUID *smoke);
-float *smoke_get_shadow(struct FLUID *fluid);
+void smoke_turbulence_get_res(struct FLUID *smoke, int *res);
+int smoke_turbulence_get_cells(struct FLUID *smoke);
 
-// Liquid grids
+
+/* Liquid functions */
+void liquid_manta_export(struct FLUID* smoke, struct SmokeModifierData *smd);
+void liquid_ensure_sndparts(struct FLUID *fluid, struct SmokeModifierData 
*smd);
+
+/* Liquid accessors */
+int liquid_get_particle_res_x(struct FLUID *fluid);
+int liquid_get_particle_res_y(struct FLUID *fluid);
+int liquid_get_particle_res_z(struct FLUID *fluid);
+int liquid_get_mesh_res_x(struct FLUID *fluid);
+int liquid_get_mesh_res_y(struct FLUID *fluid);
+int liquid_get_mesh_res_z(struct FLUID *fluid);
+int liquid_get_particle_upres(struct FLUID *fluid);
+int liquid_get_mesh_upres(struct FLUID *fluid);
 float *liquid_get_phiin(struct FLUID *liquid);
 float *liquid_get_phiobsin(struct FLUID *liquid);
 float *liquid_get_phioutin(struct FLUID *liquid);
-void liquid_manta_export(struct FLUID* smoke, struct SmokeModifierData *smd);
-
-// Liquid Mantaflow IO for pointcache
-void liquid_update_mesh_data(struct FLUID *liquid, char *filename);
-
-// Liquid mesh
 int liquid_get_num_verts(struct FLUID *liquid);
 int liquid_get_num_normals(struct FLUID *liquid);
 int liquid_get_num_triangles(struct FLUID *liquid);
@@ -119,76 +160,23 @@ int liquid_get_triangle_z_at(struct FLUID *liquid, int i);
 float liquid_get_vertvel_x_at(struct FLUID *liquid, int i);
 float liquid_get_vertvel_y_at(struct FLUID *liquid, int i);
 float liquid_get_vertvel_z_at(struct FLUID *liquid, int i);
-
-// Liquids particles
 int liquid_get_num_flip_particles(struct FLUID *liquid);
 int liquid_get_num_snd_particles(struct FLUID *liquid);
-
 int liquid_get_flip_particle_flag_at(struct FLUID *liquid, int i);
 int liquid_get_snd_particle_flag_at(struct FLUID *liquid, int i);
-
 float liquid_get_flip_particle_position_x_at(struct FLUID *liquid, int i);
 float liquid_get_flip_particle_position_y_at(struct FLUID *liquid, int i);
 float liquid_get_flip_particle_position_z_at(struct FLUID *liquid, int i);
-float liquid_get_

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to