tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-08-11 09:54:43 -04:00
Code Issues Projects Releases Wiki Activity

One shared offset for rectangular and isometric grids, added "Draw Grid over Tile Mode" toggle (#434)

Browse source 
* One shared offset for rectangular and isometric grids

* One draw call per grid

* Added "Draw Grid over Tile Mode" toggle
This commit is contained in:
kleonc 2021-01-20 01:17:33 +01:00 • committed by GitHub
parent c60fb0632e
commit eeb97f71e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 110 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/UI/Canvas/Grid.gd
View file

@ -5,22 +5,43 @@ func _draw() -> void:
if not Global.draw_grid:
return
var rect := Rect2(Vector2.ZERO, Global.current_project.size)
if rect.has_no_area():
var target_rect : Rect2
if Global.grid_draw_over_tile_mode:
target_rect = Global.current_project.get_tile_mode_rect()
else:
target_rect = Rect2(Vector2.ZERO, Global.current_project.size)
if target_rect.has_no_area():
return
var grid_type : int = Global.grid_type
if grid_type == Global.Grid_Types.CARTESIAN || grid_type == Global.Grid_Types.ALL:
var start_x : float = wrapf(0, rect.position.x, rect.position.x + Global.grid_width)
for x in range(start_x, rect.end.x + 1, Global.grid_width):
draw_line(Vector2(x, rect.position.y), Vector2(x, rect.end.y), Global.grid_color)
var start_y : float = wrapf(0, rect.position.y, rect.position.y + Global.grid_height)
for y in range(start_y, rect.end.y + 1, Global.grid_height):
draw_line(Vector2(rect.position.x, y), Vector2(rect.end.x, y), Global.grid_color)
_draw_cartesian_grid(target_rect)
if grid_type == Global.Grid_Types.ISOMETRIC || grid_type == Global.Grid_Types.ALL:
_draw_isometric_grid(rect)
_draw_isometric_grid(target_rect)
func _draw_cartesian_grid(target_rect : Rect2) -> void:
# Using Array instead of PoolVector2Array to avoid kinda
# random "resize: Can't resize PoolVector if locked" errors.
# See: https://github.com/Orama-Interactive/Pixelorama/issues/331
# It will be converted to PoolVector2Array before being sent to be rendered.
var grid_multiline_points := []
var x : float = target_rect.position.x + fposmod(Global.grid_offset_x - target_rect.position.x, Global.grid_width)
while x <= target_rect.end.x:
grid_multiline_points.push_back(Vector2(x, target_rect.position.y))
grid_multiline_points.push_back(Vector2(x, target_rect.end.y))
x += Global.grid_width
var y : float = target_rect.position.y + fposmod(Global.grid_offset_y - target_rect.position.y, Global.grid_height)
while y <= target_rect.end.y:
grid_multiline_points.push_back(Vector2(target_rect.position.x, y))
grid_multiline_points.push_back(Vector2(target_rect.end.x, y))
y += Global.grid_height
if not grid_multiline_points.empty():
draw_multiline(grid_multiline_points, Global.grid_color)
func _draw_isometric_grid(target_rect : Rect2) -> void:
@ -33,7 +54,7 @@ func _draw_isometric_grid(target_rect : Rect2) -> void:
var cell_size := Vector2(Global.grid_isometric_cell_bounds_width, Global.grid_isometric_cell_bounds_height)
var max_cell_count : Vector2 = target_rect.size / cell_size
var origin := Vector2(Global.grid_isometric_offset_x, Global.grid_isometric_offset_y)
var origin := Vector2(Global.grid_offset_x, Global.grid_offset_y)
var origin_offset : Vector2 = (origin - target_rect.position).posmodv(cell_size)
# lines ↗↗↗ (from bottom-left to top-right)

24
src/UI/Canvas/PixelGrid.gd
View file

@ -9,11 +9,23 @@ func _draw() -> void:
if zoom_percentage < Global.pixel_grid_show_at_zoom:
return
var rect : Rect2 = Global.current_project.get_tile_mode_rect()
if rect.has_no_area():
var target_rect : Rect2 = Global.current_project.get_tile_mode_rect()
if target_rect.has_no_area():
return
for x in range(ceil(rect.position.x), floor(rect.end.x) + 1):
draw_line(Vector2(x, rect.position.y), Vector2(x, rect.end.y), Global.pixel_grid_color)
for y in range(ceil(rect.position.y), floor(rect.end.y) + 1):
draw_line(Vector2(rect.position.x, y), Vector2(rect.end.x, y), Global.pixel_grid_color)
# Using Array instead of PoolVector2Array to avoid kinda
# random "resize: Can't resize PoolVector if locked" errors.
# See: https://github.com/Orama-Interactive/Pixelorama/issues/331
# It will be converted to PoolVector2Array before being sent to be rendered.
var grid_multiline_points := []
for x in range(ceil(target_rect.position.x), floor(target_rect.end.x) + 1):
grid_multiline_points.push_back(Vector2(x, target_rect.position.y))
grid_multiline_points.push_back(Vector2(x, target_rect.end.y))
for y in range(ceil(target_rect.position.y), floor(target_rect.end.y) + 1):
grid_multiline_points.push_back(Vector2(target_rect.position.x, y))
grid_multiline_points.push_back(Vector2(target_rect.end.x, y))
if not grid_multiline_points.empty():
draw_multiline(grid_multiline_points, Global.pixel_grid_color)