Merge pull request #27 from abeimler/develop

Develop
abeimler · Aug 16, 2024 · 98678f7 · 98678f7
2 parents 087cf9e + a3d8a7d
commit 98678f7
Show file tree

Hide file tree

Showing 53 changed files with 347 additions and 325 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ cpmaddpackage(
   GITHUB_REPOSITORY
   aminya/project_options
   VERSION
-  0.35.1
+  0.36.1
   # GIT_TAG           main
   DOWNLOAD_ONLY)
 if(project_options_ADDED)
@@ -34,7 +34,7 @@ run_vcpkg()
 # Set the project name and language
 project(
   ecs-benchmark
-  VERSION 7.0.0
+  VERSION 7.1.1
   DESCRIPTION "Benchmarks of common ECS (Entity-Component-System)-Frameworks in C++ (or C)"
   HOMEPAGE_URL "https://github.com/abeimler/ecs_benchmark"
   LANGUAGES CXX C)

diff --git a/README.md b/README.md
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -176,4 +176,9 @@ tasks:
   default:
     dir: "{{.PROJECT_DIR}}"
     cmds:
-      - task: test
+      - task: test
+
+  install:gen-benchmark-report:
+    dir: "{{.PROJECT_DIR}}/scripts/gen-benchmark-report"
+    cmds:
+      - pipx run poetry install
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-7.0.0
+7.1.1
diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
@@ -1,5 +1,5 @@
 # https://github.com/cpm-cmake/CPM.cmake
-set(CPM_DOWNLOAD_VERSION 0.38.7)
+set(CPM_DOWNLOAD_VERSION 0.40.2)
 
 if(CPM_SOURCE_CACHE)
   # Expand relative path. This is important if the provided path contains a tilde (~)

diff --git a/img/AddComponent.svg b/img/AddComponent.svg
diff --git a/img/ComplexSystemsUpdate.svg b/img/ComplexSystemsUpdate.svg
diff --git a/img/ComplexSystemsUpdateMixedEntities.svg b/img/ComplexSystemsUpdateMixedEntities.svg
diff --git a/img/CreateEmptyEntities.svg b/img/CreateEmptyEntities.svg
diff --git a/img/CreateEmptyEntitiesInBulk.svg b/img/CreateEmptyEntitiesInBulk.svg
diff --git a/img/CreateEntities.svg b/img/CreateEntities.svg
diff --git a/img/CreateEntitiesInBulk.svg b/img/CreateEntitiesInBulk.svg
diff --git a/img/CreateNoEntities.svg b/img/CreateNoEntities.svg
diff --git a/img/DestroyEntities.svg b/img/DestroyEntities.svg
diff --git a/img/DestroyEntitiesInBulk.svg b/img/DestroyEntitiesInBulk.svg
diff --git a/img/IterateSingleComponent.svg b/img/IterateSingleComponent.svg
diff --git a/img/IterateThreeComponentsWithMixedEntities.svg b/img/IterateThreeComponentsWithMixedEntities.svg
diff --git a/img/IterateTwoComponents.svg b/img/IterateTwoComponents.svg
diff --git a/img/LineAddComponent.svg b/img/LineAddComponent.svg
diff --git a/img/LineComplexSystemsUpdate.svg b/img/LineComplexSystemsUpdate.svg
diff --git a/img/LineComplexSystemsUpdateMixedEntities.svg b/img/LineComplexSystemsUpdateMixedEntities.svg
diff --git a/img/LineCreateEmptyEntities.svg b/img/LineCreateEmptyEntities.svg
diff --git a/img/LineCreateEmptyEntitiesInBulk.svg b/img/LineCreateEmptyEntitiesInBulk.svg
diff --git a/img/LineCreateEntities.svg b/img/LineCreateEntities.svg
diff --git a/img/LineCreateEntitiesInBulk.svg b/img/LineCreateEntitiesInBulk.svg
diff --git a/img/LineCreateNoEntities.svg b/img/LineCreateNoEntities.svg
diff --git a/img/LineDestroyEntities.svg b/img/LineDestroyEntities.svg
diff --git a/img/LineDestroyEntitiesInBulk.svg b/img/LineDestroyEntitiesInBulk.svg
diff --git a/img/LineIterateSingleComponent.svg b/img/LineIterateSingleComponent.svg
diff --git a/img/LineIterateThreeComponentsWithMixedEntities.svg b/img/LineIterateThreeComponentsWithMixedEntities.svg
diff --git a/img/LineIterateTwoComponents.svg b/img/LineIterateTwoComponents.svg
diff --git a/img/LinePublishAndUpdateEvents.svg b/img/LinePublishAndUpdateEvents.svg
diff --git a/img/LineRemoveAddComponent.svg b/img/LineRemoveAddComponent.svg
diff --git a/img/LineSystemsUpdate.svg b/img/LineSystemsUpdate.svg
diff --git a/img/LineSystemsUpdateMixedEntities.svg b/img/LineSystemsUpdateMixedEntities.svg
diff --git a/img/LineUnpackNoComponent.svg b/img/LineUnpackNoComponent.svg
diff --git a/img/LineUnpackOneComponent.svg b/img/LineUnpackOneComponent.svg
diff --git a/img/LineUnpackThreeComponents.svg b/img/LineUnpackThreeComponents.svg
diff --git a/img/LineUnpackTwoComponents.svg b/img/LineUnpackTwoComponents.svg
diff --git a/img/PublishAndUpdateEvents.svg b/img/PublishAndUpdateEvents.svg
diff --git a/img/RemoveAddComponent.svg b/img/RemoveAddComponent.svg
diff --git a/img/SystemsUpdate.svg b/img/SystemsUpdate.svg
diff --git a/img/SystemsUpdateMixedEntities.svg b/img/SystemsUpdateMixedEntities.svg
diff --git a/img/UnpackNoComponent.svg b/img/UnpackNoComponent.svg
diff --git a/img/UnpackOneComponent.svg b/img/UnpackOneComponent.svg
diff --git a/img/UnpackThreeComponents.svg b/img/UnpackThreeComponents.svg
diff --git a/img/UnpackTwoComponents.svg b/img/UnpackTwoComponents.svg
diff --git a/plot.config.json b/plot.config.json
@@ -577,15 +577,15 @@
       "name": "Flecs",
       "author": "@SanderMertens",
       "description": "Flecs is a fast and lightweight Entity Component System that lets you build games and simulations with millions of entities.",
-      "version": "v4.0.0",
+      "version": "v4.0.1",
       "link": "https://github.com/SanderMertens/flecs",
       "color": "#ff3300"
     },
     "flecs (emit)": {
       "name": "Flecs (emit)",
       "author": "@SanderMertens",
       "description": "Flecs is a fast and lightweight Entity Component System that lets you build games and simulations with millions of entities.",
-      "version": "v4.0.0",
+      "version": "v4.0.1",
       "link": "https://github.com/SanderMertens/flecs",
       "skip_candidate": true,
       "color": "#ff6c47"

diff --git a/scripts/gen-benchmark-report/poetry.lock b/scripts/gen-benchmark-report/poetry.lock
diff --git a/scripts/gen-benchmark-report/pyproject.toml b/scripts/gen-benchmark-report/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gen-benchmark-report"
-version = "1.1.0"
+version = "1.1.1"
 description = "Generate benchmarks graphs and RESULTS.md with benchmark results"
 authors = ["Alex Beimler <[email protected]>"]
 license = "MIT"
@@ -10,13 +10,13 @@ homepage = "https://github.com/abeimler/ecs_benchmark/tree/master/scripts/gen-be
 [tool.poetry.dependencies]
 python = "^3.9"
 docopt = "^0.6.2"
-pandas = "^1.5.2"
+pandas = "^1.5.3"
 psutil = "^5.9.8"
 pystache = "^0.6.5"
 pynput = "^1.7.6"
 QtPy = "^1.11.3"
-black = "^22.3.0"
-plotly = "^5.19.0"
+black = "^24.3.0"
+plotly = "^5.20.0"
 tabulate = "^0.9.0"
 kaleido = "==0.2.1"
 numpy = "^1.26.4"

diff --git a/scripts/gen-benchmark-report/requirements.txt b/scripts/gen-benchmark-report/requirements.txt
@@ -1,10 +1,10 @@
 docopt==0.6.2
-pandas==1.5.2
+pandas==1.5.3
 psutil==5.8.0
 pystache==0.6.0
 pynput==1.6.8
 QtPy==1.11.3
-black==22.3.0
-plotly==5.11.0
+black==24.3.0
+plotly==5.20.0
 tabulate==0.9.0
 kaleido==0.2.1
diff --git a/src/flecs/CMakeLists.txt b/src/flecs/CMakeLists.txt
@@ -3,7 +3,7 @@ cpmaddpackage(
   NAME
   flecs
   VERSION
-  4.0.0
+  4.0.1
   GITHUB_REPOSITORY
   SanderMertens/flecs
   OPTIONS

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "ecs-benchmark",
-  "version-string": "7.0.0",
+  "version-string": "7.1.1",
   "description": "Benchmarks of common ECS (Entity-Component-System)-Frameworks in C++ (or C)",
   "dependencies": [
     "benchmark",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ cpmaddpackage( @@
       NAME
       flecs
       VERSION
-.0.0
+.0.1
       GITHUB_REPOSITORY
       SanderMertens/flecs
       OPTIONS
@@ Expand Down @@