Browse Source

Formatting

Mario Zechner 6 months ago
parent
commit
42fea00bb0

+ 6 - 6
spine-godot/spine_godot/SpineSkeletonDataResource.cpp

@@ -266,19 +266,19 @@ void SpineSkeletonDataResource::_on_resources_reimported(const PackedStringArray
 	for (int i = 0; i < resources.size(); i++) {
 	for (int i = 0; i < resources.size(); i++) {
 		if (atlas_res.is_valid() && atlas_res->get_path() == resources[i]) {
 		if (atlas_res.is_valid() && atlas_res->get_path() == resources[i]) {
 			print_line("Atlas resource was reimported: " + resources[i]);
 			print_line("Atlas resource was reimported: " + resources[i]);
-			#ifdef SPINE_GODOT_EXTENSION
+#ifdef SPINE_GODOT_EXTENSION
 			atlas_res = ResourceLoader::get_singleton()->load(resources[i], "SpineAtlasResource", ResourceLoader::CACHE_MODE_IGNORE);
 			atlas_res = ResourceLoader::get_singleton()->load(resources[i], "SpineAtlasResource", ResourceLoader::CACHE_MODE_IGNORE);
-			#else
+#else
 			atlas_res = ResourceLoader::load(resources[i], "SpineAtlasResource", ResourceFormatLoader::CACHE_MODE_IGNORE);
 			atlas_res = ResourceLoader::load(resources[i], "SpineAtlasResource", ResourceFormatLoader::CACHE_MODE_IGNORE);
-			#endif
+#endif
 			update_skeleton_data();
 			update_skeleton_data();
 		} else if (skeleton_file_res.is_valid() && skeleton_file_res->get_path() == resources[i]) {
 		} else if (skeleton_file_res.is_valid() && skeleton_file_res->get_path() == resources[i]) {
 			print_line("Skeleton file resource was reimported: " + resources[i]);
 			print_line("Skeleton file resource was reimported: " + resources[i]);
-			#ifdef SPINE_GODOT_EXTENSION
+#ifdef SPINE_GODOT_EXTENSION
 			skeleton_file_res = ResourceLoader::get_singleton()->load(resources[i], "SpineSkeletonFileResource", ResourceLoader::CACHE_MODE_IGNORE);
 			skeleton_file_res = ResourceLoader::get_singleton()->load(resources[i], "SpineSkeletonFileResource", ResourceLoader::CACHE_MODE_IGNORE);
-			#else
+#else
 			skeleton_file_res = ResourceLoader::load(resources[i], "SpineSkeletonFileResource", ResourceFormatLoader::CACHE_MODE_IGNORE);
 			skeleton_file_res = ResourceLoader::load(resources[i], "SpineSkeletonFileResource", ResourceFormatLoader::CACHE_MODE_IGNORE);
-			#endif
+#endif
 			update_skeleton_data();
 			update_skeleton_data();
 		}
 		}
 	}
 	}

+ 2 - 2
spine-godot/spine_godot/SpineSkeletonDataResource.h

@@ -212,9 +212,9 @@ public:
 
 
 #ifdef TOOLS_ENABLED
 #ifdef TOOLS_ENABLED
 #if VERSION_MAJOR > 3
 #if VERSION_MAJOR > 3
-void _on_resources_reimported(const PackedStringArray &resources);
+	void _on_resources_reimported(const PackedStringArray &resources);
 #else
 #else
-void _on_resources_reimported(const PoolStringArray &resources);
+	void _on_resources_reimported(const PoolStringArray &resources);
 #endif
 #endif
 #endif
 #endif
 };
 };

+ 1 - 1
spine-godot/spine_godot/SpineSprite.cpp

@@ -1218,7 +1218,7 @@ void SpineSprite::draw() {
 #if TOOLS_ENABLED
 #if TOOLS_ENABLED
 	float editor_scale = 1.0;
 	float editor_scale = 1.0;
 	if (Engine::get_singleton()->is_editor_hint()) editor_scale = EditorInterface::get_singleton()->get_editor_scale();
 	if (Engine::get_singleton()->is_editor_hint()) editor_scale = EditorInterface::get_singleton()->get_editor_scale();
-	
+
 	float inverse_zoom = 1 / get_viewport()->get_global_canvas_transform().get_scale().x * editor_scale;
 	float inverse_zoom = 1 / get_viewport()->get_global_canvas_transform().get_scale().x * editor_scale;
 	Vector<String> hover_text_lines;
 	Vector<String> hover_text_lines;
 	if (hovered_slot) {
 	if (hovered_slot) {