Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-04-19 21:33:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Now CharacterSkeleton3D will actually use the bone from the VisualEntry itself.

Browse Source
This commit is contained in:
Relintai 2020-06-16 11:38:56 +02:00
parent e82dca60f8
commit 022775d916
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entity_enums.h
View File

@ -163,6 +163,8 @@ public:
ENTITY_IMMUNITY_FLAG_DISPELL = 1 << 30,
};
//This should only be a common bone lookup enum, that can be made to work for all skeletons
//e.g. for applying spell effects
enum CharacterSkeletonPoints {
SKELETON_POINT_ROOT = 0,
SKELETON_POINT_PELVIS = 1,

26
skeleton/character_skeleton_3d.cpp
View File

@ -109,11 +109,11 @@ void CharacterSkeleton3D::update_nodes() {
void CharacterSkeleton3D::add_model_visual(Ref<ModelVisual> vis) {
ERR_FAIL_COND(!vis.is_valid());
for (int i = 0; i < EntityEnums::SKELETON_POINTS_MAX; ++i) {
for (int i = 0; i < vis->get_visual_entry_count(); ++i) {
Ref<ModelVisualEntry> e = vis->get_visual_entry(i);
if (e.is_valid())
add_model_visual_entry(vis, e, i);
add_model_visual_entry(vis, e);
}
_model_visuals.push_back(vis);
@ -133,7 +133,7 @@ void CharacterSkeleton3D::remove_model_visual(Ref<ModelVisual> vis) {
Ref<ModelVisualEntry> e = vis->get_visual_entry(i);
if (e.is_valid())
remove_model_visual_entry(vis, e, i);
remove_model_visual_entry(vis, e);
}
_model_visuals.remove(index);
@ -171,13 +171,13 @@ void CharacterSkeleton3D::clear_model_visuals() {
set_process(true);
}
void CharacterSkeleton3D::add_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive, int target_bone) {
void CharacterSkeleton3D::add_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive) {
ERR_FAIL_COND(!vis.is_valid());
ERR_FAIL_COND(!ive.is_valid());
int target_bone_idx = target_bone;
int target_bone_idx = ive->get_bone();
Vector<Ref<SkeletonModelEntry>> &entries = _entries[target_bone_idx];
Vector<Ref<SkeletonModelEntry> > &entries = _entries[target_bone_idx];
for (int i = 0; i < entries.size(); ++i) {
Ref<SkeletonModelEntry> e = entries.get(i);
@ -191,7 +191,7 @@ void CharacterSkeleton3D::add_model_visual_entry(Ref<ModelVisual> vis, Ref<Model
Ref<SkeletonModelEntry> e;
e.instance();
e->set_priority(static_cast<int>(vis->get_layer()));
e->set_priority(vis->get_layer());
//e->set_color(ive->get_color());
e->set_entry(ive);
@ -199,13 +199,13 @@ void CharacterSkeleton3D::add_model_visual_entry(Ref<ModelVisual> vis, Ref<Model
_model_dirty = true;
set_process(true);
}
void CharacterSkeleton3D::remove_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive, int target_bone) {
void CharacterSkeleton3D::remove_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive) {
ERR_FAIL_COND(!vis.is_valid());
ERR_FAIL_COND(!ive.is_valid());
int target_bone_idx = target_bone;
int target_bone_idx = ive->get_bone();
Vector<Ref<SkeletonModelEntry>> &entries = _entries[target_bone_idx];
Vector<Ref<SkeletonModelEntry> > &entries = _entries[target_bone_idx];
for (int i = 0; i < entries.size(); ++i) {
Ref<SkeletonModelEntry> e = entries.get(i);
@ -239,7 +239,7 @@ int CharacterSkeleton3D::get_model_entry_count(const int bone_index) {
void CharacterSkeleton3D::sort_layers() {
for (int i = 0; i < EntityEnums::SKELETON_POINTS_MAX; ++i) {
Vector<Ref<SkeletonModelEntry>> &entries = _entries[i];
Vector<Ref<SkeletonModelEntry> > &entries = _entries[i];
entries.sort_custom<_ModelEntryComparator>();
}
@ -425,8 +425,8 @@ void CharacterSkeleton3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_bone_path", "index"), &CharacterSkeleton3D::get_bone_path);
ClassDB::bind_method(D_METHOD("set_bone_path", "index", "path"), &CharacterSkeleton3D::set_bone_path);
ADD_GROUP("Bone Paths", "bone_path_");
ADD_PROPERTYI(PropertyInfo(Variant::NODE_PATH, "bone_path_root"), "set_bone_path", "get_bone_path", EntityEnums::SKELETON_POINT_ROOT);
//ADD_GROUP("Bone Paths", "bone_path_");
//ADD_PROPERTYI(PropertyInfo(Variant::NODE_PATH, "bone_path_root"), "set_bone_path", "get_bone_path", EntityEnums::SKELETON_POINT_ROOT);
ClassDB::bind_method(D_METHOD("get_bone_node", "bone_idx"), &CharacterSkeleton3D::get_bone_node);

8
skeleton/character_skeleton_3d.h
View File

@ -82,8 +82,8 @@ public:
int get_model_visual_count();
void clear_model_visuals();
void add_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive, int target_bone);
void remove_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive, int target_bone);
void add_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive);
void remove_model_visual_entry(Ref<ModelVisual> vis, Ref<ModelVisualEntry> ive);
Ref<SkeletonModelEntry> get_model_entry(const int bone_index, const int index);
int get_model_entry_count(const int bone_index);
@ -127,8 +127,8 @@ private:
Node *_bone_nodes[EntityEnums::SKELETON_POINTS_MAX];
bool _model_dirty;
Vector<Ref<ModelVisual>> _model_visuals;
Vector<Ref<SkeletonModelEntry>> _entries[EntityEnums::SKELETON_POINTS_MAX];
Vector<Ref<ModelVisual> > _model_visuals;
Vector<Ref<SkeletonModelEntry> > _entries[EntityEnums::SKELETON_POINTS_MAX];
};
#endif