[Bf-blender-cvs] [36d309cff7f] fluid-mantaflow: Mantaflow: Renaming from manta to fluid
Sebastián Barschkis
noreply at git.blender.org
Thu Dec 12 14:12:51 CET 2019
Commit: 36d309cff7f35fcf637ac9ef48670a8445611277
Author: Sebastián Barschkis
Date: Thu Dec 12 14:12:11 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB36d309cff7f35fcf637ac9ef48670a8445611277
Mantaflow: Renaming from manta to fluid
===================================================================
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_util.h
M intern/mantaflow/extern/manta_fluid_API.h
M intern/mantaflow/intern/MANTA_main.cpp
M intern/mantaflow/intern/MANTA_main.h
M intern/mantaflow/intern/manta_fluid_API.cpp
M release/scripts/presets/mantaflow/honey.py
M release/scripts/presets/mantaflow/oil.py
M 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_data_modifier.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_common.py
M release/scripts/startup/bl_ui/properties_physics_manta.py
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/blenkernel/BKE_manta.h
M source/blender/blenkernel/BKE_pointcache.h
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/manta.c
M source/blender/blenkernel/intern/object.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/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/writefile.c
M source/blender/draw/engines/eevee/eevee_volumes.c
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/engines/workbench/workbench_volume.c
M source/blender/draw/modes/object_mode.c
M source/blender/editors/physics/physics_intern.h
M source/blender/editors/physics/physics_manta.c
M source/blender/editors/physics/physics_ops.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/intern/gpu_draw.c
M source/blender/makesdna/DNA_manta_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_manta.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/modifiers/intern/MOD_manta.c
M source/blender/python/intern/bpy_app_build_options.c
===================================================================
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 902766d688f..3d5652be3f0 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -281,7 +281,7 @@ static void mikk_compute_tangents(
static void create_mesh_volume_attribute(
BL::Object &b_ob, Mesh *mesh, ImageManager *image_manager, AttributeStandard std, float frame)
{
- BL::MantaDomainSettings b_domain = object_manta_domain_find(b_ob);
+ BL::FluidDomainSettings b_domain = object_fluid_domain_find(b_ob);
if (!b_domain)
return;
@@ -878,7 +878,7 @@ static void sync_mesh_manta_motion(BL::Object &b_ob, Scene *scene, Mesh *mesh)
if (scene->need_motion() == Scene::MOTION_NONE)
return;
- BL::MantaDomainSettings b_manta_domain = object_manta_domain_find(b_ob);
+ BL::FluidDomainSettings b_manta_domain = object_fluid_domain_find(b_ob);
if (!b_manta_domain)
return;
@@ -901,7 +901,7 @@ static void sync_mesh_manta_motion(BL::Object &b_ob, Scene *scene, Mesh *mesh)
float relative_time = motion_times[step] * scene->motion_shutter_time() * 0.5f;
float3 *mP = attr_mP->data_float3() + step * mesh->verts.size();
- BL::MantaDomainSettings::mesh_vertices_iterator svi;
+ BL::FluidDomainSettings::mesh_vertices_iterator svi;
int i = 0;
for (b_manta_domain.mesh_vertices.begin(svi); svi != b_manta_domain.mesh_vertices.end();
@@ -1096,7 +1096,7 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph &b_depsgraph,
BL::Mesh b_mesh(PointerRNA_NULL);
/* manta motion is exported immediate with mesh, skip here */
- BL::MantaDomainSettings b_manta_domain = object_manta_domain_find(b_ob);
+ BL::FluidDomainSettings b_manta_domain = object_fluid_domain_find(b_ob);
if (b_manta_domain)
return;
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index bb82835b16e..02db840f0d9 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -1163,7 +1163,7 @@ void BlenderSession::builtin_image_info(const string &builtin_name,
else if (b_id.is_a(&RNA_Object)) {
/* smoke volume data */
BL::Object b_ob(b_id);
- BL::MantaDomainSettings b_domain = object_manta_domain_find(b_ob);
+ BL::FluidDomainSettings b_domain = object_fluid_domain_find(b_ob);
metadata.is_float = true;
metadata.depth = 1;
@@ -1342,7 +1342,7 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
else if (b_id.is_a(&RNA_Object)) {
/* smoke volume data */
BL::Object b_ob(b_id);
- BL::MantaDomainSettings b_domain = object_manta_domain_find(b_ob);
+ BL::FluidDomainSettings b_domain = object_fluid_domain_find(b_ob);
if (!b_domain) {
return false;
@@ -1363,47 +1363,47 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
const size_t num_pixels = ((size_t)width) * height * depth;
if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_DENSITY)) {
- MantaDomainSettings_density_grid_get_length(&b_domain.ptr, &length);
+ FluidDomainSettings_density_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- MantaDomainSettings_density_grid_get(&b_domain.ptr, pixels);
+ FluidDomainSettings_density_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_FLAME)) {
/* this is in range 0..1, and interpreted by the OpenGL smoke viewer
* as 1500..3000 K with the first part faded to zero density */
- MantaDomainSettings_flame_grid_get_length(&b_domain.ptr, &length);
+ FluidDomainSettings_flame_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- MantaDomainSettings_flame_grid_get(&b_domain.ptr, pixels);
+ FluidDomainSettings_flame_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_COLOR)) {
/* the RGB is "premultiplied" by density for better interpolation results */
- MantaDomainSettings_color_grid_get_length(&b_domain.ptr, &length);
+ FluidDomainSettings_color_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels * 4) {
- MantaDomainSettings_color_grid_get(&b_domain.ptr, pixels);
+ FluidDomainSettings_color_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_VELOCITY)) {
- MantaDomainSettings_velocity_grid_get_length(&b_domain.ptr, &length);
+ FluidDomainSettings_velocity_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels * 3) {
- MantaDomainSettings_velocity_grid_get(&b_domain.ptr, pixels);
+ FluidDomainSettings_velocity_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_HEAT)) {
- MantaDomainSettings_heat_grid_get_length(&b_domain.ptr, &length);
+ FluidDomainSettings_heat_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- MantaDomainSettings_heat_grid_get(&b_domain.ptr, pixels);
+ FluidDomainSettings_heat_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_TEMPERATURE)) {
- MantaDomainSettings_temperature_grid_get_length(&b_domain.ptr, &length);
+ FluidDomainSettings_temperature_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- MantaDomainSettings_temperature_grid_get(&b_domain.ptr, pixels);
+ FluidDomainSettings_temperature_grid_get(&b_domain.ptr, pixels);
return true;
}
}
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index 1ff506e6f86..f9d5564da15 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -521,20 +521,20 @@ static inline bool object_use_deform_motion(BL::Object &b_parent, BL::Object &b_
return use_deform_motion;
}
-static inline BL::MantaDomainSettings object_manta_domain_find(BL::Object &b_ob)
+static inline BL::FluidDomainSettings object_fluid_domain_find(BL::Object &b_ob)
{
BL::Object::modifiers_iterator b_mod;
for (b_ob.modifiers.begin(b_mod); b_mod != b_ob.modifiers.end(); ++b_mod) {
- if (b_mod->is_a(&RNA_MantaModifier)) {
- BL::MantaModifier b_mmd(*b_mod);
+ if (b_mod->is_a(&RNA_FluidModifier)) {
+ BL::FluidModifier b_mmd(*b_mod);
- if (b_mmd.manta_type() == BL::MantaModifier::manta_type_DOMAIN)
+ if (b_mmd.fluid_type() == BL::FluidModifier::fluid_type_DOMAIN)
return b_mmd.domain_settings();
}
}
- return BL::MantaDomainSettings(PointerRNA_NULL);
+ return BL::FluidDomainSettings(PointerRNA_NULL);
}
static inline Mesh::SubdivisionType object_subdivision_type(BL::Object &b_ob,
diff --git a/intern/mantaflow/extern/manta_fluid_API.h b/intern/mantaflow/extern/manta_fluid_API.h
index f46d11de1d1..9e0bd2d9a3e 100644
--- a/intern/mantaflow/extern/manta_fluid_API.h
+++ b/intern/mantaflow/extern/manta_fluid_API.h
@@ -37,40 +37,40 @@ extern "C" {
struct MANTA;
/* Fluid functions */
-struct MANTA *manta_init(int *res, struct MantaModifierData *mmd);
+struct MANTA *manta_init(int *res, struct FluidModifierData *mmd);
void manta_free(struct MANTA *fluid);
-void manta_ensure_obstacle(struct MANTA *fluid, struct MantaModifierData *mmd);
-void manta_ensure_guiding(struct MANTA *fluid, struct MantaModifierData *mmd);
-void manta_ensure_invelocity(struct MANTA *fluid, struct MantaModifierData *mmd);
-void manta_ensure_outflow(struct MANTA *fluid, struct MantaModifierData *mmd);
-int manta_write_config(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
-int manta_write_data(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
-int manta_read_config(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
-int manta_read_data(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
-int manta_read_noise(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
-int manta_read_mesh(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
-int manta_read_particles(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
+void manta_ensure_obstacle(struct MANTA *fluid, struct FluidModifierData *mmd);
+void manta_ensure_guiding(struct MANTA *fluid, struct FluidModifierData *mmd);
+void manta_ensure_invelocity(struct MANTA *fluid, struct FluidModifierData *mmd);
+void manta_ensure_outflow(struct MANTA *fluid, struct FluidModifierData *mmd);
+int manta_write_config(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
+int manta_write_data(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
+int manta_read_config(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
+int manta_read_data(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
+int manta_read_noise(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
+int manta_read_mesh(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
+int manta_read_particles(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
int manta_read_guiding(struct MANTA *fluid,
- struct MantaModifierData *mmd,
+ struct FluidModifierData *mmd,
int framenr,
bool sourceDomain);
int manta_update_liquid_structures(struct MANTA *fluid,
- struct MantaModifierData *mmd,
+ struct FluidModifierData *mmd,
int framenr);
-int manta_update_mesh_structures(struct MANTA *fluid, struct MantaModifierData *mmd, int framenr);
+int manta_update_mesh_structures(struct MANTA *fluid, struct FluidModifierData *mmd, int framenr);
int manta_update_particle_structures(struct MANTA *fluid,
- struct
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list