Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.x] SkeletonEditorPlugin backport #39796

Closed
wants to merge 2 commits into from
Closed

[3.x] SkeletonEditorPlugin backport #39796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe6f27
Custom SkeletonEditorPlugin
fire May 27, 2020
1241259
Backport SkeletonInspector improvements from 39353
TwistedTwigleg Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/animation_track_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3341,7 +3341,7 @@ void AnimationTrackEditor::update_keying() {
return;

keying = keying_enabled;
//_update_menu();

emit_signal("keying_changed");
}

Expand Down
38 changes: 34 additions & 4 deletions editor/editor_properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,13 +1354,25 @@ void EditorPropertyVector3::_value_changed(double val, const String &p_name) {
}

void EditorPropertyVector3::update_property() {
Vector3 val = get_edited_object()->get(get_edited_property());
update_using_vector(get_edited_object()->get(get_edited_property()));
}

void EditorPropertyVector3::update_using_vector(Vector3 p_vector) {
setting = true;
spin[0]->set_value(val.x);
spin[1]->set_value(val.y);
spin[2]->set_value(val.z);
spin[0]->set_value(p_vector.x);
spin[1]->set_value(p_vector.y);
spin[2]->set_value(p_vector.z);
setting = false;
}

Vector3 EditorPropertyVector3::get_vector() {
Vector3 v3;
v3.x = spin[0]->get_value();
v3.y = spin[1]->get_value();
v3.z = spin[2]->get_value();
return v3;
}

void EditorPropertyVector3::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
Color base = get_color("accent_color", "Editor");
Expand Down Expand Up @@ -1860,6 +1872,24 @@ void EditorPropertyTransform::update_property() {

setting = false;
}

void EditorPropertyTransform::update_using_transform(Transform p_transform) {
setting = true;
spin[0]->set_value(p_transform.basis[0][0]);
spin[1]->set_value(p_transform.basis[1][0]);
spin[2]->set_value(p_transform.basis[2][0]);
spin[3]->set_value(p_transform.basis[0][1]);
spin[4]->set_value(p_transform.basis[1][1]);
spin[5]->set_value(p_transform.basis[2][1]);
spin[6]->set_value(p_transform.basis[0][2]);
spin[7]->set_value(p_transform.basis[1][2]);
spin[8]->set_value(p_transform.basis[2][2]);
spin[9]->set_value(p_transform.origin[0]);
spin[10]->set_value(p_transform.origin[1]);
spin[11]->set_value(p_transform.origin[2]);
setting = false;
}

void EditorPropertyTransform::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
Color base = get_color("accent_color", "Editor");
Expand Down
3 changes: 3 additions & 0 deletions editor/editor_properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ class EditorPropertyVector3 : public EditorProperty {

public:
virtual void update_property();
virtual void update_using_vector(Vector3 p_vector);
Vector3 get_vector();
void setup(double p_min, double p_max, double p_step, bool p_no_slider);
EditorPropertyVector3();
};
Expand Down Expand Up @@ -485,6 +487,7 @@ class EditorPropertyTransform : public EditorProperty {

public:
virtual void update_property();
virtual void update_using_transform(Transform p_transform);
void setup(double p_min, double p_max, double p_step, bool p_no_slider);
EditorPropertyTransform();
};
Expand Down
Loading