v1.0 Release

.github/workflows/benchmark.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - 'master'
+      - 'NewFastSIMD'
     paths-ignore:
       - 'NoiseTool/**'
       - '.github/**'
@@ -36,13 +37,13 @@ jobs:
       uses: actions/checkout@v3            
 
     - name: 'CMake Configure'
-      run: cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=Release -DFASTNOISE2_NOISETOOL=OFF -DFASTNOISE2_TESTS=ON ${{ matrix.cmake_options }}
+      run: cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=Release -DFASTNOISE2_TOOLS=OFF -DFASTNOISE2_TESTS=ON ${{ matrix.cmake_options }}
 
     - name: 'CMake Build'
       run: cmake --build ${{ github.workspace }}/build --config Release --target FastNoiseBenchmark --parallel 4
 
     - name: 'Upload artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.name }}-benchmark-bin
         path: ${{ github.workspace }}/build/Release/bin/
@@ -73,9 +74,3 @@ jobs:
         repository: Auburn/FastNoise2Benchmarking
         event-type: benchmark
         client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "runid": "${{ github.run_id }}", "name": "${{ matrix.name }}", "msg": "${{ steps.message-format.outputs.value }}"}'
-
-  benchmarkbin-complete:
-    runs-on: ubuntu-latest
-    needs: benchmark-matrix
-    steps: 
-      - run: echo benchmarkbin-complete

.github/workflows/main.yml

@@ -5,7 +5,7 @@ name: CI
 on:
   workflow_dispatch:
   push:
-    branches: [master,NewFastSIMD]
+    branches: [master]
   pull_request:
     branches: [master,NewFastSIMD]
   release:
@@ -36,13 +36,11 @@ jobs:
             name: Linux64-Clang
             cmake_options: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
           - os: macos-13
-            target: x86_64-apple-darwin
-            name: MacOSx86_64-Clang
-            cmake_options: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-          - os: macos-14
-            target: aarch64-apple-darwin
-            name: MacOSaarch64-Clang
+            name: MacOS64-Clang
             cmake_options: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+          - os: macos-latest
+            name: MacOSARM64-Clang
+            cmake_options: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
 
     steps:
     - name: 'Install OpenGL & xorg'
@@ -55,20 +53,20 @@ jobs:
       uses: actions/checkout@v3
 
     - name: 'CMake Build Debug'
-      run: cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/debug -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install/FastNoise2" -DFASTNOISE2_NOISETOOL=OFF -DFASTNOISE2_TESTS=OFF ${{ matrix.cmake_options }}
-
+      run: cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/debug -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install/FastNoise2" -DFASTNOISE2_TOOLS=OFF -DFASTNOISE2_TESTS=OFF ${{ matrix.cmake_options }}
+   
     - name: 'CMake Install Debug'
       run: cmake --build ${{ github.workspace }}/debug --config Debug --target install --parallel 4
 
     - name: 'CMake Build Release'
-      run: cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/release -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install/FastNoise2" -DFASTNOISE2_NOISETOOL=ON -DFASTNOISE2_TESTS=ON ${{ matrix.cmake_options }}
-
+      run: cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/release -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install/FastNoise2" -DFASTNOISE2_TOOLS=ON -DFASTNOISE2_TESTS=ON ${{ matrix.cmake_options }}
+   
     - name: 'CMake Install Release'
       run: cmake --build ${{ github.workspace }}/release --config Release --target install --parallel 4
 
     - if: runner.os != 'Windows'
-      run: chmod +x ${{ github.workspace }}/install/FastNoise2/bin/NoiseTool
-
+      run: chmod +x ${{ github.workspace }}/install/FastNoise2/bin/NodeEditor
+    
     - name: 'Upload artifact'
       uses: actions/upload-artifact@v3
       with:
@@ -91,57 +89,3 @@ jobs:
         file: ${{ github.workspace }}/${{ matrix.name }}.zip
         asset_name: FastNoise2-${{ github.event.release.tag_name }}-${{ matrix.name }}.zip
         tag: ${{ github.ref }}
-
-  macos-universal:
-    if: ${{ always() }}
-    needs: [ ci-matrix ]
-    name: macos Universal Build
-    runs-on: macos-latest
-    outputs:
-      matrix: ${{ steps.matrix.outputs.matrix }}
-    steps:
-    - name: 'Download artifact'
-      uses: actions/download-artifact@v3
-      with:
-        name: MacOSaarch64-Clang
-        path: MacOSaarch64-Clang
-    - name: 'Download artifact'
-      uses: actions/download-artifact@v3
-      with:
-        name: MacOSx86_64-Clang
-        path: MacOSx86_64-Clang
-    - name: 'Create Universal Binary'
-      run: |
-        mkdir -p universal/FastNoise2/lib universal/FastNoise2/bin
-        lipo -create \
-          -output universal/FastNoise2/lib/libFastNoise.dylib \
-            MacOSaarch64-Clang/FastNoise2/lib/libFastNoise.dylib \
-            MacOSx86_64-Clang/FastNoise2/lib/libFastNoise.dylib
-        lipo -create \
-          -output universal/FastNoise2/bin/NoiseTool \
-            MacOSaarch64-Clang/FastNoise2/bin/NoiseTool \
-            MacOSx86_64-Clang/FastNoise2/bin/NoiseTool
-        chmod +x universal/FastNoise2/bin/NoiseTool
-
-    - name: 'Upload artifact'
-      uses: actions/upload-artifact@v3
-      with:
-        name: MacOSUniversal-Clang
-        path: ${{ github.workspace }}/universal/
-
-    - name: 'Zip artifacts'
-      if: github.event_name == 'release'
-      uses: papeloto/action-zip@v1
-      with:
-        files: universal/
-        recursive: true
-        dest: MacOSUniversal-Clang.zip
-
-    - name: 'Upload release artifacts'
-      if: github.event_name == 'release'
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: ${{ github.workspace }}/MacOSUniversal-Clang.zip
-        asset_name: FastNoise2-${{ github.event.release.tag_name }}-MacOSUniversal-Clang.zip
-        tag: ${{ github.ref }}

.gitignore

@@ -31,7 +31,9 @@
 *.out
 *.app
 /.vs*
+/.idea
 /out
+/cmake-build*
 /build
 /enc_temp_folder
 /cpm-cache

CMakeLists.txt

@@ -1,35 +1,9 @@
 # CMakeList.txt : CMake project for FastNoise2
 cmake_minimum_required(VERSION 3.7.1)
 
-project(FastNoise2 VERSION 0.10.0)
+project(FastNoise2 VERSION 0.9.4)
 set(CMAKE_CXX_STANDARD 17)
 
-message("FastNoise2 Arch: ${CMAKE_SYSTEM_PROCESSOR}") 
-
-if(CMAKE_SYSTEM_PROCESSOR MATCHES armv7)
-
-    set(FASTSIMD_COMPILE_ARMV7 true)
-    set(FASTSIMD_COMPILE_ARM true)
-    set(FASTSIMD_COMPILE_HAVE_NEON true)
-
-elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
-
-    set(FASTSIMD_COMPILE_AARCH64 true)
-    set(FASTSIMD_COMPILE_ARM true)
-    set(FASTSIMD_COMPILE_HAVE_NEON true)
-
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm64)
-
-    set(FASTSIMD_COMPILE_ARM true)
-    set(FASTSIMD_COMPILE_HAVE_NEON true)
-
-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
-
-    set(FASTSIMD_COMPILE_ARM true)
-
-endif()
-
-
 # determine whether this is a standalone project or included by other projects
 if (NOT DEFINED FASTNOISE2_STANDALONE_PROJECT)
     if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
@@ -42,8 +16,11 @@ endif()
 # Build DLL
 #set(BUILD_SHARED_LIBS ON) 
 
-option(FASTNOISE2_NOISETOOL "Build NoiseTool application" ${FASTNOISE2_STANDALONE_PROJECT})
+option(FASTNOISE2_TOOLS "Build \"Node Editor\" executable" ${FASTNOISE2_STANDALONE_PROJECT})
 option(FASTNOISE2_TESTS "Build tests" OFF)
+option(FASTNOISE2_UTILITY "Build utility tools" OFF)
+
+option(FASTNOISE2_STRICT_FP "Enable strict floating point calculations to ensure output from different SIMD feature sets match EXACTLY" OFF)
 
 if(MSVC)
     #setup pdb target location
@@ -62,18 +39,21 @@ endif()
 include(GNUInstallDirs) 
 set(install_targets "")
 
+include(cmake/CPM.cmake)
 add_subdirectory(src)
 
-if(FASTNOISE2_NOISETOOL)
-    include(cmake/CPM.cmake)
-    add_subdirectory(NoiseTool)
+if(FASTNOISE2_TOOLS)
+    add_subdirectory(tools)
 endif()
 
 if(FASTNOISE2_TESTS)
-    include(cmake/CPM.cmake)  
     add_subdirectory(tests)
 endif()
 
+if(FASTNOISE2_UTILITY)
+    add_subdirectory(util)
+endif()
+
 
 #Install -----------------------------------------------------------
 

CMakePresets.json

@@ -2,8 +2,8 @@
   "version": 3,
   "configurePresets": [
     {
-      "name": "noisetool",
-      "displayName": "NoiseTool",
+      "name": "tools",
+      "displayName": "Tools",
       "generator": "Ninja Multi-Config",
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "installDir": "${sourceDir}/out/install/${presetName}",
@@ -21,9 +21,9 @@
     {
       "name": "minimal",
       "displayName": "Minimal",
-      "inherits": "noisetool",
+      "inherits": "tools",
       "cacheVariables": {
-        "FASTNOISE2_NOISETOOL": {
+        "FASTNOISE2_TOOLS": {
           "value": "False",
           "type": "BOOL"
         },
@@ -36,9 +36,9 @@
     {
       "name": "all",
       "displayName": "All",
-      "inherits": "noisetool",
+      "inherits": "tools",
       "cacheVariables": {
-        "FASTNOISE2_NOISETOOL": {
+        "FASTNOISE2_TOOLS": {
           "value": "True",
           "type": "BOOL"
         },
@@ -51,14 +51,14 @@
   ],
   "buildPresets": [
     {
-      "name": "noisetool-debug",
-      "displayName": "NoiseTool Debug",
-      "configurePreset": "noisetool"
+      "name": "tools-debug",
+      "displayName": "tools Debug",
+      "configurePreset": "tools"
     },
     {
-      "name": "noisetool-release",
-      "displayName": "NoiseTool Release",
-      "configurePreset": "noisetool",
+      "name": "tools-release",
+      "displayName": "tools Release",
+      "configurePreset": "tools",
       "configuration": "Release"
     },
     {