Permalink
Browse files

Remove gamepad-info and db stuff as it has been moved into the cl-gam…

…epad system.
  • Loading branch information...
Shinmera committed Dec 3, 2017
1 parent cccc9c7 commit bccdf4b3dea172cead543a2986abfa9a683c9d5a
Showing with 8 additions and 279 deletions.
  1. +0 −169 gamepad-db.lisp
  2. +0 −100 gamepad-info.lisp
  3. +7 −7 gamepad.lisp
  4. +1 −3 trial.asd
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View
@@ -39,9 +39,8 @@
(init-gamepad-system)
(defun cl-gamepad:device-attached (device)
(v:info :trial.input.gamepad "Attached ~s (~:[Unknown~;~:*~a~])"
(cl-gamepad:print-device device NIL)
(gamepad-info device))
(v:info :trial.input.gamepad "Attached ~s"
(cl-gamepad:print-device device NIL))
(dolist (handler *gamepad-handlers*)
(handle (make-instance 'gamepad-attach :device device) handler)))
@@ -52,20 +51,21 @@
(defun cl-gamepad:button-pressed (button time device)
(declare (ignore time))
(let ((button (gamepad-button device button)))
(let ((button (cl-gamepad:button-label device button)))
(v:trace :trial.input.gamepad "~a pressed ~a" (cl-gamepad:id device) button)
(dolist (handler *gamepad-handlers*)
(handle (make-instance 'gamepad-press :button button :device device) handler))))
(defun cl-gamepad:button-released (button time device)
(declare (ignore time))
(let ((button (gamepad-button device button)))
(let ((button (cl-gamepad:button-label device button)))
(v:trace :trial.input.gamepad "~a released ~a" (cl-gamepad:id device) button)
(dolist (handler *gamepad-handlers*)
(handle (make-instance 'gamepad-release :button button :device device) handler))))
(defun cl-gamepad:axis-moved (axis last-value value time device)
(declare (ignore time))
(destructuring-bind (axis modifier) (gamepad-axis device axis)
(let ((axis (cl-gamepad:axis-label device axis))
(mult (cl-gamepad:axis-multiplier device axis)))
(dolist (handler *gamepad-handlers*)
(handle (make-instance 'gamepad-move :axis axis :old-pos (* modifier last-value) :pos (* modifier value) :device device) handler))))
(handle (make-instance 'gamepad-move :axis axis :old-pos (* mult last-value) :pos (* mult value) :device device) handler))))
View
@@ -38,9 +38,7 @@
(:file "features" :depends-on ("package"))
(:file "flare" :depends-on ("package" "transforms"))
(:file "fullscreenable" :depends-on ("package" "display"))
(:file "gamepad-db" :depends-on ("package" "gamepad-info"))
(:file "gamepad-info" :depends-on ("package"))
(:file "gamepad" :depends-on ("package" "event-loop" "gamepad-info" "toolkit"))
(:file "gamepad" :depends-on ("package" "event-loop" "toolkit"))
(:file "geometry" :depends-on ("package" "toolkit" "static-vector" ("assets" "vertex-array")))
(:file "geometry-clipmap" :depends-on ("package" "geometry-shapes" "shader-subject"))
(:file "geometry-shapes" :depends-on ("package" "geometry" "asset-pool"))

0 comments on commit bccdf4b

Please sign in to comment.