Skip to content

Commit

Permalink
new demo version 0.7.2!
Browse files Browse the repository at this point in the history
  • Loading branch information
rlguy committed Nov 6, 2023
1 parent 48112c0 commit db3393c
Show file tree
Hide file tree
Showing 98 changed files with 7,939 additions and 1,752 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ 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.7.1_demo_(25_jul_2023.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.7.1/FLIP_Fluids_addon_0.7.1_demo_.25_jul_2023.zip)
Download the latest FLIP Fluids Demo installation file here: [FLIP_Fluids_addon_0.7.2_demo_(07_nov_2023.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.7.2/FLIP_Fluids_addon_0.7.2_demo_.07_nov_2023.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.

Get started creating your first simulation with our [beginners guide](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Creating-Your-First-FLIP-Fluids-Simulation) or [video learning series](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Video-Learning-Series)!

### Have any questions?

Feel free to send us a message on any of the [official marketplaces](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Official-Marketplaces-of-the-FLIP-Fluids-Addon), or send us an email at support@flipfluids.com. We're always glad to help!
Feel free to send us a message on any of the [official marketplaces](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Official-Marketplaces-of-the-FLIP-Fluids-Addon), or send us an email at support@flipfluids.com, or join the [FLIP Fluids Discord server](https://discord.gg/FLIPFluids). We're always glad to help!
4 changes: 2 additions & 2 deletions cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ set(CMAKE_BUILD_TYPE Release)
set(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD TRUE)
set(FLUIDENGINE_VERSION_MAJOR 0)
set(FLUIDENGINE_VERSION_MINOR 7)
set(FLUIDENGINE_VERSION_REVISION 1)
set(FLUIDENGINE_VERSION_DATE "25-JUL-2023")
set(FLUIDENGINE_VERSION_REVISION 2)
set(FLUIDENGINE_VERSION_DATE "07-NOV-2023")

if(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD)
set(FLUIDENGINE_VERSION_TYPE_LABEL "Demo")
Expand Down
344 changes: 305 additions & 39 deletions src/addon/bake.py

Large diffs are not rendered by default.

14 changes: 13 additions & 1 deletion src/addon/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,23 @@ def add_objects_to_geometry_exporter(geometry_exporter):
props = obj.flip_fluid.get_property_group()
export_object = __generate_export_object(obj)

is_dynamic_topology_exception = False
if obj.flip_fluid.is_force_field():
is_dynamic_topology_exception = True
elif obj.flip_fluid.is_inflow():
if not obj.flip_fluid.inflow.append_object_velocity:
is_dynamic_topology_exception = True
elif obj.flip_fluid.is_fluid():
if not obj.flip_fluid.fluid.append_object_velocity:
is_dynamic_topology_exception = True
elif obj.flip_fluid.is_outflow():
is_dynamic_topology_exception = True

skip_reexport = hasattr(props, "skip_reexport") and props.skip_reexport
force_reexport = hasattr(props, "force_reexport_on_next_bake") and props.force_reexport_on_next_bake
skip_reexport = skip_reexport and not force_reexport
export_object.skip_reexport = skip_reexport and not force_reexport
export_object.disable_changing_topology_warning = disable_topology_warning or obj.flip_fluid.is_force_field()
export_object.disable_changing_topology_warning = disable_topology_warning or is_dynamic_topology_exception
geometry_exporter.add_geometry_export_object(export_object)

# Add Fluid/Inflow target objects
Expand Down
3 changes: 2 additions & 1 deletion src/addon/filesystem/filesystem_protection_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
".cpp",
".data",
".ffd",
".ffp3",
".fpd",
".h",
".info",
Expand Down Expand Up @@ -206,7 +207,7 @@ def clear_cache_directory(cache_directory, clear_export=False, clear_logs=False,
delete_file(stats_filepath)

bakefiles_dir = os.path.join(cache_directory, "bakefiles")
extensions = [".bbox", ".bobj", ".data", ".wwp", ".wwf", ".wwi", ".fpd", ".ffd"]
extensions = [".bbox", ".bobj", ".data", ".wwp", ".wwf", ".wwi", ".fpd", ".ffd", ".ffp3"]
delete_files_in_directory(bakefiles_dir, extensions, remove_directory=True)

temp_dir = os.path.join(cache_directory, "temp")
Expand Down
28 changes: 28 additions & 0 deletions src/addon/materials/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
The FLIP Fluids Material Library Blend files and containing materials in this directory
and subdirectories are licensed under the MIT License:

--------------------------------------------------------------------------------

MIT License

Copyright (C) 2023 Ryan L. Guy

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

--------------------------------------------------------------------------------
12 changes: 12 additions & 0 deletions src/addon/materials/material_library.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ def get_surface_material_enums_ui(scene=None, context=None):
return enums


def get_fluid_particles_material_enums_ui(scene=None, context=None):
bpy.context.scene.flip_fluid_material_library.check_icons_initialized()
enums = []
enums += __get_material_library_enums_by_type('MATERIAL_TYPE_SURFACE')
enums += __get_material_library_enums_by_type('MATERIAL_TYPE_WHITEWATER')
enums += __get_material_library_enums_by_type('MATERIAL_TYPE_ALL')
enums += __get_non_material_library_enums_by_type()
enums += [__get_none_material_enum()]
enums.reverse()
return enums


def get_whitewater_material_enums_ui(scene=None, context=None):
bpy.context.scene.flip_fluid_material_library.check_icons_initialized()
enums = []
Expand Down
Loading

0 comments on commit db3393c

Please sign in to comment.