From 993a22d3408135468824bb57b5cdb891694cc590 Mon Sep 17 00:00:00 2001 From: Tom Black Date: Thu, 2 Mar 2017 19:34:48 -0500 Subject: Update controller test --- lib/ruby2d/window.rb | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/ruby2d/window.rb b/lib/ruby2d/window.rb index e2b7c88..f449b9d 100644 --- a/lib/ruby2d/window.rb +++ b/lib/ruby2d/window.rb @@ -176,26 +176,8 @@ module Ruby2D true end - def controller_callback(which, is_axis, axis, val, is_btn, btn) - @on_controller_proc.call(which, is_axis, axis, val, is_btn, btn) - - if is_axis - if axis == 0 && val == -32768 - event = 'left' - elsif axis == 0 && val == 32767 - event = 'right' - elsif axis == 1 && val == -32768 - event = 'up' - elsif axis == 1 && val == 32767 - event = 'down' - end - elsif is_btn - event = btn - end - - if @controller.has_key? event - @controller[event].call - end + def controller_callback(which, is_axis, axis, val, is_btn, btn, pressed) + @on_controller_proc.call(which, is_axis, axis, val, is_btn, btn, pressed) end def update_callback -- cgit v1.2.3