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

[godot] Clean-up SpineCollisionShapeProxy. Needs more work.

Browse Source
This commit is contained in:
Mario Zechner 2022-04-07 06:03:02 +02:00
parent 31a3dd684b
commit 91cf922a6c
2 changed files with 49 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.cpp
View File

@ -41,7 +41,7 @@ void SpineCollisionShapeProxy::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_sync_transform"), &SpineCollisionShapeProxy::get_sync_transform); ClassDB::bind_method(D_METHOD("get_sync_transform"), &SpineCollisionShapeProxy::get_sync_transform);
ClassDB::bind_method(D_METHOD("set_sync_transform", "v"), &SpineCollisionShapeProxy::set_sync_transform); ClassDB::bind_method(D_METHOD("set_sync_transform", "v"), &SpineCollisionShapeProxy::set_sync_transform);
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "spine_sprite_path"), "set_spine_sprite_path", "get_spine_sprite_path"); ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "sprite_path"), "set_spine_sprite_path", "get_spine_sprite_path");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "sync_transform"), "set_sync_transform", "get_sync_transform"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "sync_transform"), "set_sync_transform", "get_sync_transform");
} }
@ -58,8 +58,8 @@ void SpineCollisionShapeProxy::_notification(int p_what) {
} break; } break;
case NOTIFICATION_INTERNAL_PROCESS: { case NOTIFICATION_INTERNAL_PROCESS: {
if (!disabled) { if (!disabled) {
if (sync_transform) _sync_transform(get_spine_sprite()); if (sync_transform) synchronize_transform(get_spine_sprite());
_update_polygon_from_spine_sprite(get_spine_sprite()); update_polygon_from_spine_sprite(get_spine_sprite());
if (is_visible()) update(); if (is_visible()) update();
} }
} break; } break;
@ -67,56 +67,43 @@ void SpineCollisionShapeProxy::_notification(int p_what) {
} }
SpineSprite *SpineCollisionShapeProxy::get_spine_sprite() const { SpineSprite *SpineCollisionShapeProxy::get_spine_sprite() const {
return (SpineSprite *) get_node_or_null(spine_sprite_path); return (SpineSprite *) get_node_or_null(sprite_path);
} }
NodePath SpineCollisionShapeProxy::get_spine_sprite_path() { NodePath SpineCollisionShapeProxy::get_spine_sprite_path() {
return spine_sprite_path; return sprite_path;
} }
void SpineCollisionShapeProxy::set_spine_sprite_path(NodePath v) { void SpineCollisionShapeProxy::set_spine_sprite_path(NodePath path) {
spine_sprite_path = v; sprite_path = path;
update_polygon_from_spine_sprite(get_spine_sprite());
_update_polygon_from_spine_sprite(get_spine_sprite());
} }
String SpineCollisionShapeProxy::get_slot() const { String SpineCollisionShapeProxy::get_slot() const {
return slot; return slot_name;
} }
void SpineCollisionShapeProxy::set_slot(const String &v) { void SpineCollisionShapeProxy::set_slot(const String &slotName) {
slot = v; slot_name = slotName;
_update_polygon_from_spine_sprite(get_spine_sprite()); update_polygon_from_spine_sprite(get_spine_sprite());
} }
void SpineCollisionShapeProxy::_update_polygon_from_spine_sprite(SpineSprite *sprite) { void SpineCollisionShapeProxy::update_polygon_from_spine_sprite(SpineSprite *sprite) {
_clear_polygon(); clear_polygon();
if (sprite == nullptr || slot.empty()) { if (sprite == NULL || slot_name.empty()) return;
return; if (!sprite->get_skeleton().is_valid()) return;
}
if (!sprite->get_skeleton().is_valid()) { spine::Skeleton *skeleton = sprite->get_skeleton()->get_spine_object();
return; spine::Slot *slot = skeleton->findSlot(spine::String(slot_name.utf8()));
} if (!slot) return;
spine::Attachment *attachment = slot->getAttachment();
auto sk = sprite->get_skeleton()->get_spine_object(); if (!attachment) return;
spine::Vector<float> vertices; spine::Vector<float> vertices;
spine::Slot *s = sk->findSlot(spine::String(slot.utf8()));
if (!s) {
return;
}
spine::Attachment *attachment = s->getAttachment();
if (!attachment) {
return;
}
if (attachment->getRTTI().isExactly(spine::BoundingBoxAttachment::rtti)) { if (attachment->getRTTI().isExactly(spine::BoundingBoxAttachment::rtti)) {
auto *box = (spine::BoundingBoxAttachment *) attachment; auto *box = (spine::BoundingBoxAttachment *) attachment;
vertices.setSize(box->getWorldVerticesLength(), 0); vertices.setSize(box->getWorldVerticesLength(), 0);
box->computeWorldVertices(*s, vertices); box->computeWorldVertices(*slot, vertices);
} else { } else {
return; return;
} }
@ -129,12 +116,12 @@ void SpineCollisionShapeProxy::_update_polygon_from_spine_sprite(SpineSprite *sp
set_polygon(polygon); set_polygon(polygon);
} }
void SpineCollisionShapeProxy::_clear_polygon() { void SpineCollisionShapeProxy::clear_polygon() {
polygon.clear(); polygon.clear();
set_polygon(polygon); set_polygon(polygon);
} }
void SpineCollisionShapeProxy::_sync_transform(SpineSprite *sprite) { void SpineCollisionShapeProxy::synchronize_transform(SpineSprite *sprite) {
if (sprite == nullptr) return; if (sprite == nullptr) return;
set_global_transform(sprite->get_global_transform()); set_global_transform(sprite->get_global_transform());
} }
@ -143,25 +130,24 @@ bool SpineCollisionShapeProxy::get_sync_transform() {
return sync_transform; return sync_transform;
} }
void SpineCollisionShapeProxy::set_sync_transform(bool v) { void SpineCollisionShapeProxy::set_sync_transform(bool sync_transform) {
sync_transform = v; this->sync_transform = sync_transform;
} }
void SpineCollisionShapeProxy::_get_property_list(List<PropertyInfo> *p_list) const { void SpineCollisionShapeProxy::_get_property_list(List<PropertyInfo> *p_list) const {
PropertyInfo p; PropertyInfo p;
Vector<String> res; Vector<String> res;
p.name = "Slot";
p.name = "slot";
p.type = Variant::STRING; p.type = Variant::STRING;
_get_slot_list(res); get_slot_list(res);
if (res.empty()) res.push_back("No Slot"); if (res.empty()) res.push_back("None");
p.hint_string = String(",").join(res); p.hint_string = String(",").join(res);
p.hint = PROPERTY_HINT_ENUM; p.hint = PROPERTY_HINT_ENUM;
p_list->push_back(p); p_list->push_back(p);
} }
bool SpineCollisionShapeProxy::_get(const StringName &p_property, Variant &r_value) const { bool SpineCollisionShapeProxy::_get(const StringName &p_property, Variant &r_value) const {
if (p_property == "slot") { if (p_property == "Slot") {
r_value = get_slot(); r_value = get_slot();
return true; return true;
} }
@ -169,28 +155,23 @@ bool SpineCollisionShapeProxy::_get(const StringName &p_property, Variant &r_val
} }
bool SpineCollisionShapeProxy::_set(const StringName &p_property, const Variant &p_value) { bool SpineCollisionShapeProxy::_set(const StringName &p_property, const Variant &p_value) {
if (p_property == "slot") { if (p_property == "Slot") {
set_slot(p_value); set_slot(p_value);
return true; return true;
} }
return false; return false;
} }
void SpineCollisionShapeProxy::_get_slot_list(Vector<String> &res) const { void SpineCollisionShapeProxy::get_slot_list(Vector<String> &slotNames) const {
if (get_spine_sprite() == nullptr) { if (get_spine_sprite() == nullptr) return;
return;
}
auto sprite = get_spine_sprite(); auto sprite = get_spine_sprite();
if (!sprite->get_skeleton().is_valid()) { if (!sprite->get_skeleton().is_valid()) return;
return;
}
auto slots = sprite->get_skeleton()->get_slots(); auto slots = sprite->get_skeleton()->get_slots();
res.resize(slots.size()); slots.resize(slotNames.size());
for (size_t i = 0; i < res.size(); ++i) { for (size_t i = 0; i < slotNames.size(); ++i) {
auto slot = (Ref<SpineSlot>) slots[i]; auto slot = (Ref<SpineSlot>) slotNames[i];
if (slot.is_valid()) if (slot.is_valid())
res.set(i, slot->get_data()->get_slot_name()); slots.set(i, slot->get_data()->get_slot_name());
} }
} }

20
spine-godot/godot/modules/spine_godot/SpineCollisionShapeProxy.h
View File

@ -41,9 +41,9 @@ class SpineCollisionShapeProxy : public CollisionPolygon2D {
protected: protected:
static void _bind_methods(); static void _bind_methods();
NodePath spine_sprite_path; NodePath sprite_path;
String slot; String slot_name;
bool sync_transform; bool sync_transform;
@ -56,24 +56,26 @@ protected:
SpineSprite *get_spine_sprite() const; SpineSprite *get_spine_sprite() const;
void _update_polygon_from_spine_sprite(SpineSprite *sprite); void update_polygon_from_spine_sprite(SpineSprite *sprite);
void _clear_polygon();
void _sync_transform(SpineSprite *sprite);
void _get_slot_list(Vector<String> &res) const; void clear_polygon();
void synchronize_transform(SpineSprite *sprite);
void get_slot_list(Vector<String> &slotNames) const;
public: public:
SpineCollisionShapeProxy(); SpineCollisionShapeProxy();
~SpineCollisionShapeProxy(); ~SpineCollisionShapeProxy();
NodePath get_spine_sprite_path(); NodePath get_spine_sprite_path();
void set_spine_sprite_path(NodePath v); void set_spine_sprite_path(NodePath path);
String get_slot() const; String get_slot() const;
void set_slot(const String &v); void set_slot(const String &slotName);
bool get_sync_transform(); bool get_sync_transform();
void set_sync_transform(bool v); void set_sync_transform(bool sync_transform);
}; };