UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up

Browse Source
This commit is contained in:
Mario Zechner 2021-10-01 13:03:37 +02:00
parent 5ec5544132
commit 48bdebcab4
15 changed files with 68 additions and 8840 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8699
spine-godot/example/spineboy-pro.spjson
View File

File diff suppressed because it is too large Load Diff

14
spine-godot/example/spineboy.atlas.import
View File

@ -1,14 +0,0 @@
[remap]
importer="spine.atlas"
type="SpineAtlasResource"
path="res://.import/spineboy.atlas-ce2b95e2abaaca5faa7726fe317501ea.spatlas"
[deps]
source_file="res://spineboy.atlas"
dest_files=[ "res://.import/spineboy.atlas-ce2b95e2abaaca5faa7726fe317501ea.spatlas" ]
[params]
normal_texture_prefix=""

17
spine-godot/example/spineboy.gd
View File

@ -1,17 +0,0 @@
extends SpineSprite
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
self.get_animation_state().set_animation("walk", true, 0)
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass

10
spine-godot/example/spineboy.tres
View File

@ -1,10 +0,0 @@
[gd_resource type="SpineSkeletonDataResource" load_steps=3 format=2]
[ext_resource path="res://spineboy.atlas" type="SpineAtlasResource" id=1]
[ext_resource path="res://spineboy-pro.spjson" type="SpineSkeletonJsonDataResource" id=2]
[resource]
atlas_res = ExtResource( 1 )
skeleton_json_res = ExtResource( 2 )
animations = null
skins = null

0
spine-godot/example/spineboy.atlas → spine-godot/example/spineboy/spineboy.atlas
View File

14
spine-godot/example/spineboy/spineboy.atlas.import Normal file
View File

@ -0,0 +1,14 @@
[remap]
importer="spine.atlas"
type="SpineAtlasResource"
path="res://.import/spineboy.atlas-0160ebf51649da264b83de15c13561f4.spatlas"
[deps]
source_file="res://spineboy/spineboy.atlas"
dest_files=[ "res://.import/spineboy.atlas-0160ebf51649da264b83de15c13561f4.spatlas" ]
[params]
normal_texture_prefix="n"

0
spine-godot/example/spineboy.png → spine-godot/example/spineboy/spineboy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 243 KiB

6
spine-godot/example/spineboy.png.import → spine-godot/example/spineboy/spineboy.png.import
View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/spineboy.png-846f399ad53ae6f7ed8bbfe03f0b1f88.stex" path="res://.import/spineboy.png-a63588ec3a5ca6e83ef256edf38d798a.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://spineboy.png" source_file="res://spineboy/spineboy.png"
dest_files=[ "res://.import/spineboy.png-846f399ad53ae6f7ed8bbfe03f0b1f88.stex" ] dest_files=[ "res://.import/spineboy.png-a63588ec3a5ca6e83ef256edf38d798a.stex" ]
[params] [params]

7
spine-godot/example/spineboyanimdata.tres
View File

@ -1,7 +0,0 @@
[gd_resource type="SpineAnimationStateDataResource" load_steps=2 format=2]
[ext_resource path="res://spineboy.tres" type="SpineSkeletonDataResource" id=1]
[resource]
skeleton = ExtResource( 1 )
default_mix = 1.0

11
spine-godot/example/test.tscn
View File

@ -1,13 +1,4 @@
[gd_scene load_steps=3 format=2] [gd_scene format=2]
[ext_resource path="res://spineboy.gd" type="Script" id=1]
[ext_resource path="res://spineboyanimdata.tres" type="SpineAnimationStateDataResource" id=2]
[node name="Node2D" type="Node2D"] [node name="Node2D" type="Node2D"]
position = Vector2( 2.12469, 1.06235 ) position = Vector2( 2.12469, 1.06235 )
[node name="SpineSprite" type="SpineSprite" parent="."]
position = Vector2( 503.556, 465.311 )
scale = Vector2( 0.5, 0.5 )
animation_state_data_res = ExtResource( 2 )
script = ExtResource( 1 )

110
spine-godot/spine_godot/SpineAtlasResource.cpp
View File

@ -35,15 +35,15 @@
class GodotSpineTextureLoader : public spine::TextureLoader { class GodotSpineTextureLoader : public spine::TextureLoader {
private: private:
Array *textures, *normal_maps; Array *textures, *normal_maps;
String normal_maps_prefix; String normal_map_prefix;
public: public:
GodotSpineTextureLoader(Array *t, Array *nt, const String &p) : textures(t), normal_maps(nt), normal_maps_prefix(p) { GodotSpineTextureLoader(Array *t, Array *nt, const String &p) : textures(t), normal_maps(nt), normal_map_prefix(p) {
if (textures) textures->clear(); if (textures) textures->clear();
if (normal_maps) normal_maps->clear(); if (normal_maps) normal_maps->clear();
} }
String fixPathIssue(const String &path) { String fix_path(const String &path) {
if (path.size() > 5 && path[4] == '/' && path[5] == '/') return path; if (path.size() > 5 && path[4] == '/' && path[5] == '/') return path;
const String prefix = "res:/"; const String prefix = "res:/";
auto i = path.find(prefix); auto i = path.find(prefix);
@ -63,52 +63,40 @@ public:
virtual void load(spine::AtlasPage &page, const spine::String &path) { virtual void load(spine::AtlasPage &page, const spine::String &path) {
Error err = OK; Error err = OK;
auto fixed_path = fix_path(String(path.buffer()));
// print_line(String("Spine is loading texture: ") + String(path.buffer())); Ref<Texture> texture = ResourceLoader::load(fixed_path, "", false, &err);
auto fixed_path = fixPathIssue(String(path.buffer()));
// print_line("Fixed path: " + fixed_path);
// Load texture (e.g. tex.png)
Ref<Texture> tex = ResourceLoader::load(fixed_path, "", false, &err);
if (err != OK) { if (err != OK) {
print_error(vformat("Can't load texture: \"%s\"", String(path.buffer()))); print_error(vformat("Can't load texture: \"%s\"", String(path.buffer())));
page.setRendererObject((void *) memnew(SpineRendererObject{nullptr})); page.setRendererObject((void *) memnew(SpineRendererObject{nullptr}));
return; return;
} }
if (textures) textures->append(tex); if (textures) textures->append(texture);
auto p_spine_renderer_object = memnew(SpineRendererObject); auto spine_renderer_object = memnew(SpineRendererObject);
p_spine_renderer_object->tex = tex; spine_renderer_object->texture = texture;
// Load normal texture (e.g. n_tex.png) String temp_path = fixed_path;
String temppath = fixed_path; String new_path = vformat("%s/%s_%s", temp_path.get_base_dir(), normal_map_prefix, temp_path.get_file());
String newpath = vformat("%s/%s_%s", temppath.get_base_dir(), normal_maps_prefix, temppath.get_file()); if (ResourceLoader::exists(new_path)) {
// print_line(vformat("try n tex: %s", newpath)); Ref<Texture> normal_map = ResourceLoader::load(new_path);
if (ResourceLoader::exists(newpath)) { if (normal_maps) normal_maps->append(normal_map);
Ref<Texture> normal_tex = ResourceLoader::load(newpath); spine_renderer_object->normal_map = normal_map;
if (normal_maps) normal_maps->append(normal_tex);
p_spine_renderer_object->normal_tex = normal_tex;
// print_line(String("From atlas resource load: ") + String(" ro ") + String(Variant((long long) p_spine_renderer_object)));
// print_line(String("From atlas resource load: ") + String(Variant(p_spine_renderer_object->tex)) + String(", ") + String(Variant(p_spine_renderer_object->normal_tex)));
} }
page.setRendererObject((void *) p_spine_renderer_object); page.setRendererObject((void *) spine_renderer_object);
page.width = tex->get_width(); page.width = texture->get_width();
page.height = tex->get_height(); page.height = texture->get_height();
} }
virtual void unload(void *p) { virtual void unload(void *p) {
// print_line("I'm out."); auto spine_renderer_object = (SpineRendererObject *) p;
auto p_spine_renderer_object = (SpineRendererObject *) p; Ref<Texture> &texture = spine_renderer_object->texture;
Ref<Texture> &tex = p_spine_renderer_object->tex; if (texture.is_valid()) texture.unref();
Ref<Texture> &normal_tex = p_spine_renderer_object->normal_tex; Ref<Texture> &normal_map = spine_renderer_object->normal_map;
if (normal_map.is_valid()) normal_map.unref();
if (tex.is_valid()) tex.unref(); memdelete(spine_renderer_object);
if (normal_tex.is_valid()) normal_tex.unref();
memdelete(p_spine_renderer_object);
} }
}; };
@ -123,20 +111,20 @@ void SpineAtlasResource::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_source_path"), &SpineAtlasResource::get_source_path); ClassDB::bind_method(D_METHOD("get_source_path"), &SpineAtlasResource::get_source_path);
ClassDB::bind_method(D_METHOD("get_textures"), &SpineAtlasResource::get_textures); ClassDB::bind_method(D_METHOD("get_textures"), &SpineAtlasResource::get_textures);
ClassDB::bind_method(D_METHOD("get_normal_textures"), &SpineAtlasResource::get_normal_textures); ClassDB::bind_method(D_METHOD("get_normal_maps"), &SpineAtlasResource::get_normal_maps);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "source_path"), "", "get_source_path"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "source_path"), "", "get_source_path");
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "textures"), "", "get_textures"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "textures"), "", "get_textures");
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "normal_textures"), "", "get_normal_textures"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "normal_maps"), "", "get_normal_maps");
} }
Array SpineAtlasResource::get_textures() { Array SpineAtlasResource::get_textures() {
return tex_list; return textures;
} }
Array SpineAtlasResource::get_normal_textures() { Array SpineAtlasResource::get_normal_maps() {
return ntex_list; return normal_maps;
} }
String SpineAtlasResource::get_source_path() { String SpineAtlasResource::get_source_path() {
@ -144,33 +132,25 @@ String SpineAtlasResource::get_source_path() {
} }
Error SpineAtlasResource::load_from_atlas_file(const String &p_path) { Error SpineAtlasResource::load_from_atlas_file(const String &p_path) {
// print_line(vformat("Importing atlas file: %s", p_path));
source_path = p_path; source_path = p_path;
Error err; Error err;
atlas_data = FileAccess::get_file_as_string(p_path, &err); atlas_data = FileAccess::get_file_as_string(p_path, &err);
if (err != OK) return err; if (err != OK) return err;
if (atlas) delete atlas; if (atlas) delete atlas;
tex_list.clear(); textures.clear();
ntex_list.clear(); normal_maps.clear();
atlas = new spine::Atlas(atlas_data.utf8(), atlas_data.size(), source_path.get_base_dir().utf8(), new GodotSpineTextureLoader(&tex_list, &ntex_list, normal_texture_prefix)); atlas = new spine::Atlas(atlas_data.utf8(), atlas_data.size(), source_path.get_base_dir().utf8(), new GodotSpineTextureLoader(&textures, &normal_maps, normal_texture_prefix));
if (atlas) return OK;
// print_line(vformat("atlas loaded!"));
if (atlas)
return OK;
tex_list.clear();
ntex_list.clear();
textures.clear();
normal_maps.clear();
return ERR_FILE_UNRECOGNIZED; return ERR_FILE_UNRECOGNIZED;
} }
Error SpineAtlasResource::load_from_file(const String &p_path) { Error SpineAtlasResource::load_from_file(const String &p_path) {
Error err; Error err;
String json_string = FileAccess::get_file_as_string(p_path, &err); String json_string = FileAccess::get_file_as_string(p_path, &err);
if (err != OK) return err; if (err != OK) return err;
@ -179,26 +159,21 @@ Error SpineAtlasResource::load_from_file(const String &p_path) {
JSON json; JSON json;
Variant result; Variant result;
err = json.parse(json_string, result, error_string, error_line); err = json.parse(json_string, result, error_string, error_line);
if (err != OK) { if (err != OK) return err;
return err;
}
Dictionary content = Dictionary(result); Dictionary content = Dictionary(result);
source_path = content["source_path"]; source_path = content["source_path"];
atlas_data = content["atlas_data"]; atlas_data = content["atlas_data"];
normal_texture_prefix = content["normal_texture_prefix"]; normal_texture_prefix = content["normal_texture_prefix"];
if (atlas) delete atlas; if (atlas) delete atlas;
tex_list.clear(); textures.clear();
ntex_list.clear(); normal_maps.clear();
atlas = new spine::Atlas(atlas_data.utf8(), atlas_data.size(), source_path.get_base_dir().utf8(), new GodotSpineTextureLoader(&tex_list, &ntex_list, normal_texture_prefix)); atlas = new spine::Atlas(atlas_data.utf8(), atlas_data.size(), source_path.get_base_dir().utf8(), new GodotSpineTextureLoader(&textures, &normal_maps, normal_texture_prefix));
if (atlas) return OK;
if (atlas) textures.clear();
return OK; normal_maps.clear();
tex_list.clear();
ntex_list.clear();
return ERR_FILE_UNRECOGNIZED; return ERR_FILE_UNRECOGNIZED;
} }
@ -206,7 +181,6 @@ Error SpineAtlasResource::save_to_file(const String &p_path) {
Error err; Error err;
FileAccess *file = FileAccess::open(p_path, FileAccess::WRITE, &err); FileAccess *file = FileAccess::open(p_path, FileAccess::WRITE, &err);
if (err != OK) { if (err != OK) {
// print_line(vformat("save file err: %d", err));
if (file) file->close(); if (file) file->close();
return err; return err;
} }
@ -216,8 +190,6 @@ Error SpineAtlasResource::save_to_file(const String &p_path) {
content["atlas_data"] = atlas_data; content["atlas_data"] = atlas_data;
content["normal_texture_prefix"] = normal_texture_prefix; content["normal_texture_prefix"] = normal_texture_prefix;
// print_line(vformat("storing source_path: %s", source_path));
file->store_string(JSON::print(content)); file->store_string(JSON::print(content));
file->close(); file->close();

6
spine-godot/spine_godot/SpineAtlasResource.h
View File

@ -52,8 +52,8 @@ protected:
String atlas_data; String atlas_data;
String normal_texture_prefix; String normal_texture_prefix;
Array tex_list; Array textures;
Array ntex_list; Array normal_maps;
public: public:
inline String &get_atlas_data() { return atlas_data; } inline String &get_atlas_data() { return atlas_data; }
@ -69,7 +69,7 @@ public:
String get_source_path(); String get_source_path();
Array get_textures(); Array get_textures();
Array get_normal_textures(); Array get_normal_maps();
SpineAtlasResource(); SpineAtlasResource();
virtual ~SpineAtlasResource(); virtual ~SpineAtlasResource();

5
spine-godot/spine_godot/SpineRendererObject.h
View File

@ -32,10 +32,9 @@
#include <scene/resources/texture.h> #include <scene/resources/texture.h>
struct SpineRendererObject { struct SpineRendererObject {
Ref<Texture> tex; Ref<Texture> texture;
Ref<Texture> normal_tex; Ref<Texture> normal_map;
}; };

1
spine-godot/spine_godot/SpineSkeletonDataResource.cpp
View File

@ -119,7 +119,6 @@ void SpineSkeletonDataResource::update_skeleton_data() {
void SpineSkeletonDataResource::set_atlas_res(const Ref<SpineAtlasResource> &a) { void SpineSkeletonDataResource::set_atlas_res(const Ref<SpineAtlasResource> &a) {
atlas_res = a; atlas_res = a;
valid = false; valid = false;
// print_line("atlas_res_changed emitted");
emit_signal("atlas_res_changed"); emit_signal("atlas_res_changed");
update_skeleton_data(); update_skeleton_data();
} }

8
spine-godot/spine_godot/SpineSprite.cpp
View File

@ -386,8 +386,8 @@ void SpineSprite::update_mesh_from_skeleton(Ref<SpineSkeleton> s) {
spine::RegionAttachment *region_attachment = (spine::RegionAttachment *) attachment; spine::RegionAttachment *region_attachment = (spine::RegionAttachment *) attachment;
auto p_spine_renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region_attachment->getRendererObject())->page->getRendererObject(); auto p_spine_renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) region_attachment->getRendererObject())->page->getRendererObject();
tex = p_spine_renderer_object->tex; tex = p_spine_renderer_object->texture;
normal_tex = p_spine_renderer_object->normal_tex; normal_tex = p_spine_renderer_object->normal_map;
v_num = 4; v_num = 4;
vertices.setSize(v_num * VERTEX_STRIDE, 0); vertices.setSize(v_num * VERTEX_STRIDE, 0);
@ -410,8 +410,8 @@ void SpineSprite::update_mesh_from_skeleton(Ref<SpineSkeleton> s) {
spine::MeshAttachment *mesh = (spine::MeshAttachment *) attachment; spine::MeshAttachment *mesh = (spine::MeshAttachment *) attachment;
auto p_spine_renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject(); auto p_spine_renderer_object = (SpineRendererObject *) ((spine::AtlasRegion *) mesh->getRendererObject())->page->getRendererObject();
tex = p_spine_renderer_object->tex; tex = p_spine_renderer_object->texture;
normal_tex = p_spine_renderer_object->normal_tex; normal_tex = p_spine_renderer_object->normal_map;
v_num = mesh->getWorldVerticesLength() / VERTEX_STRIDE; v_num = mesh->getWorldVerticesLength() / VERTEX_STRIDE;
vertices.setSize(mesh->getWorldVerticesLength(), 0); vertices.setSize(mesh->getWorldVerticesLength(), 0);