Skip to content

Commit

Permalink
Fixed demos. Fixed direction calculation
Browse files Browse the repository at this point in the history
  • Loading branch information
arypbatista committed Feb 28, 2018
1 parent 02a053c commit d77d964
Show file tree
Hide file tree
Showing 42 changed files with 812 additions and 786 deletions.
10 changes: 5 additions & 5 deletions addons/swipe-detector/detection_state.gd
Expand Up @@ -7,8 +7,8 @@ var last_update_delta
var was_swiping

func _init(area_name=null):
self.area_name = area_name
capturing = false
gesture = null
last_update_delta = null
was_swiping = false
self.area_name = area_name
capturing = false
gesture = null
last_update_delta = null
was_swiping = false
16 changes: 8 additions & 8 deletions addons/swipe-detector/directions.gd
Expand Up @@ -9,12 +9,12 @@ const DIRECTION_DOWN_LEFT = 'down_left'
const DIRECTION_DOWN_RIGHT = 'down_right'

const DIRECTIONS = [
DIRECTION_DOWN,
DIRECTION_DOWN_RIGHT,
DIRECTION_RIGHT,
DIRECTION_UP_RIGHT,
DIRECTION_UP,
DIRECTION_UP_LEFT,
DIRECTION_LEFT,
DIRECTION_DOWN_LEFT
DIRECTION_DOWN,
DIRECTION_DOWN_RIGHT,
DIRECTION_RIGHT,
DIRECTION_UP_RIGHT,
DIRECTION_UP,
DIRECTION_UP_LEFT,
DIRECTION_LEFT,
DIRECTION_DOWN_LEFT
]
8 changes: 0 additions & 8 deletions addons/swipe-detector/icon.png.import
Expand Up @@ -4,14 +4,6 @@ importer="texture"
type="StreamTexture"
path="res://.import/icon.png-b60332a6acd93e3e505c096e8ada5608.stex"

[deps]

source_file="res://addons/swipe-detector/icon.png"
source_md5="36fb46fe5fdc3f60c8d52f9601e35a22"

dest_files=[ "res://.import/icon.png-b60332a6acd93e3e505c096e8ada5608.stex" ]
dest_md5="1207058f13d48af2c969e216d643aad6"

[params]

compress/mode=0
Expand Down
50 changes: 29 additions & 21 deletions addons/swipe-detector/input/event_swipe_input.gd
Expand Up @@ -5,41 +5,49 @@ const InputState = preload("res://addons/swipe-detector/input/input_state.gd" )
var states

func _init(detector).(detector):
states = {}
states = {}

func area_name(area):
if area != null:
return area.get_name()
else:
return '_singleton'
if area != null:
return area.get_name()
else:
return '_singleton'

func state(area):
if not states.has(area_name(area)):
states[area_name(area)] = InputState.new(area)
return states[area_name(area)]
if not states.has(area_name(area)):
states[area_name(area)] = InputState.new(area)
return states[area_name(area)]

func event_types():
return []
return []

func valid_event(event):
var is_valid = false
for type in event_types():
if event is type:
is_valid = true
break
return is_valid

func process_area_input(viewport, event, shape_id, area):
process_input(event, area)
process_input(event, area)

func process_input(event, area=null):
var state = state(area)
#if event.type in self.event_types():
if state.last_time == null:
state.delta = 0.0
else:
state.delta = (OS.get_ticks_msec() - state.last_time) / 1000.0
if valid_event(event):
var state = state(area)
if state.last_time == null:
state.delta = 0.0
else:
state.delta = (OS.get_ticks_msec() - state.last_time) / 1000.0

process_event(event, state.delta, state)
state.last_time = OS.get_ticks_msec()
process_event(event, state.delta, state)
state.last_time = OS.get_ticks_msec()

func process_event(event, delta, state):
pass
pass

func swiping(area):
return state(area).swiping
return state(area).swiping

func swipe_point(area):
return state(area).point
return state(area).point
14 changes: 7 additions & 7 deletions addons/swipe-detector/input/input_provider.gd
Expand Up @@ -4,12 +4,12 @@ const MouseSwipeInput = preload("res://addons/swipe-detector/input/mouse_swipe_i
const TouchSwipeInput = preload("res://addons/swipe-detector/input/touch_swipe_input.gd")

func on_touch_device():
return OS.get_name() in ['Android', 'iOS']
return OS.get_name() in ['Android', 'iOS']

func get_swipe_input(detector):
var swipe_input
if on_touch_device():
swipe_input = TouchSwipeInput.new(detector)
else:
swipe_input = MouseSwipeInput.new(detector)
return swipe_input
var swipe_input
if on_touch_device():
swipe_input = TouchSwipeInput.new(detector)
else:
swipe_input = MouseSwipeInput.new(detector)
return swipe_input

0 comments on commit d77d964

Please sign in to comment.