Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-03 22:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up CurveEdit.

Browse Source
This commit is contained in:
Relintai 2022-06-13 16:46:42 +02:00
parent 20b291a2ea
commit 4c12cb8606
3 changed files with 49 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
modules/material_maker/editor/widgets/curve_edit/curve_edit.cpp
View File

@ -1,80 +1,53 @@
#include "curve_edit.h" #include "curve_edit.h"
#include "curve_dialog.h"
#include "curve_view.h"
Variant CurveEdit::get_Variant() { Variant CurveEdit::get_value() {
return Variant; return value;
} }
void CurveEdit::set_Variant(const Variant &val) {
Variant = val;
}
Variant CurveEdit::get_Variant() {
return Variant;
}
void CurveEdit::set_Variant(const Variant &val) {
Variant = val;
}
//tool;
//var MMCurve = preload("res://addons/mat_maker_gd/nodes/bases/curve_base.gd");
// setget set_value;
Variant = null;
signal updated(curve);
void CurveEdit::set_value(const Variant &v) { void CurveEdit::set_value(const Variant &v) {
value = v; value = v;
$CurveView.set_curve(value); _curve_view->set_curve(value);
$CurveView.update(); _curve_view->update();
} }
void CurveEdit::_on_CurveEdit_pressed() { void CurveEdit::_on_CurveEdit_pressed() {
//var dialog = preload("res://addons/mat_maker_gd/widgets/curve_edit/curve_dialog.tscn").instance(); CurveDialog *dialog = memnew(CurveDialog);
add_child(dialog); add_child(dialog);
dialog.connect("curve_changed", self, "on_value_changed"); dialog->connect("curve_changed", self, "on_value_changed");
dialog.edit_curve(value); dialog->edit_curve(value);
} }
void CurveEdit::on_value_changed(const Variant &v) { void CurveEdit::on_value_changed(const Variant &v) {
//set_value(v); //set_value(v);
emit_signal("updated", v); emit_signal("updated", v);
$CurveView.update(); _curve_view->update();
}
} }
CurveEdit::CurveEdit() { CurveEdit::CurveEdit() {
//var MMCurve = preload("res://addons/mat_maker_gd/nodes/bases/curve_base.gd"); set_custom_minimum_size(Vector2(60, 20));
= null; set_focus_mode(FOCUS_CLICK);
_curve_view = memnew(CurveView);
_curve_view->set_name("CurveView");
add_child(_curve_view);
_curve_view->set_mouse_filter(MOUSE_FILTER_IGNORE);
} }
CurveEdit::~CurveEdit() { CurveEdit::~CurveEdit() {
} }
void CurveEdit::_bind_methods() {
ADD_SIGNAL(MethodInfo("updated", PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveBase")));
static void CurveEdit::_bind_methods() { //ClassDB::bind_method(D_METHOD("get_Variant"), &CurveEdit::get_Variant);
ClassDB::bind_method(D_METHOD("get_Variant"), &CurveEdit::get_Variant); //ClassDB::bind_method(D_METHOD("set_Variant", "value"), &CurveEdit::set_Variant);
ClassDB::bind_method(D_METHOD("set_Variant", "value"), &CurveEdit::set_Variant); //ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "Variant", PROPERTY_HINT_RESOURCE_TYPE, "Variant"), "set_Variant", "get_Variant");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "Variant", PROPERTY_HINT_RESOURCE_TYPE, "Variant"), "set_Variant", "get_Variant");
ClassDB::bind_method(D_METHOD("get_Variant"), &CurveEdit::get_Variant);
ClassDB::bind_method(D_METHOD("set_Variant", "value"), &CurveEdit::set_Variant);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "Variant", PROPERTY_HINT_RESOURCE_TYPE, "Variant"), "set_Variant", "get_Variant");
ClassDB::bind_method(D_METHOD("set_value", "v"), &CurveEdit::set_value); ClassDB::bind_method(D_METHOD("set_value", "v"), &CurveEdit::set_value);
ClassDB::bind_method(D_METHOD("_on_CurveEdit_pressed"), &CurveEdit::_on_CurveEdit_pressed); ClassDB::bind_method(D_METHOD("_on_CurveEdit_pressed"), &CurveEdit::_on_CurveEdit_pressed);
ClassDB::bind_method(D_METHOD("on_value_changed", "v"), &CurveEdit::on_value_changed); ClassDB::bind_method(D_METHOD("on_value_changed", "v"), &CurveEdit::on_value_changed);
} }

21
modules/material_maker/editor/widgets/curve_edit/curve_edit.h
View File

@ -1,19 +1,17 @@
#ifndef CURVE_EDIT_H #ifndef CURVE_EDIT_H
#define CURVE_EDIT_H #define CURVE_EDIT_H
#include "scene/gui/control.h"
class CurveView;
class CurveEdit : public Control { class CurveEdit : public Control {
GDCLASS(CurveEdit, Control); GDCLASS(CurveEdit, Control);
public: public:
Variant get_value();
Variant get_Variant();
void set_Variant(const Variant &val);
Variant get_Variant();
void set_Variant(const Variant &val);
void set_value(const Variant &v); void set_value(const Variant &v);
void _on_CurveEdit_pressed(); void _on_CurveEdit_pressed();
void on_value_changed(const Variant &v); void on_value_changed(const Variant &v);
@ -23,12 +21,9 @@ class CurveEdit : public Control {
protected: protected:
static void _bind_methods(); static void _bind_methods();
//tool Variant value;
Variant = preload("res://addons/mat_maker_gd/nodes/bases/curve_base.gd");
// setget set_value CurveView *_curve_view;
Variant = null;
signal updated(curve);
}; };
#endif #endif

43
modules/material_maker/editor/widgets/curve_edit/curve_editor.ctscn
View File

@ -1,43 +0,0 @@
void construct() {
//Script: res://addons/mat_maker_gd/widgets/curve_edit/curve_editor.gd
Control *curveeditor = memnew(Control);
curveeditor->set_name("CurveEditor");
curveeditor->set_name("CurveEditor");
//curveeditor->set("name", CurveEditor));
curveeditor->set_filename("res://addons/mat_maker_gd/widgets/curve_edit/curve_editor.tscn");
//curveeditor->set("filename", "res://addons/mat_maker_gd/widgets/curve_edit/curve_editor.tscn");
curveeditor->set_anchor_right(1);
//curveeditor->set("anchor_right", 1);
curveeditor->set_anchor_bottom(1);
//curveeditor->set("anchor_bottom", 1);
curveeditor->set_margin_left(10);
//curveeditor->set("margin_left", 10);
curveeditor->set_margin_top(10);
//curveeditor->set("margin_top", 10);
curveeditor->set_margin_right(-10);
//curveeditor->set("margin_right", -10);
curveeditor->set_margin_bottom(-10);
//curveeditor->set("margin_bottom", -10);
curveeditor->set_rect_position(Vector2(10, 10));
//curveeditor->set("rect_position", Vector2(10, 10));
curveeditor->set_rect_global_position(Vector2(10, 10));
//curveeditor->set("rect_global_position", Vector2(10, 10));
//curveeditor property __meta__ TYPE_DICTIONARY value: {_edit_use_anchors_:False}
}