godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

renamed all Rect2.pos to Rect2.position

Browse Source
This commit is contained in:
alexholly
2017-06-04 00:25:13 +02:00
parent 69bec86028
commit a3c90b0293
84 changed files with 685 additions and 685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
editor/plugins/spatial_editor_plugin.cpp
View File

@@ -1752,10 +1752,10 @@ static void stroke_rect(CanvasItem *ci, Rect2 rect, Color color, real_t width =
// a---b
// | |
// c---d
Vector2 a(rect.pos);
Vector2 b(rect.pos.x + rect.size.x, rect.pos.y);
Vector2 c(rect.pos.x, rect.pos.y + rect.size.y);
Vector2 d(rect.pos + rect.size);
Vector2 a(rect.position);
Vector2 b(rect.position.x + rect.size.x, rect.position.y);
Vector2 c(rect.position.x, rect.position.y + rect.size.y);
Vector2 d(rect.position + rect.size);
ci->draw_line(a, b, color, width);
ci->draw_line(b, d, color, width);
@@ -1804,15 +1804,15 @@ void SpatialEditorViewport::_draw() {
case Camera::KEEP_WIDTH: {
draw_rect.size = Size2(s.width, s.width / aspect);
draw_rect.pos.x = 0;
draw_rect.pos.y = (s.height - draw_rect.size.y) * 0.5;
draw_rect.position.x = 0;
draw_rect.position.y = (s.height - draw_rect.size.y) * 0.5;
} break;
case Camera::KEEP_HEIGHT: {
draw_rect.size = Size2(s.height * aspect, s.height);
draw_rect.pos.y = 0;
draw_rect.pos.x = (s.width - draw_rect.size.x) * 0.5;
draw_rect.position.y = 0;
draw_rect.position.x = (s.width - draw_rect.size.x) * 0.5;
} break;
}
@@ -1846,7 +1846,7 @@ void SpatialEditorViewport::_draw() {
real_t sy = r.size.y * logscale_t;
surface->draw_rect(r, Color(1, 1, 1, 0.2));
surface->draw_rect(Rect2(r.pos.x, r.pos.y + r.size.y - sy, r.size.x, sy), Color(1, 1, 1, 0.6));
surface->draw_rect(Rect2(r.position.x, r.position.y + r.size.y - sy, r.size.x, sy), Color(1, 1, 1, 0.6));
stroke_rect(surface, r.grow(1), Color(0, 0, 0, 0.7));
}
}