summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/android_builds.yml2
-rw-r--r--.github/workflows/godot_cpp_test.yml4
-rw-r--r--.github/workflows/ios_builds.yml2
-rw-r--r--.github/workflows/linux_builds.yml4
-rw-r--r--.github/workflows/macos_builds.yml2
-rw-r--r--.github/workflows/static_checks.yml2
-rw-r--r--.github/workflows/web_builds.yml2
-rw-r--r--.github/workflows/windows_builds.yml2
-rw-r--r--modules/navigation/godot_navigation_server.h4
-rw-r--r--modules/text_server_adv/text_server_adv.cpp6
-rw-r--r--modules/text_server_fb/text_server_fb.cpp6
-rw-r--r--scene/resources/animation.cpp24
-rw-r--r--scene/resources/font.cpp12
13 files changed, 34 insertions, 38 deletions
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index afc73a462f..ea97ef023d 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -18,7 +18,7 @@ jobs:
name: Template (target=template_release)
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Set up Java 11
uses: actions/setup-java@v3
diff --git a/.github/workflows/godot_cpp_test.yml b/.github/workflows/godot_cpp_test.yml
index 5384197f37..dccc853550 100644
--- a/.github/workflows/godot_cpp_test.yml
+++ b/.github/workflows/godot_cpp_test.yml
@@ -18,14 +18,14 @@ jobs:
runs-on: "ubuntu-20.04"
name: "Build and test Godot CPP"
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup python and scons
uses: ./.github/actions/godot-deps
# Checkout godot-cpp
- name: Checkout godot-cpp
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
repository: godotengine/godot-cpp
ref: ${{ env.GODOT_CPP_BRANCH }}
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
index 63ecabd957..6557120d87 100644
--- a/.github/workflows/ios_builds.yml
+++ b/.github/workflows/ios_builds.yml
@@ -18,7 +18,7 @@ jobs:
name: Template (target=template_release)
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 01f2404866..fc0db1fbd6 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -85,7 +85,7 @@ jobs:
artifact: true
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
# Need newer mesa for lavapipe to work properly.
- name: Linux dependencies for tests
@@ -111,7 +111,7 @@ jobs:
uses: ./.github/actions/godot-deps
- name: Set up .NET Sdk
- uses: actions/setup-dotnet@v2
+ uses: actions/setup-dotnet@v3
if: ${{ matrix.build-mono }}
with:
dotnet-version: '6.0.x'
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
index ae6f452bc2..1e39aceeb8 100644
--- a/.github/workflows/macos_builds.yml
+++ b/.github/workflows/macos_builds.yml
@@ -33,7 +33,7 @@ jobs:
sconsflags: debug_symbols=no
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
index c096c63f9b..4b7f721a23 100644
--- a/.github/workflows/static_checks.yml
+++ b/.github/workflows/static_checks.yml
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
fetch-depth: 2
diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
index 2ae238caa6..47baf3d065 100644
--- a/.github/workflows/web_builds.yml
+++ b/.github/workflows/web_builds.yml
@@ -20,7 +20,7 @@ jobs:
name: Template (target=template_release)
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Set up Emscripten latest
uses: mymindstorm/setup-emsdk@v12
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index ab62dca5cb..14f2992848 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -38,7 +38,7 @@ jobs:
sconsflags: debug_symbols=no
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Setup Godot build cache
uses: ./.github/actions/godot-cache
diff --git a/modules/navigation/godot_navigation_server.h b/modules/navigation/godot_navigation_server.h
index 40893bada6..c12605bc7a 100644
--- a/modules/navigation/godot_navigation_server.h
+++ b/modules/navigation/godot_navigation_server.h
@@ -56,7 +56,9 @@
void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
class GodotNavigationServer;
+#ifndef _3D_DISABLED
class NavMeshGenerator3D;
+#endif // _3D_DISABLED
struct SetCommand {
virtual ~SetCommand() {}
@@ -80,7 +82,9 @@ class GodotNavigationServer : public NavigationServer3D {
LocalVector<NavMap *> active_maps;
LocalVector<uint32_t> active_maps_update_id;
+#ifndef _3D_DISABLED
NavMeshGenerator3D *navmesh_generator_3d = nullptr;
+#endif // _3D_DISABLED
// Performance Monitor
int pm_region_count = 0;
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp
index cbe48db494..85e98eac76 100644
--- a/modules/text_server_adv/text_server_adv.cpp
+++ b/modules/text_server_adv/text_server_adv.cpp
@@ -2383,10 +2383,8 @@ void TextServerAdvanced::_font_set_variation_coordinates(const RID &p_font_rid,
ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex);
- if (fd->variation_coordinates != p_variation_coordinates) {
- _font_clear_cache(fd);
- fd->variation_coordinates = p_variation_coordinates;
- }
+ _font_clear_cache(fd);
+ fd->variation_coordinates = p_variation_coordinates;
}
Dictionary TextServerAdvanced::_font_get_variation_coordinates(const RID &p_font_rid) const {
diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp
index d0587bf6c0..5d4de7a0d6 100644
--- a/modules/text_server_fb/text_server_fb.cpp
+++ b/modules/text_server_fb/text_server_fb.cpp
@@ -1376,10 +1376,8 @@ void TextServerFallback::_font_set_variation_coordinates(const RID &p_font_rid,
ERR_FAIL_COND(!fd);
MutexLock lock(fd->mutex);
- if (fd->variation_coordinates != p_variation_coordinates) {
- _font_clear_cache(fd);
- fd->variation_coordinates = p_variation_coordinates;
- }
+ _font_clear_cache(fd);
+ fd->variation_coordinates = p_variation_coordinates;
}
Dictionary TextServerFallback::_font_get_variation_coordinates(const RID &p_font_rid) const {
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index 860e48a361..c8e3741383 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -5579,8 +5579,8 @@ Variant Animation::subtract_variant(const Variant &a, const Variant &b) {
Variant Animation::blend_variant(const Variant &a, const Variant &b, float c) {
if (a.get_type() != b.get_type()) {
if (a.is_num() && b.is_num()) {
- real_t va = a;
- real_t vb = b;
+ double va = a;
+ double vb = b;
return va + vb * c;
}
return a;
@@ -5591,7 +5591,7 @@ Variant Animation::blend_variant(const Variant &a, const Variant &b, float c) {
return Variant();
}
case Variant::INT: {
- return int((a.operator int64_t()) + (b.operator int64_t()) * c + 0.5);
+ return int64_t((a.operator int64_t()) + (b.operator int64_t()) * c + 0.5);
}
case Variant::FLOAT: {
return (a.operator double()) + (b.operator double()) * c;
@@ -5664,8 +5664,8 @@ Variant Animation::blend_variant(const Variant &a, const Variant &b, float c) {
Variant Animation::interpolate_variant(const Variant &a, const Variant &b, float c) {
if (a.get_type() != b.get_type()) {
if (a.is_num() && b.is_num()) {
- real_t va = a;
- real_t vb = b;
+ double va = a;
+ double vb = b;
return va + (vb - va) * c;
}
return a;
@@ -5677,11 +5677,11 @@ Variant Animation::interpolate_variant(const Variant &a, const Variant &b, float
}
case Variant::INT: {
const int64_t va = a.operator int64_t();
- return int(va + ((b.operator int64_t()) - va) * c);
+ return int64_t(va + ((b.operator int64_t()) - va) * c);
}
case Variant::FLOAT: {
- const real_t va = a.operator real_t();
- return va + ((b.operator real_t()) - va) * c;
+ const double va = a.operator double();
+ return va + ((b.operator double()) - va) * c;
}
case Variant::VECTOR2: {
return (a.operator Vector2()).lerp(b.operator Vector2(), c);
@@ -5783,7 +5783,7 @@ Variant Animation::interpolate_variant(const Variant &a, const Variant &b, float
case Variant::PACKED_INT32_ARRAY: {
const Vector<int32_t> arr_a = a;
const Vector<int32_t> arr_b = b;
- int32_t sz = arr_a.size();
+ int sz = arr_a.size();
if (sz == 0 || arr_b.size() != sz) {
return a;
} else {
@@ -5795,7 +5795,7 @@ Variant Animation::interpolate_variant(const Variant &a, const Variant &b, float
const int32_t *br = arr_b.ptr();
Variant va;
- for (int32_t i = 0; i < sz; i++) {
+ for (int i = 0; i < sz; i++) {
va = interpolate_variant(ar[i], br[i], c);
vw[i] = va;
}
@@ -5806,7 +5806,7 @@ Variant Animation::interpolate_variant(const Variant &a, const Variant &b, float
case Variant::PACKED_INT64_ARRAY: {
const Vector<int64_t> arr_a = a;
const Vector<int64_t> arr_b = b;
- int64_t sz = arr_a.size();
+ int sz = arr_a.size();
if (sz == 0 || arr_b.size() != sz) {
return a;
} else {
@@ -5818,7 +5818,7 @@ Variant Animation::interpolate_variant(const Variant &a, const Variant &b, float
const int64_t *br = arr_b.ptr();
Variant va;
- for (int64_t i = 0; i < sz; i++) {
+ for (int i = 0; i < sz; i++) {
va = interpolate_variant(ar[i], br[i], c);
vw[i] = va;
}
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index f5edc8d5e9..9d546c90c7 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -2833,10 +2833,8 @@ Ref<Font> FontVariation::_get_base_font_or_default() const {
}
void FontVariation::set_variation_opentype(const Dictionary &p_coords) {
- if (variation.opentype != p_coords) {
- variation.opentype = p_coords;
- _invalidate_rids();
- }
+ variation.opentype = p_coords;
+ _invalidate_rids();
}
Dictionary FontVariation::get_variation_opentype() const {
@@ -2877,10 +2875,8 @@ int FontVariation::get_variation_face_index() const {
}
void FontVariation::set_opentype_features(const Dictionary &p_features) {
- if (opentype_features != p_features) {
- opentype_features = p_features;
- _invalidate_rids();
- }
+ opentype_features = p_features;
+ _invalidate_rids();
}
Dictionary FontVariation::get_opentype_features() const {