[godot] Fix static initializers for GDExtension initialization order,…

… fix remaining FIXMEs, except SpineSprite rendering.
EsotericSoftware · Oct 8, 2024 · 687a695 · 687a695
1 parent 0dc8422
commit 687a695
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 87 deletions.
diff --git a/spine-godot/.vscode/settings.json b/spine-godot/.vscode/settings.json
@@ -2,11 +2,17 @@
   "cmake.configureOnOpen": false,
   "C_Cpp.intelliSenseEngine": "default",
   "C_Cpp.default.browse.path": [
+    "${workspaceFolder}/godot-cpp/gen",
     "${workspaceFolder}"
   ],
   "C_Cpp.default.defines": ["TOOLS_ENABLED", "SPINE_GODOT_EXTENSION"],
   "dotnet.defaultSolution": "disable",
   "files.associations": {
-    "*.inc": "cpp"
+    "*.inc": "cpp",
+    "__split_buffer": "cpp",
+    "deque": "cpp",
+    "list": "cpp",
+    "string": "cpp",
+    "vector": "cpp"
   }
 }
diff --git a/spine-godot/spine_godot/SpineAtlasResource.cpp b/spine-godot/spine_godot/SpineAtlasResource.cpp
@@ -148,7 +148,6 @@ class GodotSpineTextureLoader : public spine::TextureLoader {
 		import_image_resource(fixed_path);
 
 #if SPINE_GODOT_EXTENSION
-		// FIXME no error parameter
 		Ref<Texture2D> texture = ResourceLoader::get_singleton()->load(fixed_path, "", ResourceLoader::CACHE_MODE_REUSE);
 #else
 #if VERSION_MAJOR > 3