new demo version 1.8.5!

Author: rlguy

CMakeLists.txt

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
 
-cmake_minimum_required(VERSION 3.5...4.0.2)
+cmake_minimum_required(VERSION 3.5...4.2.0)
 
 function(set_output_directories DIR)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${DIR} PARENT_SCOPE)
@@ -39,37 +39,54 @@ include(CheckLinkerFlag)
 set(BUILD_DEBUG OFF CACHE BOOL "Turn on to build a debug release")
 option(DISTRIBUTE_SOURCE "Include source code in addon" ON)
 option(WITH_MIXBOX "Compile with Mixbox pigment mixing feature" OFF)
-set(LIBRARY_SUFFIX "" CACHE STRING "Optional suffix to add to the end of the library name")
 
 # Configure Project
 project(bl_flip_fluids)
 set(CMAKE_BUILD_TYPE Release)
+
 if(APPLE)
     set(MACOSX_DEPLOYMENT_TARGET 10.10) # OS X Yosemite
 endif()
 
 # Set Version Info
-set(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD TRUE)
-set(FLUIDENGINE_VERSION_MAJOR 1)
-set(FLUIDENGINE_VERSION_MINOR 8)
-set(FLUIDENGINE_VERSION_REVISION 4)
-set(FLUIDENGINE_VERSION_DATE_YYYY "2025")
-set(FLUIDENGINE_VERSION_DATE_MM "07")
-set(FLUIDENGINE_VERSION_DATE_DD "14")
-
-if(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD)
-    set(FLUIDENGINE_VERSION_TYPE_LABEL "Demo")
-    set(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD_PYTHON "True")
+set(FFENGINE_VERSION_TYPE_IS_STABLE_BUILD TRUE)
+set(FFENGINE_VERSION_MAJOR 1)
+set(FFENGINE_VERSION_MINOR 8)
+set(FFENGINE_VERSION_REVISION 5)
+set(FFENGINE_VERSION_DATE_YYYY "2025")
+set(FFENGINE_VERSION_DATE_MM "11")
+set(FFENGINE_VERSION_DATE_DD "18")
+set(FFENGINE_VERSION_SUPPORT_LICENSE_TYPE "Demo")
+set(FFENGINE_VERSION_RELEASE_TYPE "Release")
+
+# Format Version Info
+if(FFENGINE_VERSION_TYPE_IS_STABLE_BUILD)
+    if(FFENGINE_VERSION_IS_FULL_RELEASE)
+    else()
+    endif()
+    set(FFENGINE_VERSION_TYPE_LABEL ${FFENGINE_VERSION_RELEASE_TYPE})
+    set(FFENGINE_VERSION_TYPE_IS_STABLE_BUILD_PYTHON "True")
 else()
-    set(FLUIDENGINE_VERSION_TYPE_LABEL "Experimental")
-    set(FLUIDENGINE_VERSION_TYPE_IS_STABLE_BUILD_PYTHON "False")
+    set(FFENGINE_VERSION_TYPE_LABEL "Experimental")
+    set(FFENGINE_VERSION_TYPE_IS_STABLE_BUILD_PYTHON "False")
 endif()
 
-set(FLUIDENGINE_VERSION_DATE "${FLUIDENGINE_VERSION_DATE_YYYY}-${FLUIDENGINE_VERSION_DATE_MM}-${FLUIDENGINE_VERSION_DATE_DD}")
-set(FLUIDENGINE_VERSION_LABEL "${FLUIDENGINE_VERSION_MAJOR}.${FLUIDENGINE_VERSION_MINOR}.${FLUIDENGINE_VERSION_REVISION} ${FLUIDENGINE_VERSION_TYPE_LABEL} ${FLUIDENGINE_VERSION_DATE}")
+set(FFENGINE_VERSION_DATE "${FFENGINE_VERSION_DATE_YYYY}-${FFENGINE_VERSION_DATE_MM}-${FFENGINE_VERSION_DATE_DD}")
+set(FFENGINE_VERSION_LABEL "\
+${FFENGINE_VERSION_MAJOR}.${FFENGINE_VERSION_MINOR}.${FFENGINE_VERSION_REVISION} \
+${FFENGINE_VERSION_SUPPORT_LICENSE_TYPE} \
+${FFENGINE_VERSION_TYPE_LABEL} \
+${FFENGINE_VERSION_DATE}\
+")
+
+string(RANDOM LENGTH 1 ALPHABET "123456789" RANDOM_DIGITS_1)
+string(RANDOM LENGTH 2 ALPHABET "0123456789" RANDOM_DIGITS_2)
+string(RANDOM LENGTH 1 ALPHABET "ABCEGJKLMNPRTVXY" RANDOM_LETTERS_1)
+string(RANDOM LENGTH 1 ALPHABET "ABCEGJKLMNPRTVWXYZ" RANDOM_LETTERS_2)
+set(FFENGINE_VERSION_SUPPORT_LICENSE_ID "${RANDOM_DIGITS_1}${RANDOM_DIGITS_2}${RANDOM_LETTERS_1}${RANDOM_LETTERS_2}")
 
 # Begin Build
-message(STATUS "FLIP Fluids version ${FLUIDENGINE_VERSION_LABEL}")
+message(STATUS "FLIP Fluids Version ${FFENGINE_VERSION_LABEL}")
 if(BUILD_DEBUG)
     message(STATUS "Building in debug mode")
 else()
@@ -78,11 +95,11 @@ endif()
 
 # Configure Mixbox
 if(WITH_MIXBOX)
-    set(FLUIDENGINE_IS_MIXBOX_SUPPORTED "True")
+    set(FFENGINE_IS_MIXBOX_SUPPORTED "True")
     add_definitions(-DWITH_MIXBOX=1)
     set(MIXBOX_SOURCE_CPP "src/engine/mixbox/mixbox.cpp")
 else()
-    set(FLUIDENGINE_IS_MIXBOX_SUPPORTED "False")
+    set(FFENGINE_IS_MIXBOX_SUPPORTED "False")
     add_definitions(-DWITH_MIXBOX=0)
     set(MIXBOX_SOURCE_CPP "src/engine/mixbox/mixbox_stub.cpp")
 endif()
@@ -100,6 +117,9 @@ elseif(MINGW)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--enable-stdcall-fixup")
 elseif(APPLE)
     set(CMAKE_MACOSX_RPATH ON)
+    set(CMAKE_SKIP_BUILD_RPATH FALSE)
+    set(CMAKE_INSTALL_RPATH "@loader_path")
+    set(CMAKE_BUILD_RPATH "@loader_path")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -std=c++17 -Wall -Wno-return-type-c-linkage")
 
     # Older compiler versions may not support or require -lstdc++fs linker flag
@@ -108,6 +128,12 @@ elseif(APPLE)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lstdc++fs")
     endif()
 elseif(UNIX AND NOT APPLE)
+    set(CMAKE_SKIP_BUILD_RPATH FALSE)
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+    set(CMAKE_INSTALL_RPATH "$ORIGIN")
+    set(CMAKE_BUILD_RPATH "$ORIGIN")
+    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -D_GLIBCXX_USE_NANOSLEEP -fopenmp -O3 -Wall -fPIC -pthread")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include ${PROJECT_SOURCE_DIR}/src/engine/glibc_version_header/force_link_glibc_2.5.h")
 else()
@@ -143,67 +169,109 @@ configure_file(
   "${PROJECT_SOURCE_DIR}/src/addon/utils/installation_utils.py"
 )
 
+# Sources
+set(SOURCES_FLUID_ENGINE_LIBRARY
+    src/engine/aabb.cpp
+    src/engine/collision.cpp
+    src/engine/diffuseparticlesimulation.cpp
+    src/engine/fluidmaterialgrid.cpp
+    src/engine/fluidsimulation.cpp
+    src/engine/forcefield.cpp
+    src/engine/forcefieldcurve.cpp
+    src/engine/forcefieldgrid.cpp
+    src/engine/forcefieldpoint.cpp
+    src/engine/forcefieldsurface.cpp
+    src/engine/forcefieldutils.cpp
+    src/engine/forcefieldvolume.cpp
+    src/engine/gridindexkeymap.cpp
+    src/engine/gridindexvector.cpp
+    src/engine/gridutils.cpp
+    src/engine/influencegrid.cpp
+    src/engine/interpolation.cpp
+    src/engine/levelsetsolver.cpp
+    src/engine/levelsetutils.cpp
+    src/engine/logfile.cpp
+    src/engine/macvelocityfield.cpp
+    src/engine/meshfluidsource.cpp
+    src/engine/meshlevelset.cpp
+    src/engine/meshobject.cpp
+    src/engine/meshutils.cpp
+    src/engine/noisegenerationutils.cpp
+    src/engine/particlelevelset.cpp
+    src/engine/particlemaskgrid.cpp
+    src/engine/particlemesher.cpp
+    src/engine/particlesheeter.cpp
+    src/engine/particlesystem.cpp
+    src/engine/polygonizer3d.cpp
+    src/engine/pressuresolver.cpp
+    src/engine/scalarfield.cpp
+    src/engine/spatialpointgrid.cpp
+    src/engine/stopwatch.cpp
+    src/engine/threadutils.cpp
+    src/engine/trianglemesh.cpp
+    src/engine/turbulencefield.cpp
+    src/engine/velocityadvector.cpp
+    src/engine/versionutils.cpp
+    src/engine/viscositysolver.cpp
+    src/engine/vmath.cpp
+    src/engine/c_bindings/cbindings.cpp
+    src/engine/c_bindings/fluidsimulation_c.cpp
+    src/engine/c_bindings/forcefield_c.cpp
+    src/engine/c_bindings/forcefieldcurve_c.cpp
+    src/engine/c_bindings/forcefieldgrid_c.cpp
+    src/engine/c_bindings/forcefieldpoint_c.cpp
+    src/engine/c_bindings/forcefieldsurface_c.cpp
+    src/engine/c_bindings/forcefieldvolume_c.cpp
+    src/engine/c_bindings/meshfluidsource_c.cpp
+    src/engine/c_bindings/meshobject_c.cpp
+    src/engine/c_bindings/mixbox_c.cpp
+    ${MIXBOX_SOURCE_CPP}
+)
+
+set(SOURCES_ALEMBIC_IO
+    src/alembic_io/src/alembic_io.cpp
+    src/alembic_io/src/c_bindings/alembic_io_c.cpp
+)
+
+set(SOURCES_ALEMBIC_IO_LIBRARY 
+    ${SOURCES_FLUID_ENGINE_LIBRARY} 
+    ${SOURCES_ALEMBIC_IO}
+)
+
 # Configure Output Directories
 set(BLENDER_ADDON_DIR "${CMAKE_BINARY_DIR}/bl_flip_fluids/flip_fluids_addon")
 set_output_directories("${BLENDER_ADDON_DIR}/ffengine/lib")
 
-# Alembic Exporter
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_INSTALL_RPATH "@executable_path")
-
+# Add Alembic Dependency
 if(ALEMBIC_PACKAGE_ROOT)
     message(STATUS "Using ALEMBIC_PACKAGE_ROOT=" ${ALEMBIC_PACKAGE_ROOT})
     find_package(Alembic REQUIRED PATHS ${ALEMBIC_PACKAGE_ROOT} NO_DEFAULT_PATH)
 else()
     find_package(Alembic REQUIRED)
 endif()
 
-file(GLOB ALEMBIC_IO_SOURCES "src/alembic_io/src/*.cpp")
-
-add_library(alembic_io_objects OBJECT ${ALEMBIC_IO_SOURCES})
-set_target_properties(alembic_io_objects PROPERTIES INSTALL_RPATH "@executable_path")
-set_target_properties(alembic_io_objects PROPERTIES BUILD_RPATH "@executable_path")
-target_link_libraries(alembic_io_objects PUBLIC Alembic::Alembic)
-target_compile_features(alembic_io_objects PRIVATE cxx_std_17)
-
-if(MSVC OR MSYS OR MINGW)
-    set(ALEMBIC_EXECUTABLE_NAME "ff_alembic_exporter_windows") 
-elseif(APPLE)
-    set(ALEMBIC_EXECUTABLE_NAME "ff_alembic_exporter_macos") 
-elseif(UNIX AND NOT APPLE)
-    set(ALEMBIC_EXECUTABLE_NAME "ff_alembic_exporter_linux") 
-endif()
-
-add_executable(${ALEMBIC_EXECUTABLE_NAME} $<TARGET_OBJECTS:alembic_io_objects>)
-set_target_properties(${ALEMBIC_EXECUTABLE_NAME} PROPERTIES INSTALL_RPATH "@executable_path")
-set_target_properties(${ALEMBIC_EXECUTABLE_NAME} PROPERTIES BUILD_RPATH "@executable_path")
-target_link_libraries(${ALEMBIC_EXECUTABLE_NAME} PUBLIC Alembic::Alembic)
-
 # Alembic IO Engine Objects
 file(GLOB ALEMBIC_IO_LIBRARY_SOURCES 
         "src/engine/*.cpp" 
         "src/engine/c_bindings/*.cpp"
         "src/alembic_io/src/alembic_io.cpp"
         "src/alembic_io/src/c_bindings/*.cpp" 
-        ${MIXBOX_SOURCE_CPP})
+        ${MIXBOX_SOURCE_CPP}
+        )
 
 add_library(alembic_objects OBJECT ${ALEMBIC_IO_LIBRARY_SOURCES})
-target_link_libraries(alembic_objects PUBLIC Alembic::Alembic)
+target_link_libraries(alembic_objects PRIVATE Alembic::Alembic)
 target_compile_features(alembic_objects PRIVATE cxx_std_17)
 
 # Alembic IO Engine Library
-add_library("ffalembicengine${LIBRARY_SUFFIX}" SHARED $<TARGET_OBJECTS:alembic_objects>)
-target_link_libraries("ffalembicengine${LIBRARY_SUFFIX}" PUBLIC Alembic::Alembic)
+add_library(ffalembicengine SHARED $<TARGET_OBJECTS:alembic_objects>)
+target_link_libraries(ffalembicengine PRIVATE Alembic::Alembic)
 
 # FLIP Fluids Engine Objects
-file(GLOB SOURCES 
-        "src/engine/*.cpp" 
-        "src/engine/c_bindings/*.cpp" 
-        ${MIXBOX_SOURCE_CPP})
-add_library(objects OBJECT ${SOURCES})
+add_library(fluid_engine_objects OBJECT ${SOURCES_FLUID_ENGINE_LIBRARY})
 
 # FLIP Fluids Engine Library
-add_library("ffengine${LIBRARY_SUFFIX}" SHARED $<TARGET_OBJECTS:objects>)
+add_library(ffengine SHARED $<TARGET_OBJECTS:fluid_engine_objects>)
 
 # Copy Libraries To Addon
 file(COPY "${CMAKE_SOURCE_DIR}/src/addon/" DESTINATION "${BLENDER_ADDON_DIR}")

README.md

@@ -11,7 +11,7 @@ Want to try the FLIP Fluids addon before buying the [full marketplace product](h
 
 ### Getting Started
 
-1. **Download** the latest FLIP Fluids Demo: [FLIP_Fluids_addon_1.8.4_demo_(2025-07-14.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v1.8.3/FLIP_Fluids_addon_1.8.3_demo_.2025-07-14.zip)
+1. **Download** the latest FLIP Fluids Demo: [FLIP_Fluids_addon_1.8.5_demo_(2025-11-18.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v1.8.5/FLIP_Fluids_addon_1.8.5_demo_.2025-11-18.zip)
 2. **Install** the FLIP Fluids Demo: [Installation Instructions](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Addon-Installation-and-Uninstallation)
 3. **Get Started** with creating your first FLIP Fluids addon simulation: 
     - [Video Learning Series](https://github.com/rlguy/Blender-FLIP-Fluids/wiki/Video-Learning-Series)

build.py

@@ -23,7 +23,7 @@
 import os, shutil, subprocess, platform, argparse
 
 
-def cmake_make(cmakelists_dir, cmake_path, make_path, alembic_package_root=None, build_debug=False, make_build=True, darwin_arch="", library_suffix=""):
+def cmake_make(cmakelists_dir, cmake_path, make_path, alembic_package_root=None, build_debug=False, make_build=True, darwin_arch=""):
     if build_debug:
         build_debug_flag = "-DBUILD_DEBUG=ON"
     else:
@@ -39,9 +39,6 @@ def cmake_make(cmakelists_dir, cmake_path, make_path, alembic_package_root=None,
     elif system == "Linux":
         cmake_command = [cmake_path, cmakelists_dir, build_debug_flag]
 
-    if library_suffix:
-        cmake_command.append("-DLIBRARY_SUFFIX=" + library_suffix)
-
     if alembic_package_root is not None:
         cmake_command.append("-DALEMBIC_PACKAGE_ROOT=" + alembic_package_root)
 
@@ -82,12 +79,12 @@ def main():
     parser = argparse.ArgumentParser(description="FLIP Fluids Addon build and compile script")
     parser.add_argument("-build-directory", help="Path to destination build directory")
     parser.add_argument("-darwin-arch", help="Target architecture to set for CMAKE_OSX_ARCHITECTURES")
-    parser.add_argument("-library-suffix", help="Specify suffix to add to the generated library name")
     parser.add_argument("-cmake-path", help="Specify path to CMake binary (www.cmake.org)")
     parser.add_argument("-make-path", help="Specify path to GNU Make binary (www.gnu.org/software/make)")
     parser.add_argument("-alembic-path", help="Specify path to Alembic root directory")
     parser.add_argument("-package-imath-library", help="Specify path to Imath library and package with add-on")
     parser.add_argument("-package-alembic-library", help="Specify path to Alembic library and package with add-on")
+    parser.add_argument("-package-dependencies", nargs='*', help="Specify list of dependency filepaths to package with add-on")
     parser.add_argument('--clean', action="store_true", help="Clear generated files in the build directory before building")
     parser.add_argument('-no-compile', action="store_true", help="Do not compile libraries")
     parser.add_argument('-no-zip', action="store_true", help="After building, do not package the add-on folder into a zip for Blender install")
@@ -102,10 +99,6 @@ def main():
     if args.darwin_arch:
         darwin_arch = args.darwin_arch
 
-    library_suffix = ""
-    if args.library_suffix:
-        library_suffix = args.library_suffix
-
     cmake_path = "cmake"
     if args.cmake_path:
         cmake_path = process_path(args.cmake_path)
@@ -134,21 +127,18 @@ def main():
     if args.alembic_path:
         alembic_package_root = process_path(args.alembic_path)
 
-    imath_library_path = None
-    if args.package_imath_library:
-        libpath = process_path(args.package_imath_library)
-        if os.path.isfile(libpath):
-            imath_library_path = libpath
-        else:
-            print("\n***ERROR: Imath library filepath not found:\n\t -package-imath-library <" + libpath + ">***\n")
-
-    alembic_library_path = None
-    if args.package_alembic_library:
-        libpath = process_path(args.package_alembic_library)
-        if os.path.isfile(libpath):
-            alembic_library_path = libpath
-        else:
-            print("\n***ERROR: Alembic library filepath not found:\n\t -package-alembic-library <" + libpath + ">***\n")
+    dependency_filepaths = []
+    if args.package_dependencies:
+        dependency_filepaths = args.package_dependencies
+
+    dependency_error_encountered = False
+    for filepath in dependency_filepaths:
+        libpath = process_path(filepath)
+        if not os.path.isfile(libpath):
+            dependency_error_encountered = True
+            print("***ERROR: Dependency filepath not found <" + libpath + ">")
+    if dependency_error_encountered:
+        return
 
     try:
         original_cwd = os.getcwd()
@@ -166,8 +156,7 @@ def main():
                 alembic_package_root=alembic_package_root,
                 build_debug=False, 
                 make_build=not args.no_compile, 
-                darwin_arch=darwin_arch, 
-                library_suffix=library_suffix)
+                darwin_arch=darwin_arch)
 
         lib_dir = os.path.join(build_dir, "bl_flip_fluids", "flip_fluids_addon", "ffengine", "lib")
         if os.path.isdir(lib_dir):
@@ -187,13 +176,9 @@ def main():
     print("\t<" + addon_dir + ">")
 
     addon_libs_dir = os.path.join(addon_dir, "ffengine", "lib")
-    if imath_library_path is not None:
-        shutil.copy(imath_library_path, addon_libs_dir)
-        print("Packaged <" + imath_library_path + "> to <" + addon_libs_dir + ">")
-
-    if alembic_library_path is not None:
-        shutil.copy(alembic_library_path, addon_libs_dir)
-        print("Packaged <" + alembic_library_path + "> to <" + addon_libs_dir + ">")
+    for filepath in dependency_filepaths:
+        shutil.copy(filepath, addon_libs_dir)
+        print("Packaged <" + filepath + "> to <" + addon_libs_dir + ">")
 
     if not args.no_zip:
         # To create a .zip whose name is ".../flip_fluids_addon.zip".