From 952bbb113dc8fb3bc15a8de7a868ee4159654105 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 26 Oct 2019 15:13:04 +0200 Subject: [PATCH] Small cleanups. --- data/item_visual_entry.cpp | 42 +++++++----------------------- data/item_visual_entry.h | 15 +++-------- skeleton/character_skeleton_3d.cpp | 12 ++++----- skeleton/character_skeleton_3d.h | 4 +-- 4 files changed, 20 insertions(+), 53 deletions(-) diff --git a/data/item_visual_entry.cpp b/data/item_visual_entry.cpp index 9030b06..9ab3111 100644 --- a/data/item_visual_entry.cpp +++ b/data/item_visual_entry.cpp @@ -1,24 +1,10 @@ #include "item_visual_entry.h" -int ItemVisualEntry::get_id() { - return _id; +ItemEnums::EntityTextureLayers ItemVisualEntry::get_override_layer() { + return _override_layer; } -void ItemVisualEntry::set_id(int id) { - _id = id; -} - -EntityEnums::CharacterSkeletonPoints ItemVisualEntry::get_target_bone() { - return _target_bone; -} -void ItemVisualEntry::set_target_bone(EntityEnums::CharacterSkeletonPoints bone) { - _target_bone = bone; -} - -ItemEnums::EntityTextureLayers ItemVisualEntry::get_layer() { - return _layer; -} -void ItemVisualEntry::set_layer(ItemEnums::EntityTextureLayers layer) { - _layer = layer; +void ItemVisualEntry::set_override_layer(ItemEnums::EntityTextureLayers layer) { + _override_layer = layer; } Ref ItemVisualEntry::get_mesh() { @@ -50,10 +36,8 @@ void ItemVisualEntry::set_effect(Ref effect) { } ItemVisualEntry::ItemVisualEntry() { - _id = 0; - _target_bone = EntityEnums::SKELETON_POINT_HEAD; - _layer = ItemEnums::ENTITY_TEXTURE_LAYER_NONE; + _override_layer = ItemEnums::ENTITY_TEXTURE_LAYER_NONE; _color = Color(1, 1, 1, 1); } @@ -65,17 +49,9 @@ ItemVisualEntry::~ItemVisualEntry() { } void ItemVisualEntry::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_id"), &ItemVisualEntry::get_id); - ClassDB::bind_method(D_METHOD("set_id", "value"), &ItemVisualEntry::set_id); - ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id"); - - ClassDB::bind_method(D_METHOD("get_target_bone"), &ItemVisualEntry::get_target_bone); - ClassDB::bind_method(D_METHOD("set_target_bone", "bone"), &ItemVisualEntry::set_target_bone); - ADD_PROPERTY(PropertyInfo(Variant::INT, "target_bone", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_CHARCATER_SKELETON_POINTS), "set_target_bone", "get_target_bone"); - - ClassDB::bind_method(D_METHOD("get_layer"), &ItemVisualEntry::get_layer); - ClassDB::bind_method(D_METHOD("set_layer", "value"), &ItemVisualEntry::set_layer); - ADD_PROPERTY(PropertyInfo(Variant::INT, "layer", PROPERTY_HINT_ENUM, ItemEnums::BINDING_STRING_ENTITY_TEXTURE_LAYERS), "set_layer", "get_layer"); + ClassDB::bind_method(D_METHOD("get_override_layer"), &ItemVisualEntry::get_override_layer); + ClassDB::bind_method(D_METHOD("set_override_layer", "value"), &ItemVisualEntry::set_override_layer); + ADD_PROPERTY(PropertyInfo(Variant::INT, "override_layer", PROPERTY_HINT_ENUM, ItemEnums::BINDING_STRING_ENTITY_TEXTURE_LAYERS), "set_override_layer", "get_override_layer"); ClassDB::bind_method(D_METHOD("get_mesh"), &ItemVisualEntry::get_mesh); ClassDB::bind_method(D_METHOD("set_mesh", "value"), &ItemVisualEntry::set_mesh); @@ -87,7 +63,7 @@ void ItemVisualEntry::_bind_methods() { ClassDB::bind_method(D_METHOD("get_color"), &ItemVisualEntry::get_color); ClassDB::bind_method(D_METHOD("set_color", "value"), &ItemVisualEntry::set_color); - ADD_PROPERTY(PropertyInfo(Variant::INT, "color"), "set_color", "get_color"); + ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_color", "get_color"); ClassDB::bind_method(D_METHOD("get_effect"), &ItemVisualEntry::get_effect); ClassDB::bind_method(D_METHOD("set_effect", "value"), &ItemVisualEntry::set_effect); diff --git a/data/item_visual_entry.h b/data/item_visual_entry.h index 388b2e3..49a9169 100644 --- a/data/item_visual_entry.h +++ b/data/item_visual_entry.h @@ -17,14 +17,8 @@ class ItemVisualEntry : public Resource { GDCLASS(ItemVisualEntry, Resource); public: - int get_id(); - void set_id(int id); - - EntityEnums::CharacterSkeletonPoints get_target_bone(); - void set_target_bone(EntityEnums::CharacterSkeletonPoints bone); - - ItemEnums::EntityTextureLayers get_layer(); - void set_layer(ItemEnums::EntityTextureLayers layer); + ItemEnums::EntityTextureLayers get_override_layer(); + void set_override_layer(ItemEnums::EntityTextureLayers layer); Ref get_mesh(); void set_mesh(Ref mesh); @@ -45,10 +39,7 @@ protected: static void _bind_methods(); private: - int _id; - - EntityEnums::CharacterSkeletonPoints _target_bone; - ItemEnums::EntityTextureLayers _layer; + ItemEnums::EntityTextureLayers _override_layer; Ref _mesh; Ref _texture; diff --git a/skeleton/character_skeleton_3d.cpp b/skeleton/character_skeleton_3d.cpp index e3ad513..76d9cb6 100644 --- a/skeleton/character_skeleton_3d.cpp +++ b/skeleton/character_skeleton_3d.cpp @@ -93,7 +93,7 @@ void CharacterSkeleton3D::add_item_visual(Ref vis) { Ref e = vis->get_visual(i); if (e.is_valid()) - add_item_visual_entry(vis, e); + add_item_visual_entry(vis, e, i); } _item_visuals.push_back(vis); @@ -110,7 +110,7 @@ void CharacterSkeleton3D::remove_item_visual(Ref vis) { Ref e = vis->get_visual(i); if (e.is_valid()) - remove_item_visual_entry(vis, e); + remove_item_visual_entry(vis, e, i); } _item_visuals.remove(index); @@ -139,11 +139,11 @@ void CharacterSkeleton3D::clear_item_visuals() { set_process(true); } -void CharacterSkeleton3D::add_item_visual_entry(Ref vis, Ref ive) { +void CharacterSkeleton3D::add_item_visual_entry(Ref vis, Ref ive, int target_bone) { ERR_FAIL_COND(!vis.is_valid()); ERR_FAIL_COND(!ive.is_valid()); - int target_bone_idx = static_cast(ive->get_target_bone()); + int target_bone_idx = target_bone; Vector > &entries = _entries[target_bone_idx]; @@ -167,11 +167,11 @@ void CharacterSkeleton3D::add_item_visual_entry(Ref vis, Ref vis, Ref ive) { +void CharacterSkeleton3D::remove_item_visual_entry(Ref vis, Ref ive, int target_bone) { ERR_FAIL_COND(!vis.is_valid()); ERR_FAIL_COND(!ive.is_valid()); - int target_bone_idx = static_cast(ive->get_target_bone()); + int target_bone_idx = target_bone; Vector > &entries = _entries[target_bone_idx]; diff --git a/skeleton/character_skeleton_3d.h b/skeleton/character_skeleton_3d.h index 2d89b1f..9a33388 100644 --- a/skeleton/character_skeleton_3d.h +++ b/skeleton/character_skeleton_3d.h @@ -53,8 +53,8 @@ public: int get_item_visual_count(); void clear_item_visuals(); - void add_item_visual_entry(Ref vis, Ref ive); - void remove_item_visual_entry(Ref vis, Ref ive); + void add_item_visual_entry(Ref vis, Ref ive, int target_bone); + void remove_item_visual_entry(Ref vis, Ref ive, int target_bone); Ref get_model_entry(const int bone_index, const int index); int get_model_entry_count(const int bone_index);