new demo version 0.6.0!

Author: rlguy

README.md

@@ -1,4 +1,4 @@
-Want to try the FLIP Fluids addon before buying the [full marketplace product](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Official-Marketplaces-of-the-FLIP-Fluids-Addon)? Try out the **FLIP Fluids Demo** addon! The FLIP Fluids demo can do almost everything that the full version can and will let you create, run, and render your own fluid simulations with a small limitation.
+Want to try the FLIP Fluids addon before buying the [full marketplace product](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Official-Marketplaces-of-the-FLIP-Fluids-Addon)? Try out the **FLIP Fluids Demo** addon! The FLIP Fluids demo can do almost everything that the full version can and will let you create, run, and render your own fluid simulations with a few small limitations.
 
 ### Limitations
 
@@ -8,7 +8,7 @@ Want to try the FLIP Fluids addon before buying the [full marketplace product](h
 
 ### Getting Started
 
-Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.5.0_demo_(07_sep_2022.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.5.0/FLIP_Fluids_addon_0.5.0_demo_.07_sep_2022.zip)
+Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.6.0_demo_(24_nov_2022.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.6.0/FLIP_Fluids_addon_0.6.0_demo_.24_nov_2022.zip)
 
 After downloading the demo addon, follow our [Installation Instructions](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Addon-Installation-and-Uninstallation). The instructions are similar to installing any other Blender addon.
 

cmake/CMakeLists.txt

@@ -52,9 +52,9 @@ set(CMAKE_BUILD_TYPE Release)
 
 set(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD TRUE)
 set(FLUIDENGINE_VERSION_MAJOR 0)
-set(FLUIDENGINE_VERSION_MINOR 5)
+set(FLUIDENGINE_VERSION_MINOR 6)
 set(FLUIDENGINE_VERSION_REVISION 0)
-set(FLUIDENGINE_VERSION_DATE "07-SEP-2022")
+set(FLUIDENGINE_VERSION_DATE "24-NOV-2022")
 
 if(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD)
     set(FLUIDENGINE_VERSION_TYPE_LABEL "Demo")

src/addon/bake.py

@@ -1003,9 +1003,6 @@ def __initialize_fluid_simulation_settings(fluidsim, data):
         surface_tension_number = mincfl + (1.0 - accuracy_pct) * (maxcfl - mincfl)
         fluidsim.surface_tension_condition_number = surface_tension_number
 
-        st_solver_mode = __get_parameter_data(world.surface_tension_solver_method, frameno)
-        fluidsim.enable_smooth_surface_tension_kernel = st_solver_mode == 'SURFACE_TENSION_SOLVER_METHOD_SMOOTH'
-
     is_sheet_seeding_enabled = __get_parameter_data(world.enable_sheet_seeding, frameno)
     if is_sheet_seeding_enabled:
         fluidsim.enable_sheet_seeding = is_sheet_seeding_enabled
@@ -1574,6 +1571,38 @@ def __update_animatable_obstacle_properties(data, frameid):
     obstacle_objects = data.obstacle_objects
     obstacle_data = data.obstacle_data
 
+    #### WORKAROUND ####
+
+    # Due to a current design issue in the simulator, if there is a mix of
+    # static and dynamic inverse obstacles in the simulation, then the combined
+    # inverse SDF will not be computed correctly. A workaround in previous
+    # versions of the addon was to enable "Export Animation Mesh" on all inverse
+    # obstacles so that there was not a mix and the SDF would be computed correctly.
+    #
+    # This section automatically applies this workaround by detecting if there
+    # are any dynamic inverse obstacles, and if so, treating all static inverse
+    # obstacles as dynamic ones. This is done by using the update_mesh_animated()
+    # method and supplying the static mesh for all frame_previous, frame_current, and
+    # frame_next.
+    #
+    # In future development, or in the next iteration of the simulator, this should
+    # be fixed properly inside of the simulation engine.
+
+    is_inverse_dynamic = False
+    for idx, mesh_object in enumerate(obstacle_objects):
+        data = obstacle_data[idx]
+        if mesh_object.inverse:
+            is_inverse_dynamic = is_inverse_dynamic or __is_object_dynamic(data.name)
+
+    if is_inverse_dynamic:
+        for idx, mesh_object in enumerate(obstacle_objects):
+            data = obstacle_data[idx]
+            if mesh_object.inverse and not __is_object_dynamic(data.name):
+                mesh = __extract_static_frame_mesh(data.name)
+                mesh_object.update_mesh_animated(mesh, mesh, mesh)
+                
+    #### END WORKAROUND ####
+
     for idx, mesh_object in enumerate(obstacle_objects):
         data = obstacle_data[idx]
 
@@ -1797,6 +1826,10 @@ def __update_animatable_domain_properties(fluidsim, data, frameno):
 
     world = dprops.world
     gravity = __get_parameter_data(world.gravity, frameno)
+    if __get_parameter_data(world.gravity_type, frameno) == 'GRAVITY_TYPE_SCENE':
+        use_gravity = bool(__get_parameter_data(world.scene_use_gravity, frameno))
+        if not use_gravity:
+            gravity = [0.0, 0.0, 0.0]
     __set_body_force_property(fluidsim, gravity)
 
     is_viscosity_enabled = __get_parameter_data(world.enable_viscosity, frameno)

src/addon/export.py

@@ -135,6 +135,7 @@ def __get_domain_data_dict(context, dobj):
     d['advanced']['num_threads_auto_detect'] = dprops.advanced.num_threads_auto_detect
     d['simulation']['frames_per_second'] = dprops.simulation.get_frame_rate_data_dict()
     d['world']['gravity'] = dprops.world.get_gravity_data_dict()
+    d['world']['scene_use_gravity'] = dprops.world.get_scene_use_gravity_data_dict()
     d['world']['native_surface_tension_scale'] = dprops.world.native_surface_tension_scale
     d['world']['minimum_surface_tension_cfl'] = dprops.world.minimum_surface_tension_cfl
     d['world']['maximum_surface_tension_cfl'] = dprops.world.maximum_surface_tension_cfl

src/addon/filesystem/filesystem_protection_layer.py

@@ -16,31 +16,41 @@
 
 import bpy, os, pathlib
 
+from ..utils import installation_utils
+
 
 __EXTENSION_WHITELIST = [
     ".backup",
     ".bat",
     ".bbox",
     ".bin",
+    ".blend",
     ".bobj",
     ".cpp",
     ".data",
     ".ffd",
     ".fpd",
     ".h",
     ".info",
+    ".json",
     ".md",
     ".png",
     ".preset",
     ".sim",
     ".sqlite3",
     ".state",
     ".txt",
+    ".txt~",
     ".wwi",
     ".wwf",
     ".wwp"
     ]
 
+# These extensions are not allowed to be mass-deleted within a directory
+__DELETE_DIRECTORY_EXTENSION_BLACKLIST = [
+    ".blend"
+    ]
+
 
 class FilesystemProtectionError(Exception):
     def __init__(self, value):
@@ -54,6 +64,11 @@ def get_extension_whitelist():
     return __EXTENSION_WHITELIST
 
 
+def get_delete_directory_extension_blacklist():
+    global __DELETE_DIRECTORY_EXTENSION_BLACKLIST
+    return __DELETE_DIRECTORY_EXTENSION_BLACKLIST
+
+
 def get_directory_whitelist():
     whitelist = []
     dprops = bpy.context.scene.flip_fluid.get_domain_properties()
@@ -64,6 +79,10 @@ def get_directory_whitelist():
     addon_filepath = os.path.dirname(os.path.dirname(this_filepath))
     whitelist.append(addon_filepath)
 
+    preset_library_installations = installation_utils.get_preset_library_installations()
+    for install in preset_library_installations:
+        whitelist.append(install["path"])
+
     return whitelist
 
 
@@ -110,6 +129,14 @@ def check_directory_valid(base_directory):
 
 
 def delete_files_in_directory(base_directory, extensions, remove_directory=False):
+    extension_blacklist = get_delete_directory_extension_blacklist()
+    for ext in extension_blacklist:
+        if ext in extensions:
+            error_msg = "Extension in directory deletion blacklist: "
+            error_msg += "<" + ext + "> "
+            error_msg += "***Please contact the developers with this error message***"
+            raise FilesystemProtectionError(error_msg)
+
     check_extensions_valid(extensions)
     check_directory_valid(base_directory)
 
@@ -142,7 +169,7 @@ def delete_files_in_directory(base_directory, extensions, remove_directory=False
 
     if remove_error_count > 0:
         errmsg = "Error encountered attempting to remove " + str(remove_error_count) + " file(s). Reason: <" + first_error + ">. "
-        errmsg += "Try closing all applications accessing the cache directory, restarting Blender/System, or deleting cache directory manually."
+        errmsg += "Try closing all applications accessing the directory, restarting Blender/System, or deleting directory manually."
         bpy.ops.flip_fluid_operators.display_error(
                 'INVOKE_DEFAULT',
                 error_message="Error Removing Files",

src/addon/materials/material_library/whitewater/FF Bubble.blend

@@ -30,7 +30,8 @@
         'draw_grid_operators',
         'draw_particles_operators',
         'draw_force_field_operators',
-        'helper_operators'
+        'helper_operators',
+        'support_operators'
     ]
     for module_name in reloadable_modules:
         if module_name in locals():
@@ -52,7 +53,8 @@
         draw_grid_operators,
         draw_particles_operators,
         draw_force_field_operators,
-        helper_operators
+        helper_operators,
+        support_operators
         )
 
 
@@ -71,6 +73,7 @@ def register():
     draw_particles_operators.register()
     draw_force_field_operators.register()
     helper_operators.register()
+    support_operators.register()
 
 
 def unregister():
@@ -87,4 +90,4 @@ def unregister():
     draw_grid_operators.unregister()
     draw_particles_operators.unregister()
     draw_force_field_operators.unregister()
-    helper_operators.unregister()
+    support_operators.unregister()

src/addon/materials/material_library/whitewater/FF Foam.blend

@@ -74,8 +74,16 @@ def update_stats(context=None):
             return
 
     temp_dir = os.path.join(cache_dir, "temp")
-    match_str = "framestats" + "[0-9]"*6 + ".data"
-    stat_files = glob.glob(os.path.join(temp_dir, match_str))
+    if not os.path.isdir(temp_dir):
+        return
+
+    stat_prefix = "framestats"
+    stat_extension = ".data"
+    stat_files = [f for f in os.listdir(temp_dir) if os.path.isfile(os.path.join(temp_dir, f))]
+    stat_files = [f for f in stat_files if f.endswith(stat_extension)]
+    stat_files = [f for f in stat_files if (f[len(stat_prefix):-len(stat_extension)]).isdigit()]
+    stat_files = [os.path.join(temp_dir, f) for f in stat_files if f.endswith(stat_extension)]
+    
     if not stat_files:
         return
 
@@ -84,7 +92,7 @@ def update_stats(context=None):
 
     for statpath in stat_files:
         filename = os.path.basename(statpath)
-        frameno = int(filename[len("framestats"):-len(".data")])
+        frameno = int(filename[len(stat_prefix):-len(stat_extension)])
         with open(statpath, 'r', encoding='utf-8') as frame_stats:
             try:
                 frame_stats_dict = json.loads(frame_stats.read())
@@ -295,7 +303,7 @@ def execute(self, context):
 
         if context.scene.flip_fluid.get_num_domain_objects() > 1:
             self.report({"ERROR_INVALID_INPUT"}, 
-                        "There must be only one domain object")
+                        "There must be only one domain object in the Blend file")
             self.cancel(context)
             return {'CANCELLED'}
 

src/addon/materials/material_library/whitewater/FF Spray.blend

@@ -165,6 +165,10 @@ def poll(cls, context):
 
 
     def draw_callback_2d(self, context):
+        draw_text = False
+        if not draw_text:
+            return
+
         if render.is_rendering():
             # This method does not need to be run while rendering. Can cause
             # crashes on certain systems.