asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #63558 from TokageItLab/skel-validator

Browse source
This commit is contained in:
Rémi Verschelde 2022-07-28 09:25:45 +02:00 committed by GitHub
commit 72e9122514
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
editor/plugins/bone_map_editor_plugin.cpp
View file

@ -65,6 +65,9 @@ void BoneMapperButton::set_state(BoneMapState p_state) {
case BONE_MAP_STATE_SET: { case BONE_MAP_STATE_SET: {
circle->set_modulate(EditorSettings::get_singleton()->get("editors/bone_mapper/handle_colors/set")); circle->set_modulate(EditorSettings::get_singleton()->get("editors/bone_mapper/handle_colors/set"));
} break; } break;
case BONE_MAP_STATE_MISSING: {
circle->set_modulate(EditorSettings::get_singleton()->get("editors/bone_mapper/handle_colors/missing"));
} break;
case BONE_MAP_STATE_ERROR: { case BONE_MAP_STATE_ERROR: {
circle->set_modulate(EditorSettings::get_singleton()->get("editors/bone_mapper/handle_colors/error")); circle->set_modulate(EditorSettings::get_singleton()->get("editors/bone_mapper/handle_colors/error"));
} break; } break;
@ -311,16 +314,48 @@ void BoneMapper::recreate_items() {
void BoneMapper::_update_state() { void BoneMapper::_update_state() {
int len = bone_mapper_buttons.size(); int len = bone_mapper_buttons.size();
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
StringName sbn = bone_map->get_skeleton_bone_name(bone_mapper_buttons[i]->get_profile_bone_name()); StringName pbn = bone_mapper_buttons[i]->get_profile_bone_name();
if (skeleton->find_bone(sbn) >= 0) { StringName sbn = bone_map->get_skeleton_bone_name(pbn);
int bone_idx = skeleton->find_bone(sbn);
if (bone_idx >= 0) {
if (bone_map->get_skeleton_bone_name_count(sbn) == 1) { if (bone_map->get_skeleton_bone_name_count(sbn) == 1) {
bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_SET); Ref<SkeletonProfile> prof = bone_map->get_profile();
StringName parent_name = prof->get_bone_parent(prof->find_bone(pbn));
Vector<int> prof_parent_bones;
while (parent_name != StringName()) {
prof_parent_bones.push_back(skeleton->find_bone(bone_map->get_skeleton_bone_name(parent_name)));
if (prof->find_bone(parent_name) == -1) {
break;
}
parent_name = prof->get_bone_parent(prof->find_bone(parent_name));
}
int parent_id = skeleton->get_bone_parent(bone_idx);
Vector<int> skel_parent_bones;
while (parent_id >= 0) {
skel_parent_bones.push_back(parent_id);
parent_id = skeleton->get_bone_parent(parent_id);
}
bool is_broken = false;
for (int j = 0; j < prof_parent_bones.size(); j++) {
if (prof_parent_bones[j] != -1 && !skel_parent_bones.has(prof_parent_bones[j])) {
is_broken = true;
}
}
if (is_broken) {
bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_ERROR);
} else {
bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_SET);
}
} else { } else {
bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_ERROR); bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_ERROR);
} }
} else { } else {
if (bone_mapper_buttons[i]->is_require()) { if (bone_mapper_buttons[i]->is_require()) {
bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_ERROR); bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_MISSING);
} else { } else {
bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_UNSET); bone_mapper_buttons[i]->set_state(BoneMapperButton::BONE_MAP_STATE_UNSET);
} }
@ -441,9 +476,10 @@ void EditorInspectorPluginBoneMap::parse_begin(Object *p_object) {
BoneMapEditorPlugin::BoneMapEditorPlugin() { BoneMapEditorPlugin::BoneMapEditorPlugin() {
// Register properties in editor settings. // Register properties in editor settings.
EDITOR_DEF("editors/bone_mapper/handle_colors/set", Color(0.1, 0.6, 0.25));
EDITOR_DEF("editors/bone_mapper/handle_colors/error", Color(0.8, 0.2, 0.2));
EDITOR_DEF("editors/bone_mapper/handle_colors/unset", Color(0.3, 0.3, 0.3)); EDITOR_DEF("editors/bone_mapper/handle_colors/unset", Color(0.3, 0.3, 0.3));
EDITOR_DEF("editors/bone_mapper/handle_colors/set", Color(0.1, 0.6, 0.25));
EDITOR_DEF("editors/bone_mapper/handle_colors/missing", Color(0.8, 0.2, 0.8));
EDITOR_DEF("editors/bone_mapper/handle_colors/error", Color(0.8, 0.2, 0.2));
Ref<EditorInspectorPluginBoneMap> inspector_plugin; Ref<EditorInspectorPluginBoneMap> inspector_plugin;
inspector_plugin.instantiate(); inspector_plugin.instantiate();

1
editor/plugins/bone_map_editor_plugin.h
View file

@ -47,6 +47,7 @@ public:
enum BoneMapState { enum BoneMapState {
BONE_MAP_STATE_UNSET, BONE_MAP_STATE_UNSET,
BONE_MAP_STATE_SET, BONE_MAP_STATE_SET,
BONE_MAP_STATE_MISSING,
BONE_MAP_STATE_ERROR BONE_MAP_STATE_ERROR
}; };