veclavtalica/tochie-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move logic out of controller to context, fixed position_to_cell_position()

Browse Source
This commit is contained in:
veclav talica 2023-11-24 15:11:00 +05:00
parent 9441aa63cb
commit 29d68068ac
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nodes/GridContext.gd
View File

@ -7,7 +7,14 @@ class_name TK_GridContext
export var cell_size: Vector2 = Vector2(64, 64) export var cell_size: Vector2 = Vector2(64, 64)
func position_to_cell_position(p_position: Vector2) -> Vector2: func position_to_cell_position(p_position: Vector2) -> Vector2:
return Arithmetic.vector2_mod(global_position - p_position, cell_size) return p_position / cell_size
func is_cell_traversible(p_cell_position: Vector2) -> bool: func is_cell_traversible(p_cell_position: Vector2) -> bool:
return true return true
func try_moving(p_node: Node2D, p_cell_position: Vector2) -> bool:
if not is_cell_traversible(p_cell_position):
return false
p_node.position = cell_size * p_cell_position
return true

14
nodes/GridController.gd
View File

@ -4,19 +4,23 @@ class_name TK_GridController
## Composable 4-way grid controller. ## Composable 4-way grid controller.
## Depends on placement below some Node2D below some GridContext. ## Depends on placement below some Node2D below some GridContext.
# todo: Turn-based logic context.
signal moved(p_new_cell_position) signal moved(p_new_cell_position)
var _grid_context_cache: Node2D
func _enter_tree() -> void:
_grid_context_cache = _get_grid_context()
func _input(p_event: InputEvent): func _input(p_event: InputEvent):
var direction := InputUtils.input_event_to_4way_direction(p_event) var direction := InputUtils.input_event_to_4way_direction(p_event)
if direction == Vector2.ZERO: if direction == Vector2.ZERO:
return return
var context := _get_grid_context() var cell = _grid_context_cache.position_to_cell_position(get_parent().position)
var cell = context.position_to_cell_position(get_parent().global_position)
var new_cell = cell + direction var new_cell = cell + direction
if context.is_cell_traversible(new_cell): if _grid_context_cache.try_moving(get_parent(), new_cell):
# todo: Should we move the outmost node2d?
get_parent().position += context.cell_size * direction
emit_signal("moved", new_cell) emit_signal("moved", new_cell)
func _get_grid_context() -> Node: func _get_grid_context() -> Node: