Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-08 21:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Work on layered tile maps.

Browse Source
This commit is contained in:
Relintai 2024-03-04 22:15:59 +01:00
parent 3e533b33bb
commit 4abb1a23e9
3 changed files with 311 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/math/geometry.h
View File

@ -898,6 +898,19 @@ public:
return (intersections & 1); return (intersections & 1);
} }
static bool is_segment_intersecting_polygon(const Vector2 &p_from, const Vector2 &p_to, const Vector<Vector2> &p_polygon) {
int c = p_polygon.size();
const Vector2 *p = p_polygon.ptr();
for (int i = 0; i < c; i++) {
const Vector2 &v1 = p[i];
const Vector2 &v2 = p[(i + 1) % c];
if (segment_intersects_segment_2d(p_from, p_to, v1, v2, nullptr)) {
return true;
}
}
return false;
}
static PoolVector<PoolVector<Face3>> separate_objects(PoolVector<Face3> p_array); static PoolVector<PoolVector<Face3>> separate_objects(PoolVector<Face3> p_array);
// Create a "wrap" that encloses the given geometry. // Create a "wrap" that encloses the given geometry.

525
modules/layered_tile_map/editor/layered_tile_data_editors.cpp
View File

File diff suppressed because it is too large Load Diff

11
modules/layered_tile_map/editor/layered_tile_data_editors.h
View File

@ -168,6 +168,8 @@ private:
void _set_snap_option(int p_index); void _set_snap_option(int p_index);
void _store_snap_options(); void _store_snap_options();
void _toggle_expand(bool p_expand); void _toggle_expand(bool p_expand);
void _snap_subdivision_value_changed(real_t p_value);
void _editor_zoom_widget_zoom_changed(real_t p_value);
void _snap_to_tile_shape(Point2 &r_point, float &r_current_snapped_dist, float p_snap_dist); void _snap_to_tile_shape(Point2 &r_point, float &r_current_snapped_dist, float p_snap_dist);
void _snap_point(Point2 &r_point); void _snap_point(Point2 &r_point);
@ -224,7 +226,7 @@ private:
HashMap<LayeredTileMapCell, Variant, LayeredTileMapCell> drag_modified; HashMap<LayeredTileMapCell, Variant, LayeredTileMapCell> drag_modified;
Variant drag_painted_value; Variant drag_painted_value;
void _property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field); void _property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field, bool p_changing = false);
protected: protected:
DummyObject *dummy_object = memnew(DummyObject); DummyObject *dummy_object = memnew(DummyObject);
@ -233,6 +235,7 @@ protected:
String property; String property;
Variant::Type property_type; Variant::Type property_type;
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods();
virtual Variant _get_painted_value(); virtual Variant _get_painted_value();
virtual void _set_painted_value(LayeredTileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile); virtual void _set_painted_value(LayeredTileSetAtlasSource *p_tile_set_atlas_source, Vector2 p_coords, int p_alternative_tile);
@ -316,7 +319,7 @@ class TileDataCollisionEditor : public TileDataDefaultEditor {
DummyObject *dummy_object = memnew(DummyObject); DummyObject *dummy_object = memnew(DummyObject);
HashMap<StringName, EditorProperty *> property_editors; HashMap<StringName, EditorProperty *> property_editors;
void _property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field); void _property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field, bool p_changing = false);
void _property_selected(const StringName &p_path, int p_focusable); void _property_selected(const StringName &p_path, int p_focusable);
void _polygons_changed(); void _polygons_changed();
@ -330,6 +333,7 @@ protected:
virtual void _tile_set_changed(); virtual void _tile_set_changed();
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods();
public: public:
virtual void draw_over_tile(CanvasItem *p_canvas_item, Transform2D p_transform, LayeredTileMapCell p_cell, bool p_selected = false); virtual void draw_over_tile(CanvasItem *p_canvas_item, Transform2D p_transform, LayeredTileMapCell p_cell, bool p_selected = false);
@ -368,7 +372,7 @@ private:
EditorPropertyEnum *terrain_set_property_editor = nullptr; EditorPropertyEnum *terrain_set_property_editor = nullptr;
EditorPropertyEnum *terrain_property_editor = nullptr; EditorPropertyEnum *terrain_property_editor = nullptr;
void _property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field); void _property_value_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field, bool p_changing = false);
void _update_terrain_selector(); void _update_terrain_selector();
@ -376,6 +380,7 @@ protected:
virtual void _tile_set_changed(); virtual void _tile_set_changed();
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods();
public: public:
virtual Control *get_toolbar() override { return toolbar; }; virtual Control *get_toolbar() override { return toolbar; };