new demo version 1.8.4!

Author: rlguy

.gitignore

@@ -1,8 +1,6 @@
-src/engine/kernels/kernels.cpp
 src/engine/versionutils.cpp
 src/addon/__init__.py
 src/addon/blender_manifest.toml
 src/addon/utils/installation_utils.py
-CMakeLists.txt
-build
+/build
 .DS_Store

cmake/CMakeLists.txt CMakeLists.txtcmake/CMakeLists.txt renamed to CMakeLists.txt

@@ -1,4 +1,6 @@
 #[[
+MIT License
+
 Copyright (C) 2025 Ryan L. Guy & Dennis Fassbaender
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -20,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)
+cmake_minimum_required(VERSION 3.5...4.0.2)
 
 function(set_output_directories DIR)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${DIR} PARENT_SCOPE)
@@ -31,30 +33,29 @@ function(set_output_directories DIR)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${DIR} PARENT_SCOPE)
 endfunction(set_output_directories)
 
-set(BUILD_DEBUG OFF CACHE BOOL "Turn on to build a debug release")
+include(CheckLinkerFlag)
 
-# Disable distribute source (ON -> OFF) to speed up build. Remember to
-# turn back on before distribution!
+# Build Options
+set(BUILD_DEBUG OFF CACHE BOOL "Turn on to build a debug release")
 option(DISTRIBUTE_SOURCE "Include source code in addon" ON)
-
-option(WITH_OPENCL "Compile project with OpenCL features" OFF)
-option(WITH_ENGINE_TEST "Compile engine test executable" OFF)
-option(WITH_PYFLUID_MODULE "Compile pyfluid Python module" OFF)
 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")
-
-if(APPLE)
-    set(MACOSX_DEPLOYMENT_TARGET 10.10)
-endif()
+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 0)
+set(FLUIDENGINE_VERSION_MAJOR 1)
 set(FLUIDENGINE_VERSION_MINOR 8)
-set(FLUIDENGINE_VERSION_REVISION 3)
-set(FLUIDENGINE_VERSION_DATE "21-MAR-2025")
+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")
@@ -64,11 +65,10 @@ else()
     set(FLUIDENGINE_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}")
-#if(BUILD_DEBUG)
-#    set(FLUIDENGINE_VERSION_LABEL "${FLUIDENGINE_VERSION_LABEL} (DEBUG BUILD)") 
-#endif()
 
+# Begin Build
 message(STATUS "FLIP Fluids version ${FLUIDENGINE_VERSION_LABEL}")
 if(BUILD_DEBUG)
     message(STATUS "Building in debug mode")
@@ -87,54 +87,45 @@ else()
     set(MIXBOX_SOURCE_CPP "src/engine/mixbox/mixbox_stub.cpp")
 endif()
 
-# Configure OpenCL
-if(WITH_OPENCL)
-    find_package(OpenCL)
-    if(NOT OpenCL_FOUND)
-        message(WARNING "WARNING: OpenCL was not found on your system.\nInstall an OpenCL SDK specific to your GPU vender (AMD, NVIDIA, Intel, etc.). This project will be built with OpenCL features disabled.")
-        set(WITH_OPENCL OFF)
-    endif()
-endif()
-
-if(WITH_OPENCL)
-    if(MSVC OR MINGW)
-        # Set to OpenCL ICD loader instead of vendor library
-        set(OpenCL_LIBRARY "C:/Windows/System32/OpenCL.dll")
-    endif()
-
-    # Allows use os clCreateCommandQueue in OpenCL versions >= 2.0
-    add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_2_APIS)
-
-    add_definitions(-DWITH_OPENCL=1)
-    include_directories(src ${OpenCL_INCLUDE_DIRS})
-else()
-    add_definitions(-DWITH_OPENCL=0)
-endif()
-
-# Configure compiler/OS specific flags
+# Configure Compiler/OS Specific Flags
 if(MSVC)
     message(FATAL_ERROR "Error: Compilation using MSVC (Microsoft Visual Studio) is not supported. Building with MSVC will result in errors, performance issues, and broken simulation features. Change this FATAL_ERROR to WARNING in the CMake script to continue at your own risk.")
-    add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /W4 /EHsc /wd4244")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE")
 elseif(MINGW)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -static-libgcc -static-libstdc++ -fopenmp -O3 -std=c++11 -Wall")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -static-libgcc -static-libstdc++ -fopenmp -O3 -std=c++17 -Wall")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--enable-stdcall-fixup")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--enable-stdcall-fixup")
 elseif(APPLE)
     set(CMAKE_MACOSX_RPATH ON)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -std=c++11 -Wall -Wno-return-type-c-linkage")
-else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -fopenmp -O3 -std=c++11 -Wall -fPIC -pthread")
+    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
+    check_linker_flag(CXX "-lstdc++fs" LINKER_SUPPORTS_FILESYSTEM)
+    if(LINKER_SUPPORTS_FILESYSTEM)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lstdc++fs")
+    endif()
+elseif(UNIX AND NOT APPLE)
+    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()
+    message(FATAL_ERROR "Target OS/Compiler is not recognized.")
 endif()
 
 if(BUILD_DEBUG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBUILD_DEBUG")
 endif()
 
-# Configure Version
+# Write Compiler Info
+set(COMPILER_DATA_DIRECTORY "${CMAKE_BINARY_DIR}/bl_flip_fluids/flip_fluids_addon/resources/compiler_data/")
+set(COMPILER_DATA_FILENAME "${CMAKE_SYSTEM_NAME}_${CMAKE_CXX_COMPILER_ID}_${CMAKE_CXX_COMPILER_VERSION}.txt")
+string(TIMESTAMP COMPILER_TIMSTAMP "%Y-%m-%d %H:%M:%S %z")
+set(COMPILER_INFO "${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_COMPILER_IS_GNUCXX} ${COMPILER_TIMSTAMP}")
+file(WRITE "${COMPILER_DATA_DIRECTORY}/${COMPILER_DATA_FILENAME}" "${COMPILER_INFO}")
+
+# Configure Files
 configure_file(
   "${PROJECT_SOURCE_DIR}/src/engine/versionutils.cpp.in"
   "${PROJECT_SOURCE_DIR}/src/engine/versionutils.cpp"
@@ -152,74 +143,87 @@ configure_file(
   "${PROJECT_SOURCE_DIR}/src/addon/utils/installation_utils.py"
 )
 
-# Generate kernels.cpp
-file(READ "src/engine/kernels/trilinearinterpolate.cl" TRILINEAR_INTERPOLATE_KERNEL_STRING)
-file(READ "src/engine/kernels/scalarfield.cl" SCALAR_FIELD_KERNEL_STRING)
-configure_file(
-  "${PROJECT_SOURCE_DIR}/src/engine/kernels/kernels.cpp.in"
-  "${PROJECT_SOURCE_DIR}/src/engine/kernels/kernels.cpp"
-)
+# Configure Output Directories
+set(BLENDER_ADDON_DIR "${CMAKE_BINARY_DIR}/bl_flip_fluids/flip_fluids_addon")
+set_output_directories("${BLENDER_ADDON_DIR}/ffengine/lib")
 
-# Object library
-file(GLOB SOURCES "src/engine/*.cpp" "src/engine/c_bindings/*.cpp" "src/engine/kernels/*.cpp" "src/engine/opencl_bindings/*.cpp" ${MIXBOX_SOURCE_CPP})
-add_library(objects OBJECT ${SOURCES})
+# Alembic Exporter
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(CMAKE_INSTALL_RPATH "@executable_path")
 
-if(WITH_ENGINE_TEST)
-    # Test executable
-    set(TEST_DIR "${CMAKE_BINARY_DIR}/bl_flip_fluids/test")
-    set_output_directories("${TEST_DIR}")
-    add_executable(bl_flip_fluids $<TARGET_OBJECTS:objects>)
-    set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "engine_test")
-    if(WITH_OPENCL)
-        target_link_libraries(bl_flip_fluids "${OpenCL_LIBRARY}")
-    endif()
+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()
 
-if(WITH_PYFLUID_MODULE)
-    # Pyfluid library
-    set(PYTHON_MODULE_DIR "${CMAKE_BINARY_DIR}/bl_flip_fluids/pyfluid")
-    set(PYTHON_MODULE_LIB_DIR "${CMAKE_BINARY_DIR}/bl_flip_fluids/pyfluid/lib")
-    set_output_directories("${PYTHON_MODULE_LIB_DIR}")
-    add_library(pyfluid SHARED $<TARGET_OBJECTS:objects>)
-    if(WITH_OPENCL) 
-        target_link_libraries(pyfluid "${OpenCL_LIBRARY}")
-    endif()
-    file(COPY "${CMAKE_SOURCE_DIR}/src/engine/pyfluid/" DESTINATION "${PYTHON_MODULE_DIR}")
-endif()
+file(GLOB ALEMBIC_IO_SOURCES "src/alembic_io/src/*.cpp")
 
-# Blender addon
-set(BLENDER_ADDON_DIR "${CMAKE_BINARY_DIR}/bl_flip_fluids/flip_fluids_addon")
-set_output_directories("${BLENDER_ADDON_DIR}/pyfluid/lib")
-if(BUILD_DEBUG)
-    add_library("blpyfluiddebug${LIBRARY_SUFFIX}" SHARED $<TARGET_OBJECTS:objects>)
-else()
-    add_library("blpyfluidrelease${LIBRARY_SUFFIX}" SHARED $<TARGET_OBJECTS:objects>)
-endif()
+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(WITH_OPENCL) 
-    if(BUILD_DEBUG)
-        target_link_libraries("blpyfluiddebug${LIBRARY_SUFFIX}" "${OpenCL_LIBRARY}")
-    else()
-        target_link_libraries("blpyfluidrelease${LIBRARY_SUFFIX}" "${OpenCL_LIBRARY}")
-    endif()
+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})
+
+add_library(alembic_objects OBJECT ${ALEMBIC_IO_LIBRARY_SOURCES})
+target_link_libraries(alembic_objects PUBLIC 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)
+
+# FLIP Fluids Engine Objects
+file(GLOB SOURCES 
+        "src/engine/*.cpp" 
+        "src/engine/c_bindings/*.cpp" 
+        ${MIXBOX_SOURCE_CPP})
+add_library(objects OBJECT ${SOURCES})
+
+# FLIP Fluids Engine Library
+add_library("ffengine${LIBRARY_SUFFIX}" SHARED $<TARGET_OBJECTS:objects>)
+
+# Copy Libraries To Addon
 file(COPY "${CMAKE_SOURCE_DIR}/src/addon/" DESTINATION "${BLENDER_ADDON_DIR}")
-file(COPY "${CMAKE_SOURCE_DIR}/src/engine/pyfluid/" DESTINATION "${BLENDER_ADDON_DIR}/pyfluid")
+file(COPY "${CMAKE_SOURCE_DIR}/src/engine/ffengine/" DESTINATION "${BLENDER_ADDON_DIR}/ffengine")
 
+# Package Sources
 if(DISTRIBUTE_SOURCE)
     set(SOURCES_ARCHIVE_ROOT
+        "${CMAKE_SOURCE_DIR}/.gitignore"
         "${CMAKE_SOURCE_DIR}/__init__.py"
         "${CMAKE_SOURCE_DIR}/build.py"
-        "${CMAKE_SOURCE_DIR}/.gitignore"
+        "${CMAKE_SOURCE_DIR}/CMakeLists.txt"
         "${CMAKE_SOURCE_DIR}/LICENSE_GPLv3.md"
         "${CMAKE_SOURCE_DIR}/LICENSE_MIT.md"
         "${CMAKE_SOURCE_DIR}/LICENSE_Standard_Royalty_Free.md"
         "${CMAKE_SOURCE_DIR}/README.md"
     )
 
-    file(GLOB_RECURSE SOURCES_ARCHIVE "${CMAKE_SOURCE_DIR}/src/*" "${CMAKE_SOURCE_DIR}/cmake/*")
+    file(GLOB_RECURSE SOURCES_ARCHIVE "${CMAKE_SOURCE_DIR}/src/*")
     list (APPEND SOURCES_ARCHIVE ${SOURCES_ARCHIVE_ROOT})
     file(MAKE_DIRECTORY ${BLENDER_ADDON_DIR}/source)
     file(ARCHIVE_CREATE OUTPUT "${BLENDER_ADDON_DIR}/source/flip_fluids_addon_source.zip" PATHS ${SOURCES_ARCHIVE} FORMAT "zip")
-endif()
+endif()

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_0.8.3_demo_(21_mar_2025.zip)](https://github.com/rlguy/Blender-FLIP-Fluids/releases/download/v0.8.3/FLIP_Fluids_addon_0.8.3_demo_.21_mar_2025.zip)
+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)
 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)
@@ -20,4 +20,4 @@ Want to try the FLIP Fluids addon before buying the [full marketplace product](h
 
 ### 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, or join the [FLIP Fluids Discord server](https://discord.gg/FLIPFluids). 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!

__init__.py

@@ -57,8 +57,8 @@ def draw(self, context):
             ).url = "https://github.com/rlguy/Blender-FLIP-Fluids/wiki/FLIP-Fluids-Demo-Addon"
         column.operator(
                 "wm.url_open", 
-                text="Purchase the FLIP Fluids addon on the Blender Market", 
-            ).url = "https://blendermarket.com/products/flipfluids?ref=2685"
+                text="Purchase the FLIP Fluids addon on Superhive", 
+            ).url = "https://superhivemarket.com/products/flipfluids?ref=2685"
         column.operator(
                 "wm.url_open", 
                 text="Purchase the FLIP Fluids addon on Gumroad",