upd

fabriceci · Oct 24, 2023 · 4afbb40 · 4afbb40
1 parent ee2c41c
commit 4afbb40
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [x86_64] # Todo reenable arm64
-        precision: [single, double]
+        precision: [single]#, double]
         features: [simd-stable, simd-nightly, parallel, enhanced-determinism]
 
     steps:
@@ -28,7 +28,7 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: Build ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Build ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/build
         with:
           sconsflags: ${{ env.SCONSFLAGS }}
@@ -38,7 +38,7 @@ jobs:
           precision: ${{ matrix.precision }}
           features: ${{ matrix.features }}
 
-      - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Upload ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/upload
         with:
           precision: ${{ matrix.precision }}

diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
@@ -16,13 +16,13 @@ jobs:
         target: [template_debug, template_release]
         arch: [arm64]
         precision: [single, double]
-        features: [simd-stable, simd-nightly, parallel, enhanced-determinism]
+        features: [simd-stable], simd-nightly, parallel, enhanced-determinism]
 
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - name: Build ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Build ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/build
         with:
           sconsflags: ${{ env.SCONSFLAGS }}
@@ -32,7 +32,7 @@ jobs:
           precision: ${{ matrix.precision }}
           features: ${{ matrix.features }}
 
-      - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Upload ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/upload
         with:
           precision: ${{ matrix.precision }}

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           submodules: true
 
-      - name: Build ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Build ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/build
         with:
           sconsflags: ${{ env.SCONSFLAGS }}
@@ -33,7 +33,7 @@ jobs:
           precision: ${{ matrix.precision }}
           features: ${{ matrix.features }}
 
-      - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Upload ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/upload
         with:
           precision: ${{ matrix.precision }}

diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           submodules: true
 
-      - name: Build ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Build ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/build
         with:
           sconsflags: ${{ env.SCONSFLAGS }}
@@ -35,7 +35,7 @@ jobs:
           precision: ${{ matrix.precision }}
           features: ${{ matrix.features }}
 
-      - name: Sign frameworks
+      - name: Sign frameworks ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         shell: pwsh
         env:
           APPLE_CERT_BASE64: ${{ secrets.PROD_MACOS_CERTIFICATE }}
@@ -47,7 +47,7 @@ jobs:
         run: ./scripts/ci-sign-macos.ps1 bin/addons/godot-rapier2d/bin/libphysics_server_rapier2d.macos.${{ matrix.target }}.framework
         if: ${{ env.APPLE_DEV_ID }}
 
-      - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Upload ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/upload
         with:
           precision: ${{ matrix.precision }}

diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
@@ -35,7 +35,7 @@ jobs:
         run: |
           emcc -v
 
-      - name: Build ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Build ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/build
         with:
           sconsflags: ${{ env.SCONSFLAGS }}
@@ -45,7 +45,7 @@ jobs:
           precision: ${{ matrix.precision }}
           features: ${{ matrix.features }}
 
-      - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Upload ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/upload
         with:
           precision: ${{ matrix.precision }}

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup MSVC problem matcher
         uses: ammaraskar/msvc-problem-matcher@master
 
-      - name: Build ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Build ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/build
         with:
           sconsflags: ${{ env.SCONSFLAGS }}
@@ -35,7 +35,7 @@ jobs:
           precision: ${{ matrix.precision }}
           features: ${{ matrix.features }}
 
-      - name: Upload ${{ matrix.target }} ${{ matrix.arch }}
+      - name: Upload ${{ matrix.target }} ${{ matrix.arch }} ${{ matrix.precision }} ${{ matrix.features }}
         uses: ./.github/actions/upload
         with:
           precision: ${{ matrix.precision }}

diff --git a/SConstruct b/SConstruct
@@ -22,7 +22,6 @@ env.Append(LIBS=[lib])
 ## Sources
 env.Append(CPPPATH=["src/"])
 sources = [Glob("src/*.cpp"),Glob("src/bodies/*.cpp"),Glob("src/joints/*.cpp"),Glob("src/servers/*.cpp"),Glob("src/shapes/*.cpp"),Glob("src/spaces/*.cpp")]
-#sources = Glob("src/*.cpp")
 
 if env["platform"] == "windows":
     env.Append(CPPDEFINES="WINDOWS_ENABLED")

diff --git a/src/bodies/rapier_body_2d.cpp b/src/bodies/rapier_body_2d.cpp
@@ -1,7 +1,7 @@
 #include "rapier_body_2d.h"
 
 #include "../spaces/rapier_space_2d.h"
-#include "rapier_body_direct_state_2d.h"
+#include "rapier_direct_body_state_2d.h"
 
 void RapierBody2D::_mass_properties_changed() {
 	if (!get_space()) {

diff --git a/src/bodies/rapier_body_direct_state_2d.cpp → src/bodies/rapier_direct_body_state_2d.cpp b/src/bodies/rapier_body_direct_state_2d.cpp → src/bodies/rapier_direct_body_state_2d.cpp
@@ -1,4 +1,4 @@
-#include "rapier_body_direct_state_2d.h"
+#include "rapier_direct_body_state_2d.h"
 
 #include "../servers/rapier_physics_server_2d.h"
 #include "../spaces/rapier_direct_space_state_2d.h"

diff --git a/src/bodies/rapier_body_direct_state_2d.h → src/bodies/rapier_direct_body_state_2d.h b/src/bodies/rapier_body_direct_state_2d.h → src/bodies/rapier_direct_body_state_2d.h
@@ -1,5 +1,5 @@
-#ifndef RAPIER_BODY_DIRECT_STATE_2D_H
-#define RAPIER_BODY_DIRECT_STATE_2D_H
+#ifndef RAPIER_DIRECT_BODY_STATE_2D_H
+#define RAPIER_DIRECT_BODY_STATE_2D_H
 
 #include <godot_cpp/classes/physics_direct_body_state2d.hpp>
 #include <godot_cpp/classes/physics_direct_body_state2d_extension.hpp>
@@ -78,4 +78,4 @@ class RapierDirectBodyState2D : public PhysicsDirectBodyState2DExtension {
 	virtual double _get_step() const override;
 };
 
-#endif // RAPIER_BODY_DIRECT_STATE_2D_H
+#endif // RAPIER_DIRECT_BODY_STATE_2D_H
diff --git a/src/register_types.cpp b/src/register_types.cpp
@@ -8,7 +8,7 @@
 #include <godot_cpp/godot.hpp>
 #include <godot_cpp/variant/callable.hpp>
 
-#include "bodies/rapier_body_direct_state_2d.h"
+#include "bodies/rapier_direct_body_state_2d.h"
 #include "servers/rapier_physics_server_2d.h"
 #include "servers/rapier_project_settings.h"
 #include "spaces/rapier_direct_space_state_2d.h"

diff --git a/src/servers/rapier_physics_server_2d.cpp b/src/servers/rapier_physics_server_2d.cpp
@@ -1,6 +1,6 @@
 #include "rapier_physics_server_2d.h"
 
-#include "../bodies/rapier_body_direct_state_2d.h"
+#include "../bodies/rapier_direct_body_state_2d.h"
 
 #include "../spaces/rapier_direct_space_state_2d.h"