[Bf-blender-cvs] [41a0e7a5de0] fluid-mantaflow: Mantaflow: Applied Nils big rename patches
Sebastián Barschkis
noreply at git.blender.org
Wed Jun 19 17:07:58 CEST 2019
Commit: 41a0e7a5de0681c53a2d6032f1b0054498d8203e
Author: Sebastián Barschkis
Date: Tue Jun 18 16:20:24 2019 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB41a0e7a5de0681c53a2d6032f1b0054498d8203e
Mantaflow: Applied Nils big rename patches
Replaces occurences of smoke with manta
===================================================================
M CMakeLists.txt
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_util.h
M intern/mantaflow/CMakeLists.txt
M intern/mantaflow/extern/manta_fluid_API.h
R076 intern/mantaflow/intern/FLUID.cpp intern/mantaflow/intern/MANTA_main.cpp
R086 intern/mantaflow/intern/FLUID.h intern/mantaflow/intern/MANTA_main.h
M intern/mantaflow/intern/manta_fluid_API.cpp
R100 release/datafiles/blender_icons16/icon16_mod_smoke.dat release/datafiles/blender_icons16/icon16_mod_manta.dat
R100 release/datafiles/blender_icons32/icon32_mod_smoke.dat release/datafiles/blender_icons32/icon32_mod_manta.dat
M release/datafiles/locale
M release/scripts/startup/bl_operators/object_quick_effects.py
M release/scripts/startup/bl_ui/properties_physics_common.py
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M source/blender/CMakeLists.txt
M source/blender/alembic/intern/abc_exporter.cc
R065 source/blender/blenkernel/BKE_smoke.h source/blender/blenkernel/BKE_manta.h
M source/blender/blenkernel/BKE_pointcache.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/effect.c
R068 source/blender/blenkernel/intern/smoke.c 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/depsgraph/intern/depsgraph_physics.cc
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/datafiles/CMakeLists.txt
M source/blender/editors/include/UI_icons.h
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/physics/physics_manta.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/intern/gpu_draw.c
R096 source/blender/makesdna/DNA_smoke_types.h source/blender/makesdna/DNA_manta_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_internal.h
R071 source/blender/makesrna/intern/rna_smoke.c 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/modifiers/CMakeLists.txt
M source/blender/modifiers/MOD_modifiertypes.h
R060 source/blender/modifiers/intern/MOD_smoke.c source/blender/modifiers/intern/MOD_manta.c
M source/blender/modifiers/intern/MOD_util.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0423a785dff..e2d5ab88cbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,7 @@ mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON)
-option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke, ocean sim, and audio effects)" ${_init_FFTW3})
+option(WITH_FFTW3 "Enable FFTW3 support (Used for ocean sim and audio effects)" ${_init_FFTW3})
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
mark_as_advanced(WITH_SYSTEM_BULLET)
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 319733517f3..a1a2b911c73 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::SmokeDomainSettings b_domain = object_smoke_domain_find(b_ob);
+ BL::MantaDomainSettings b_domain = object_manta_domain_find(b_ob);
if (!b_domain)
return;
@@ -878,13 +878,13 @@ static void sync_mesh_manta_motion(BL::Object &b_ob, Scene *scene, Mesh *mesh)
if (scene->need_motion() == Scene::MOTION_NONE)
return;
- BL::SmokeDomainSettings b_smoke_domain = object_smoke_domain_find(b_ob);
+ BL::MantaDomainSettings b_manta_domain = object_manta_domain_find(b_ob);
- if (!b_smoke_domain)
+ if (!b_manta_domain)
return;
/* If the mesh has modifiers following the fluid domain we can't export motion. */
- if (b_smoke_domain.mesh_vertices.length() != mesh->verts.size())
+ if (b_manta_domain.mesh_vertices.length() != mesh->verts.size())
return;
/* Find or add attribute */
@@ -901,10 +901,10 @@ 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::SmokeDomainSettings::mesh_vertices_iterator svi;
+ BL::MantaDomainSettings::mesh_vertices_iterator svi;
int i = 0;
- for (b_smoke_domain.mesh_vertices.begin(svi); svi != b_smoke_domain.mesh_vertices.end();
+ for (b_manta_domain.mesh_vertices.begin(svi); svi != b_manta_domain.mesh_vertices.end();
++svi, ++i) {
mP[i] = P[i] + get_float3(svi->velocity()) * relative_time;
}
@@ -1134,8 +1134,8 @@ 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::SmokeDomainSettings b_smoke_domain = object_smoke_domain_find(b_ob);
- if (b_smoke_domain)
+ BL::MantaDomainSettings b_manta_domain = object_manta_domain_find(b_ob);
+ if (b_manta_domain)
return;
/* fluid motion is exported immediate with mesh, skip here */
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index fc460912576..4e3fd485b07 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -1169,7 +1169,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::SmokeDomainSettings b_domain = object_smoke_domain_find(b_ob);
+ BL::MantaDomainSettings b_domain = object_manta_domain_find(b_ob);
metadata.is_float = true;
metadata.depth = 1;
@@ -1344,7 +1344,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::SmokeDomainSettings b_domain = object_smoke_domain_find(b_ob);
+ BL::MantaDomainSettings b_domain = object_manta_domain_find(b_ob);
if (!b_domain) {
return false;
@@ -1365,47 +1365,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)) {
- SmokeDomainSettings_density_grid_get_length(&b_domain.ptr, &length);
+ MantaDomainSettings_density_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- SmokeDomainSettings_density_grid_get(&b_domain.ptr, pixels);
+ MantaDomainSettings_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 */
- SmokeDomainSettings_flame_grid_get_length(&b_domain.ptr, &length);
+ MantaDomainSettings_flame_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- SmokeDomainSettings_flame_grid_get(&b_domain.ptr, pixels);
+ MantaDomainSettings_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 */
- SmokeDomainSettings_color_grid_get_length(&b_domain.ptr, &length);
+ MantaDomainSettings_color_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels * 4) {
- SmokeDomainSettings_color_grid_get(&b_domain.ptr, pixels);
+ MantaDomainSettings_color_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_VELOCITY)) {
- SmokeDomainSettings_velocity_grid_get_length(&b_domain.ptr, &length);
+ MantaDomainSettings_velocity_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels * 3) {
- SmokeDomainSettings_velocity_grid_get(&b_domain.ptr, pixels);
+ MantaDomainSettings_velocity_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_HEAT)) {
- SmokeDomainSettings_heat_grid_get_length(&b_domain.ptr, &length);
+ MantaDomainSettings_heat_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- SmokeDomainSettings_heat_grid_get(&b_domain.ptr, pixels);
+ MantaDomainSettings_heat_grid_get(&b_domain.ptr, pixels);
return true;
}
}
else if (builtin_name == Attribute::standard_name(ATTR_STD_VOLUME_TEMPERATURE)) {
- SmokeDomainSettings_temperature_grid_get_length(&b_domain.ptr, &length);
+ MantaDomainSettings_temperature_grid_get_length(&b_domain.ptr, &length);
if (length == num_pixels) {
- SmokeDomainSettings_temperature_grid_get(&b_domain.ptr, pixels);
+ MantaDomainSettings_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 972d7296727..de6ef5007a1 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -519,20 +519,20 @@ static inline bool object_use_deform_motion(BL::Object &b_parent, BL::Object &b_
return use_deform_motion;
}
-static inline BL::SmokeDomainSettings object_smoke_domain_find(BL::Object &b_ob)
+static inline BL::MantaDomainSettings object_manta_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_SmokeModifier)) {
- BL::SmokeModifier b_smd(*b_mod);
+ if (b_mod->is_a(&RNA_MantaModifier)) {
+ BL::MantaModifier b_mmd(*b_mod);
- if (b_smd.smoke_type() == BL::SmokeModifier::smoke_type_DOMAIN)
- return b_smd.domain_settings();
+ if (b_mmd.type() == BL::MantaModifier::type_DOMAIN)
+ return b_mmd.domain_settings();
}
}
- return BL::SmokeDomainSettings(PointerRNA_NULL);
+ return BL::MantaDomainSettings(PointerRNA_NULL);
}
static inline BL::DomainFluidSettings object_fluid_domain_find(BL::Object b_ob)
diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt
index 4ad68dcc65b..116bd60749a 100644
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -82,11 +82,11 @@ endif()
set(SRC
intern/manta_python_API.cpp
intern/manta_fluid_API.cpp
- intern/FLUID.cpp
+ intern/MANTA_main.cpp
extern/manta_python_API.h
extern/manta_fluid_API.h
- intern/FLUID.h
+ intern/MANTA_main.h
intern/strings/fluid_script.h
intern/strings/smoke_script.h
intern/strings/liquid_script.h
diff --git a/intern/mantaflow/extern/manta_fluid_API.h b/intern/mantaflow/extern/manta_fluid_API.h
index 137e110afe5..8633667c7cd 100644
--- a/intern/mantaflow/extern/manta_fluid_API.h
+++ b/intern/mantaflow/extern/manta_fluid_API.h
@@ -27,82 +27,82 @@
* \ingroup mantaflow
*/
-#ifndef MANTA_FLUID_API_H
-#define MANTA_FLUID_API_H
+#ifndef MANTA_API_H
+#define MANTA_API_H
#ifdef __cplusplus
extern "C" {
#endif
-struct FLUID;
+struct MANTA;
/* 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);
-void fluid_ensure_outflow(struct FLUID *fluid, struct SmokeModifierData *smd);
-int fluid_write_config(struct FLUID *fluid, struct SmokeModifierData *smd, int framenr);
-int fluid_write_data(struct FLUID *fluid, struct SmokeModifierData *smd, int framenr);
-int fluid_read_config(struct FLUID *fluid, struct SmokeModifierData *smd, i
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list