betalars
/
frame-of-mind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove dragableType and replace it with meta-type

This commit is contained in:
Adrian Schmid 2023-07-02 10:19:15 +02:00
parent c2188316ab
commit 45fb225e54
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/logic-scenes/board/card-board.gd
View File

@ -54,7 +54,7 @@ func is_in_dropzone(to_check: Node) -> bool:
else: else:
return true return true
func handle_mouse_button(to_handle: Area2D, input: InputEvent, dragableType: int): func handle_mouse_button(to_handle: Area2D, input: InputEvent):
# No two areas can be dragged at the same time. # No two areas can be dragged at the same time.
# Make sure that only the same area is dragged. # Make sure that only the same area is dragged.
@ -70,14 +70,13 @@ func handle_mouse_button(to_handle: Area2D, input: InputEvent, dragableType: int
# TODO: We need a better way to recognize whether "to_handle" is a Card or a Post-It. # TODO: We need a better way to recognize whether "to_handle" is a Card or a Post-It.
# (Tried checking for a script, didn't work, because script has no name attached. # (Tried checking for a script, didn't work, because script has no name attached.
# Alternative might be to check for specific values within the script ("is_card" f.e)) # Alternative might be to check for specific values within the script ("is_card" f.e))
match dragableType: match to_handle.get_meta("type"):
1: # 1 = Card "card": # 1 = Card
if input.is_pressed(): if input.is_pressed():
# TODO: Add function to rearrange the array based on positions in the dropzone reorder_areas("dropzone_content")
print_debug(":)")
else: else:
currently_dragged_area = null currently_dragged_area = null
2: # 2 = PostIt "post-it": # 2 = PostIt
if input.is_pressed(): if input.is_pressed():
to_handle.reparent(dropzone) to_handle.reparent(dropzone)
to_handle.set_owner(self) # needs to be here otherwise the owner disappears to_handle.set_owner(self) # needs to be here otherwise the owner disappears

2
src/logic-scenes/board/card.gd
View File

@ -111,5 +111,5 @@ func _on_input_event(viewport, event, shape_idx):
if event is InputEventMouseButton: if event is InputEventMouseButton:
if event.button_index == MOUSE_BUTTON_LEFT: if event.button_index == MOUSE_BUTTON_LEFT:
if is_dragable and "handle_mouse_button" in owner: if is_dragable and "handle_mouse_button" in owner:
owner.handle_mouse_button(self, event, 1) owner.handle_mouse_button(self, event)

2
src/logic-scenes/board/post-it.gd
View File

@ -86,5 +86,5 @@ func _on_input_event(viewport, event, shape_idx):
if event is InputEventMouseButton: if event is InputEventMouseButton:
if event.button_index == MOUSE_BUTTON_LEFT: if event.button_index == MOUSE_BUTTON_LEFT:
if is_dragable and "handle_mouse_button" in owner: if is_dragable and "handle_mouse_button" in owner:
owner.handle_mouse_button(self, event, 2) owner.handle_mouse_button(self, event)