Fixes for android, macos (hopefully)

TokisanGames · Aug 30, 2023 · 5bf8018 · 5bf8018
1 parent 8072631
commit 5bf8018
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,10 +7,9 @@ project/_export/
 project/tests/
 patches/
 
-# Godot-specific ignores (script cache see godot issue #75388)
+# Godot-specific ignores
 /project/.import/
-/project/.godot/*
-!/project/.godot/global_script_class_cache.cfg
+/project/.godot/
 export.cfg
 export_presets.cfg
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -5,3 +5,4 @@ The creation of this plugin is thanks to the following contributors.
 * Roope Palmroos @outobugi
 * Cory Petkovsek @TokisanGames 
 * Loïc Chen (陳明佑) @painfulexistence
+* Lorenz Wildberg @lw64
diff --git a/project/addons/terrain_3d/terrain.gdextension b/project/addons/terrain_3d/terrain.gdextension
@@ -18,5 +18,5 @@ linux.release.rv64 = "bin/libterrain.linux.release.rv64.so"
 macos.debug = "bin/libterrain.macos.debug.framework"
 macos.release = "bin/libterrain.macos.release.framework"
 
-android.debug.arm64 = "libterrain.android.debug.arm64.so"
-android.release.arm64 = "libterrain.android.release.arm64.so"
+android.debug.arm64 = "bin/libterrain.android.debug.arm64.so"
+android.release.arm64 = "bin/libterrain.android.release.arm64.so"
diff --git a/src/terrain_3d_storage.cpp b/src/terrain_3d_storage.cpp
@@ -1595,6 +1595,7 @@ void Terrain3DStorage::_bind_methods() {
  //BIND_ENUM_CONSTANT(SIZE_2048);
 
  BIND_CONSTANT(REGION_MAP_SIZE);
+ BIND_CONSTANT(SURFACE_MAX_SIZE);
 
  ClassDB::bind_method(D_METHOD("set_region_size", "size"), &Terrain3DStorage::set_region_size);
  ClassDB::bind_method(D_METHOD("get_region_size"), &Terrain3DStorage::get_region_size);

diff --git a/src/terrain_3d_storage.h b/src/terrain_3d_storage.h
@@ -62,7 +62,6 @@ class Terrain3DStorage : public Resource {
 
  static const int REGION_MAP_SIZE = 16;
  static inline const Vector2i REGION_MAP_VSIZE = Vector2i(REGION_MAP_SIZE, REGION_MAP_SIZE);
-
  static const int SURFACE_MAX_SIZE = 32;
 
  class Generated {