Commit: c2b72102bda5e5fbd7b48fd1708f054cc11db5fa Author: Sebastián Barschkis Date: Wed Jun 19 17:05:39 2019 +0200 Branches: fluid-mantaflow https://developer.blender.org/rBc2b72102bda5e5fbd7b48fd1708f054cc11db5fa
Mantaflow: Removed old liquid code completely rip =================================================================== M CMakeLists.txt M build_files/cmake/config/blender_full.cmake M build_files/cmake/config/blender_lite.cmake M build_files/cmake/config/blender_release.cmake M doc/doxygen/doxygen.intern.h M intern/CMakeLists.txt M intern/cycles/blender/blender_mesh.cpp M intern/cycles/blender/blender_util.h D intern/elbeem/CMakeLists.txt D intern/elbeem/COPYING D intern/elbeem/COPYING_trimesh2 D intern/elbeem/extern/LBM_fluidsim.h D intern/elbeem/extern/elbeem.h D intern/elbeem/intern/attributes.cpp D intern/elbeem/intern/attributes.h D intern/elbeem/intern/controlparticles.cpp D intern/elbeem/intern/controlparticles.h D intern/elbeem/intern/elbeem.cpp D intern/elbeem/intern/elbeem_control.cpp D intern/elbeem/intern/elbeem_control.h D intern/elbeem/intern/globals.h D intern/elbeem/intern/isosurface.cpp D intern/elbeem/intern/isosurface.h D intern/elbeem/intern/loop_tools.h D intern/elbeem/intern/mcubes_tables.h D intern/elbeem/intern/mvmcoords.cpp D intern/elbeem/intern/mvmcoords.h D intern/elbeem/intern/ntl_blenderdumper.cpp D intern/elbeem/intern/ntl_blenderdumper.h D intern/elbeem/intern/ntl_bsptree.cpp D intern/elbeem/intern/ntl_bsptree.h D intern/elbeem/intern/ntl_geometryclass.h D intern/elbeem/intern/ntl_geometrymodel.cpp D intern/elbeem/intern/ntl_geometrymodel.h D intern/elbeem/intern/ntl_geometryobject.cpp D intern/elbeem/intern/ntl_geometryobject.h D intern/elbeem/intern/ntl_geometryshader.h D intern/elbeem/intern/ntl_lighting.cpp D intern/elbeem/intern/ntl_lighting.h D intern/elbeem/intern/ntl_matrices.h D intern/elbeem/intern/ntl_ray.cpp D intern/elbeem/intern/ntl_ray.h D intern/elbeem/intern/ntl_vector3dim.h D intern/elbeem/intern/ntl_world.cpp D intern/elbeem/intern/ntl_world.h D intern/elbeem/intern/paraloopend.h D intern/elbeem/intern/parametrizer.cpp D intern/elbeem/intern/parametrizer.h D intern/elbeem/intern/particletracer.cpp D intern/elbeem/intern/particletracer.h D intern/elbeem/intern/simulation_object.cpp D intern/elbeem/intern/simulation_object.h D intern/elbeem/intern/solver_adap.cpp D intern/elbeem/intern/solver_class.h D intern/elbeem/intern/solver_control.cpp D intern/elbeem/intern/solver_control.h D intern/elbeem/intern/solver_init.cpp D intern/elbeem/intern/solver_interface.cpp D intern/elbeem/intern/solver_interface.h D intern/elbeem/intern/solver_main.cpp D intern/elbeem/intern/solver_relax.h D intern/elbeem/intern/solver_util.cpp D intern/elbeem/intern/utilities.cpp D intern/elbeem/intern/utilities.h M release/scripts/addons M release/scripts/addons_contrib D release/scripts/presets/fluid/honey.py D release/scripts/presets/fluid/oil.py D release/scripts/presets/fluid/water.py M release/scripts/startup/bl_ui/__init__.py D release/scripts/startup/bl_ui/properties_physics_fluid.py R100 release/scripts/startup/bl_ui/properties_physics_smoke.py release/scripts/startup/bl_ui/properties_physics_manta.py D source/blender/blenkernel/BKE_fluidsim.h M source/blender/blenkernel/CMakeLists.txt M source/blender/blenkernel/intern/bpath.c M source/blender/blenkernel/intern/effect.c D source/blender/blenkernel/intern/fluidsim.c M source/blender/blenkernel/intern/object.c M source/blender/blenkernel/intern/particle_system.c M source/blender/editors/datafiles/CMakeLists.txt M source/blender/editors/interface/interface_templates.c M source/blender/editors/physics/CMakeLists.txt D source/blender/editors/physics/physics_fluid.c M source/blender/editors/physics/physics_intern.h M source/blender/editors/physics/physics_ops.c M source/blender/editors/space_buttons/buttons_context.c M source/blender/gpencil_modifiers/CMakeLists.txt M source/blender/makesdna/DNA_modifier_types.h M source/blender/makesdna/DNA_object_types.h M source/blender/makesdna/DNA_particle_types.h M source/blender/makesrna/RNA_access.h M source/blender/makesrna/intern/CMakeLists.txt M source/blender/makesrna/intern/makesrna.c D source/blender/makesrna/intern/rna_fluidsim.c M source/blender/makesrna/intern/rna_internal.h M source/blender/makesrna/intern/rna_modifier.c M source/blender/makesrna/intern/rna_particle.c M source/blender/modifiers/CMakeLists.txt D source/blender/modifiers/intern/MOD_fluidsim.c D source/blender/modifiers/intern/MOD_fluidsim_util.c D source/blender/modifiers/intern/MOD_fluidsim_util.h M source/blender/modifiers/intern/MOD_util.c M source/blender/python/intern/CMakeLists.txt M source/blender/python/intern/bpy_app_build_options.c M source/blender/shader_fx/CMakeLists.txt =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index e2d5ab88cbf..fc290442d6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,7 +298,6 @@ endif() # Modifiers -option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON) option(WITH_MOD_MANTA "Enable Mantaflow Fluid Simulation Framework" ON) option(WITH_MANTA_OMP "Enable Mantaflow OpenMP support (instead of default TBB support)" OFF) option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) @@ -1816,7 +1815,6 @@ if(FIRST_RUN) info_cfg_text("Modifiers:") info_cfg_option(WITH_MOD_REMESH) - info_cfg_option(WITH_MOD_FLUID) info_cfg_option(WITH_MOD_MANTA) info_cfg_option(WITH_MOD_OCEANSIM) diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 96b2e582f05..a84f7a9e8dc 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -32,7 +32,6 @@ set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_LZMA ON CACHE BOOL "" FORCE) set(WITH_LZO ON CACHE BOOL "" FORCE) -set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE) set(WITH_MOD_MANTA ON CACHE BOOL "" FORCE) set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 760a389ba31..e23e5a35ae2 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -37,7 +37,6 @@ set(WITH_INTERNATIONAL OFF CACHE BOOL "" FORCE) set(WITH_JACK OFF CACHE BOOL "" FORCE) set(WITH_LZMA OFF CACHE BOOL "" FORCE) set(WITH_LZO OFF CACHE BOOL "" FORCE) -set(WITH_MOD_FLUID OFF CACHE BOOL "" FORCE) set(WITH_MOD_REMESH OFF CACHE BOOL "" FORCE) set(WITH_MOD_MANTA OFF CACHE BOOL "" FORCE) set(WITH_MOD_OCEANSIM OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 91a72191c2f..c7929722193 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -33,7 +33,6 @@ set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_LZMA ON CACHE BOOL "" FORCE) set(WITH_LZO ON CACHE BOOL "" FORCE) -set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE) set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE) set(WITH_MOD_MANTA ON CACHE BOOL "" FORCE) set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE) diff --git a/doc/doxygen/doxygen.intern.h b/doc/doxygen/doxygen.intern.h index 8e51cb01df0..98fb039c90b 100644 --- a/doc/doxygen/doxygen.intern.h +++ b/doc/doxygen/doxygen.intern.h @@ -18,10 +18,6 @@ * \ingroup intern */ -/** \defgroup elbeem elbeem - * \ingroup intern - */ - /** \defgroup iksolver iksolver * \ingroup intern */ diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 6cb6de3250a..b01993bf0e8 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -40,10 +40,6 @@ if(WITH_MOD_REMESH) add_subdirectory(dualcon) endif() -if(WITH_MOD_FLUID) - add_subdirectory(elbeem) -endif() - if(WITH_IK_SOLVER) add_subdirectory(iksolver) endif() diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index a1a2b911c73..c0929d5ea4d 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -911,45 +911,6 @@ static void sync_mesh_manta_motion(BL::Object &b_ob, Scene *scene, Mesh *mesh) } } -static void sync_mesh_fluid_motion(BL::Object &b_ob, Scene *scene, Mesh *mesh) -{ - if (scene->need_motion() == Scene::MOTION_NONE) - return; - - BL::DomainFluidSettings b_fluid_domain = object_fluid_domain_find(b_ob); - - if (!b_fluid_domain) - return; - - /* If the mesh has modifiers following the fluid domain we can't export motion. */ - if (b_fluid_domain.fluid_mesh_vertices.length() != mesh->verts.size()) - return; - - /* Find or add attribute */ - float3 *P = &mesh->verts[0]; - Attribute *attr_mP = mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION); - - if (!attr_mP) { - attr_mP = mesh->attributes.add(ATTR_STD_MOTION_VERTEX_POSITION); - } - - /* Only export previous and next frame, we don't have any in between data. */ - float motion_times[2] = {-1.0f, 1.0f}; - for (int step = 0; step < 2; step++) { - float relative_time = motion_times[step] * scene->motion_shutter_time() * 0.5f; - float3 *mP = attr_mP->data_float3() + step * mesh->verts.size(); - - BL::DomainFluidSettings::fluid_mesh_vertices_iterator fvi; - int i = 0; - - for (b_fluid_domain.fluid_mesh_vertices.begin(fvi); - fvi != b_fluid_domain.fluid_mesh_vertices.end(); - ++fvi, ++i) { - mP[i] = P[i] + get_float3(fvi->velocity()) * relative_time; - } - } -} - Mesh *BlenderSync::sync_mesh(BL::Depsgraph &b_depsgraph, BL::Object &b_ob, BL::Object &b_ob_instance, @@ -1085,9 +1046,6 @@ Mesh *BlenderSync::sync_mesh(BL::Depsgraph &b_depsgraph, /* mesh fluid motion mantaflow */ sync_mesh_manta_motion(b_ob, scene, mesh); - /* fluid motion */ - sync_mesh_fluid_motion(b_ob, scene, mesh); - /* tag update */ bool rebuild = (oldtriangles != mesh->triangles) || (oldsubd_faces != mesh->subd_faces) || (oldsubd_face_corners != mesh->subd_face_corners) || @@ -1138,11 +1096,6 @@ void BlenderSync::sync_mesh_motion(BL::Depsgraph &b_depsgraph, if (b_manta_domain) return; - /* fluid motion is exported immediate with mesh, skip here */ - BL::DomainFluidSettings b_fluid_domain = object_fluid_domain_find(b_ob); - if (b_fluid_domain) - return; - if (ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview)) { /* get derived mesh */ b_mesh = object_to_mesh(b_data, b_ob, b_depsgraph, false, Mesh::SUBDIVISION_NONE); diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index de6ef5007a1..4d9329eded9 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -535,23 +535,6 @@ static inline BL::MantaDomainSettings object_manta_domain_find(BL::Object &b_ob) return BL::MantaDomainSettings(PointerRNA_NULL); } -static inline BL::DomainFluidSettings 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_FluidSimulationModifier)) { - BL::FluidSimulationModifier b_fmd(*b_mod); - BL::FluidSettings fss = b_fmd.settings(); - - if (fss.type() == BL::FluidSettings::type_DOMAIN) - return (BL::DomainFluidSettings)b_fmd.settings(); - } - } - - return BL::DomainFluidSettings(PointerRNA_NULL); -} - static inline Mesh::SubdivisionType object_subdivision_type(BL::Object &b_ob, bool preview, bool experimental) diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt deleted file mode 100644 index 926329be61b..00000000000 --- a/intern/elbeem/CMakeLists.txt +++ /dev/null @@ -1,122 +0,0 @@ -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2006, Blender Foundation -# All rights reserved. -# ***** END GPL LICENSE BLOCK ***** - -set(INC - extern - ../guardedalloc -) - -set(INC_SYS - ${PNG_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} -) - -set(SRC - intern/attributes.cpp - intern/controlparticles.cpp - intern/elbeem.cpp - intern/elbeem_control.cpp - intern/isosurface.cpp - intern/mvmcoords.cpp - intern/ntl_blenderdumper.cpp - intern/ntl_bsptree.cpp - intern/ntl_geometrymodel.cpp - intern/ntl_geometryobject.cpp - intern/ntl_lighting.cpp - intern/ntl_ray.cpp - intern/ntl_world.cpp - intern/parametrizer.cpp - intern/particletracer.cpp - intern/simulation_object.cpp - intern/solver_adap.cpp - intern/solver_control.cpp - intern/solver_init.cpp - intern/solver_interface.cpp - intern/solver_main.cpp - intern/solver_util.cpp - intern/utilities.cpp - - extern/LBM_fluidsim.h - extern/elbeem.h - intern/attributes.h - intern/controlparticles.h - intern/elbeem_control.h - intern/isosurface.h - intern/loop_tools.h - intern/mcubes_tables.h - intern/mvmcoords.h - intern/ntl_blenderdumper.h - intern/ntl_bsptree.h - intern/ntl_geometryclass.h - intern/ntl_geometrymodel.h - intern/ntl_geometryobject.h - intern/ntl_geometryshader.h - intern/ntl_lighting.h - intern/ntl_matrices.h - intern/ntl_ray.h - intern/ntl_vector3dim.h - intern/ntl_world.h - intern/paraloopend.h - intern/parametrizer.h - intern/particletracer.h - intern/simulation_object.h - intern/solver_class.h - intern/solver_control.h - intern/solver_interface.h - intern/solver_relax.h - intern/utilities.h - intern/globals.h -) - -set(LIB -) - -# elbeem has some harmless UNUSED warnings -remove_strict_flags() - -add_definitions( - -DNOGUI - -DELBEEM_BLENDER=1 -) - -# not essential but quiet gcc's -Wundef -add_definitions( - -DLBM_PRECISION=1 - -DLBM_INCLUDE_TESTSOLVERS=0 - -DFS @@ 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