Make Segments handle dragging and swiping

Fixes #29 Have only one (1) touchzone per piece

And simplifies the code to boot

Author: thunderrabbit

Game.gd

@@ -305,7 +305,8 @@ func nail_player():
 ######################################
 #
 #  Called when user starts dragging a piece.
-func piece_being_dragged():
+#  param piece is not needed except for function whatstheword? function matching?  Fixes #26
+func piece_being_dragged(piece):
 	stop_gravity_timer()		# level timer still going
 
 ######################################

GameSwipeDetector.gd

@@ -8,7 +8,7 @@ var swipe_array = []						# the pieces in the swipe
 var swipe_shape = null						# will animate shape user swiped
 var wasted_swipes = 0						# count against score
 var Game									# will point to GameNode
-enum SwipeState {IDLE, SWIPE = 5, DRAG}		# how should _input_event respond
+var SwipeState = preload("res://enums/SwipeState.gd")
 var swipe_state = SwipeState.SWIPE
 var dragging_piece = null					# when dragging a piece, this will refer to it
 

enums/SwipeOptions.gd

@@ -0,0 +1,3 @@
+# used by Segment
+
+enum SwipeOptions {CANNOT, CAN_SWIPE = 9, CAN_DRAG}		# can Swipe or Drag be activated?  Shadows CANNOT!

enums/SwipeState.gd

@@ -0,0 +1,3 @@
+# used by GameSwipeDetector and Segment
+
+enum SwipeState {IDLE, SWIPE = 5, DRAG}		# how should _input_event respond

subscenes/Player.gd

@@ -16,7 +16,6 @@
 extends Node
 
 const Segment = preload("res://tiles/Segment.tscn")
-const PlayerArea = preload("res://tiles/PlayerArea2D.tscn")
 
 var mytile = null	# visible in queue, while moving, when nailed
 var myshadow = null	# only visible when moving
@@ -54,11 +53,9 @@ func set_draggable(candrag):
 func set_player_position(player_position):
 	my_position = player_position
 	mytile.set_position(Helpers.slot_to_pixels(player_position))
-	if nailed:
-		mytouchzone.set_position(Helpers.slot_to_pixels(player_position))
-	else:
+	if not nailed:
+		# TODO make Helpers.shadowheight or column height
 		myshadow.set_position(Helpers.slot_to_pixels(Vector2(player_position.x, column_height(player_position.x))))   ## shadow
-	#	var shadowsprite = myshadow.get_node("TileSprite")
 		if myshadow != null:
 			if should_show_shadow:
 				myshadow.show()
@@ -68,23 +65,13 @@ func set_player_position(player_position):
 # player has been nailed so it should animate or whatever
 func nail_player():
 	# now that we are nailed, we cannot be dragged
-	set_draggable(false)
-	# now that we are nailed, we are touchable
-	mytouchzone = PlayerArea.instance()
-	mytouchzone.set_tile_type(tile_type)
-	mytouchzone.become_swipable()
-	mytouchzone.set_position(Helpers.slot_to_pixels(my_position))
-	mytouchzone.set_process_input(true)
-	mytouchzone.set_pickable(true)
-	add_child(mytouchzone)
-	print(mytouchzone.position)
-	print(mytouchzone.global_position)
+	mytile.set_draggable(false)
+	mytile.set_swipeable(true)
 
 	# now that we are nailed, we have no shadow
 	myshadow.queue_free()
 	nailed = true
-	pass
-	
+
 func column_height(column):
 	var height = Helpers.slots_down-1
 	for i in range(Helpers.slots_down-1,0,-1):
@@ -124,5 +111,4 @@ func level_ended():
 func remove_yourself():
 	remove_from_group("players")
 	Helpers.board[my_position] = null
-	mytouchzone.queue_free()
 	mytile.start_swipe_effect()		# release yourself

tiles/PlayerArea2D.gd

@@ -17,10 +17,18 @@ extends Sprite
 
 signal drag_started(piece)
 signal drag_ended
+signal clicked(piece)
+signal unclicked
+signal entered(piece)
+signal exited
 
+var tile_type
 var sprite_loc = []
-var draggable = false		# cannot drag unless is Player.mytile and is active in play area
-var dragging = false		# if true, means mouse is actively dragging
+var SwipeOptions = preload("res://enums/SwipeOptions.gd")
+var swipe_options = SwipeOptions.CANNOT
+
+var SwipeState = preload("res://enums/SwipeState.gd")
+var swipe_state = SwipeState.IDLE
 
 const wd = 100.0			# width of each sprite image in items.png
 const ht = 100.0			# height of each sprite images in items.png
@@ -30,6 +38,10 @@ func _ready():
 	self.connect("drag_started", get_node("/root/GameNode2D/GameSwipeDetector"), "piece_being_dragged")
 	self.connect("drag_ended", get_node("/root/GameNode2D"), "piece_done_dragged")
 	self.connect("drag_ended", get_node("/root/GameNode2D/GameSwipeDetector"), "piece_done_dragged")
+	self.connect("clicked", get_node("/root/GameNode2D/GameSwipeDetector"), "piece_clicked")
+	self.connect("unclicked", get_node("/root/GameNode2D/GameSwipeDetector"), "piece_unclicked")
+	self.connect("entered", get_node("/root/GameNode2D/GameSwipeDetector"), "piece_entered")
+	self.connect("exited", get_node("/root/GameNode2D/GameSwipeDetector"), "piece_exited")
 
 func _init():
 	# within the image map, these are the locations of the tiles
@@ -43,10 +55,10 @@ func _init():
 	sprite_loc.push_back(Rect2(6 * wd, 0, wd, ht));		# dog?
 
 func set_tile_type(my_tile_type):
-	var icon = my_tile_type   # Fack figure out Database later	TileDatabase.get_item_sprite(my_type_ordinal)
+	self.tile_type = my_tile_type   # TODO: figure out Database later	TileDatabase.get_item_sprite(my_type_ordinal)
 	set_texture(preload("res://images/items.png"))		# res://images/items.png is a spritesheet
 	set_region(true)									# we want a small part of it
-	set_region_rect(sprite_loc[icon])					# this is the part we want
+	set_region_rect(sprite_loc[self.tile_type])					# this is the part we want
 	set_scale(Vector2(G.SLOT_SIZE/wd,G.SLOT_SIZE/ht))
 
 # This will be called by GameScene
@@ -58,7 +70,17 @@ func start_swipe_effect():
 
 # only the Player tiles will be set draggable (not the shadows)
 func set_draggable(candrag):
-	self.draggable = candrag
+	if candrag:
+		self.swipe_options = SwipeOptions.CAN_DRAG
+	else:
+		self.swipe_options = SwipeOptions.CANNOT
+
+# this is set by Player
+func set_swipeable(canswipe):
+	if canswipe:
+		self.swipe_options = SwipeOptions.CAN_SWIPE
+	else:
+		self.swipe_options = SwipeOptions.CANNOT
 
 func is_shadow():
 	set_modulate(Color(1,1,1, 0.3))
@@ -77,17 +99,50 @@ func darken():
 
 
 func _on_Area2D_input_event( viewport, event, shape_idx ):
-	if not draggable:
-		return
-
+	match swipe_options:
+		SwipeOptions.CANNOT:
+			return
+		SwipeOptions.CAN_DRAG:
+			_on_Segment_can_drag(event)
+		SwipeOptions.CAN_SWIPE:
+			_on_Segment_can_swipe(event)
+
+func _on_Segment_can_drag(event):
 	if  event is InputEventScreenTouch or event is InputEventMouseButton:
 		if event.pressed:
-			dragging = true
+			swipe_state = SwipeState.DRAG
 			# need to tell Game to stop gravity
 			emit_signal("drag_started", self)
 		else: # not event.pressed:
 			emit_signal("drag_ended", Helpers.pixels_to_slot(position))
 			# need to tell Game to start gravity
-			dragging = false
-	if dragging:
-		position = get_viewport().get_mouse_position()
+			swipe_state = SwipeState.IDLE
+
+func _on_Segment_can_swipe(event):
+	print("swipe seg clicked or unclicked")
+	if swipe_options != SwipeOptions.CAN_SWIPE:
+		print("but not swipable (wtf how did we get past gateway func)")
+		return
+	if event is InputEventScreenTouch or event is InputEventMouseButton:
+		if event.pressed:
+			print("swipe seg clicked")
+			emit_signal("clicked", Helpers.pixels_to_slot(get_position()), self.tile_type)
+		else: # not event.pressed:
+			print("swipe seg unclicked")
+			emit_signal("unclicked")
+
+
+func _on_Segment_mouse_entered():
+	print("segment entered")
+	if swipe_options != SwipeOptions.CAN_SWIPE:
+		print("but not swipeable")
+		return
+	emit_signal("entered", Helpers.pixels_to_slot(get_position()), self.tile_type)
+
+func _on_Segment_mouse_exited():
+	print("segment exited")
+	if swipe_options != SwipeOptions.CAN_SWIPE:
+		print("but not swipeable")
+		return
+	emit_signal("exited", Helpers.pixels_to_slot(get_position()), self.tile_type)
+

tiles/Segment.gd

@@ -30,4 +30,8 @@ shape = SubResource( 1 )
 
 [connection signal="input_event" from="Area2D" to="." method="_on_Area2D_input_event"]
 
+[connection signal="mouse_entered" from="Area2D" to="." method="_on_Segment_mouse_entered"]
+
+[connection signal="mouse_exited" from="Area2D" to="." method="_on_Segment_mouse_exited"]
+