From a1f269a0bfb88fa99b359974447b442f4dd41b89 Mon Sep 17 00:00:00 2001 From: oakes Date: Fri, 9 May 2014 20:42:17 -0400 Subject: [PATCH] Start transitioning :keycode to :key so it is consistent with :button --- src/play_clj/core.clj | 4 ++-- src/play_clj/core_listeners.clj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/play_clj/core.clj b/src/play_clj/core.clj index 3292605..3d4dcb0 100644 --- a/src/play_clj/core.clj +++ b/src/play_clj/core.clj @@ -133,7 +133,7 @@ via the screen map. (defscreen my-screen :on-key-down ; a key was pressed (fn [screen entities] - (println (:keycode screen)) ; the code of the key (see key-code) + (println (:key screen)) ; the code of the key (see key-code) entities) :on-key-typed ; a key was typed (fn [screen entities] @@ -141,7 +141,7 @@ via the screen map. entities) :on-key-up ; a key was released (fn [screen entities] - (println (:keycode screen)) ; the code of the key (see key-code) + (println (:key screen)) ; the code of the key (see key-code) entities) :on-mouse-moved ; the mouse was moved without pressing any buttons (fn [screen entities] diff --git a/src/play_clj/core_listeners.clj b/src/play_clj/core_listeners.clj index 9128bc3..f76e482 100644 --- a/src/play_clj/core_listeners.clj +++ b/src/play_clj/core_listeners.clj @@ -8,13 +8,13 @@ execute-fn!] (reify InputProcessor (keyDown [this k] - (execute-fn! on-key-down :keycode k) + (execute-fn! on-key-down :key k :keycode k) false) (keyTyped [this c] (execute-fn! on-key-typed :character c) false) (keyUp [this k] - (execute-fn! on-key-up :keycode k) + (execute-fn! on-key-up :key k :keycode k) false) (mouseMoved [this sx sy] (execute-fn! on-mouse-moved :input-x sx :input-y sy)