Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-23 12:26:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the offset property from PaintCurve2D.

Browse Source
This commit is contained in:
Relintai 2023-08-26 20:27:33 +02:00
parent 632ee28564
commit bc99a23af0
2 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/paint/nodes/curve_2d/paint_curve_2d.cpp
View File

@ -39,30 +39,6 @@
#endif
#ifdef TOOLS_ENABLED
Dictionary PaintCurve2D::_edit_get_state() const {
Dictionary state = Node2D::_edit_get_state();
state["offset"] = offset;
return state;
}
void PaintCurve2D::_edit_set_state(const Dictionary &p_state) {
Node2D::_edit_set_state(p_state);
set_offset(p_state["offset"]);
}
void PaintCurve2D::_edit_set_pivot(const Point2 &p_pivot) {
set_position(get_transform().xform(p_pivot));
set_offset(get_offset() - p_pivot);
}
Point2 PaintCurve2D::_edit_get_pivot() const {
return Vector2();
}
bool PaintCurve2D::_edit_use_pivot() const {
return true;
}
Rect2 PaintCurve2D::_edit_get_rect() const {
if (rect_cache_dirty) {
if (!curve.is_valid() || curve->get_point_count() == 0) {
@ -78,6 +54,7 @@ Rect2 PaintCurve2D::_edit_get_rect() const {
item_rect.expand_to(p);
}
}
rect_cache_dirty = false;
}
@ -144,7 +121,7 @@ void PaintCurve2D::_notification(int p_what) {
int len = _cached_draw_pts.size();
Vector2 *ppw = _cached_draw_pts.ptrw();
for (int i = 0; i < len; i++) {
ppw[i] = ppw[i] + offset;
ppw[i] = ppw[i];
}
}
@ -181,17 +158,6 @@ Ref<Curve2D> PaintCurve2D::get_curve() const {
return curve;
}
void PaintCurve2D::set_offset(const Vector2 &p_offset) {
offset = p_offset;
rect_cache_dirty = true;
update();
_change_notify("offset");
}
Vector2 PaintCurve2D::get_offset() const {
return offset;
}
void PaintCurve2D::fill_set_enabled(bool p_enabled) {
_fill_enabled = p_enabled;
update();
@ -678,7 +644,7 @@ void PaintCurve2D::_prepare_render_data_fill(Vector<Vector2> &r_points, Vector<V
{
PoolVector<Vector2>::Read polyr = polygon.read();
for (int i = 0; i < len; i++) {
r_points.write[i] = polyr[i] + offset;
r_points.write[i] = polyr[i];
}
}
@ -758,9 +724,6 @@ void PaintCurve2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_curve", "curve"), &PaintCurve2D::set_curve);
ClassDB::bind_method(D_METHOD("get_curve"), &PaintCurve2D::get_curve);
ClassDB::bind_method(D_METHOD("set_offset", "offset"), &PaintCurve2D::set_offset);
ClassDB::bind_method(D_METHOD("get_offset"), &PaintCurve2D::get_offset);
ClassDB::bind_method(D_METHOD("fill_set_enabled", "enabled"), &PaintCurve2D::fill_set_enabled);
ClassDB::bind_method(D_METHOD("fill_get_enabled"), &PaintCurve2D::fill_get_enabled);
@ -819,7 +782,6 @@ void PaintCurve2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("outline_get_antialiased"), &PaintCurve2D::outline_get_antialiased);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve2D"), "set_curve", "get_curve");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "offset"), "set_offset", "get_offset");
ADD_GROUP("Fill", "fill_");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fill_enabled"), "fill_set_enabled", "fill_get_enabled");

11
modules/paint/nodes/curve_2d/paint_curve_2d.h
View File

@ -40,13 +40,6 @@ class PaintCurve2D : public PaintNode {
public:
#ifdef TOOLS_ENABLED
virtual Dictionary _edit_get_state() const;
virtual void _edit_set_state(const Dictionary &p_state);
virtual void _edit_set_pivot(const Point2 &p_pivot);
virtual Point2 _edit_get_pivot() const;
virtual bool _edit_use_pivot() const;
virtual Rect2 _edit_get_rect() const;
virtual bool _edit_use_rect() const;
virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
@ -55,9 +48,6 @@ public:
void set_curve(const Ref<Curve2D> &p_curve);
Ref<Curve2D> get_curve() const;
void set_offset(const Vector2 &p_offset);
Vector2 get_offset() const;
void fill_set_enabled(bool p_enabled);
bool fill_get_enabled() const;
@ -130,7 +120,6 @@ protected:
protected:
Ref<Curve2D> curve;
Vector2 offset;
bool _fill_enabled;
Color _fill_color;