Rework the TileSet resource and TileMap nodes:
- Move most properties from TileMap to TileSet, - Make TileSet more flexible, supporting more feature (several collision layers, etc...), - Fusion both the TileMap and TileSet editor, - Implement TileSetSources, and thus a new way to index tiles in the TileSet, - Rework the TileSet and TileMap editors completely, - Implement an editor zoom widget (and use it in several places)
This commit is contained in:
parent
d81ea631d9
commit
a3dda2df85
48 changed files with 15216 additions and 10546 deletions
|
|
@ -395,6 +395,45 @@ public:
|
|||
H.resize(k);
|
||||
return H;
|
||||
}
|
||||
|
||||
static Vector<Point2i> bresenham_line(const Point2i &p_start, const Point2i &p_end) {
|
||||
Vector<Point2i> points;
|
||||
|
||||
Vector2i delta = (p_end - p_start).abs() * 2;
|
||||
Vector2i step = (p_end - p_start).sign();
|
||||
Vector2i current = p_start;
|
||||
|
||||
if (delta.x > delta.y) {
|
||||
int err = delta.x / 2;
|
||||
|
||||
for (; current.x != p_end.x; current.x += step.x) {
|
||||
points.push_back(current);
|
||||
|
||||
err -= delta.y;
|
||||
if (err < 0) {
|
||||
current.y += step.y;
|
||||
err += delta.x;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int err = delta.y / 2;
|
||||
|
||||
for (; current.y != p_end.y; current.y += step.y) {
|
||||
points.push_back(current);
|
||||
|
||||
err -= delta.x;
|
||||
if (err < 0) {
|
||||
current.x += step.x;
|
||||
err += delta.y;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
points.push_back(current);
|
||||
|
||||
return points;
|
||||
}
|
||||
|
||||
static Vector<Vector<Vector2>> decompose_polygon_in_convex(Vector<Point2> polygon);
|
||||
|
||||
static void make_atlas(const Vector<Size2i> &p_rects, Vector<Point2i> &r_result, Size2i &r_size);
|
||||
|
|
|
|||
|
|
@ -280,6 +280,14 @@ struct Vector2i {
|
|||
return p_idx ? y : x;
|
||||
}
|
||||
|
||||
Vector2i min(const Vector2i &p_vector2i) const {
|
||||
return Vector2(MIN(x, p_vector2i.x), MIN(y, p_vector2i.y));
|
||||
}
|
||||
|
||||
Vector2i max(const Vector2i &p_vector2i) const {
|
||||
return Vector2(MAX(x, p_vector2i.x), MAX(y, p_vector2i.y));
|
||||
}
|
||||
|
||||
Vector2i operator+(const Vector2i &p_v) const;
|
||||
void operator+=(const Vector2i &p_v);
|
||||
Vector2i operator-(const Vector2i &p_v) const;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue