From 0c23bf45f0383c29ccc170b657bf5dd6486c7a34 Mon Sep 17 00:00:00 2001 From: oakes Date: Thu, 8 May 2014 03:14:39 -0400 Subject: [PATCH] Pass actors in screen map using a consistent keyword --- 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 18c3d5a..3292605 100644 --- a/src/play_clj/core.clj +++ b/src/play_clj/core.clj @@ -270,7 +270,7 @@ via the screen map. :on-ui-enter ; the finger/mouse moved over the ui entity (fn [screen entities] (println (:event screen)) ; the InputEvent - http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/scenes/scene2d/InputEvent.html - (println (:from-actor screen)) ; the Actor - http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/scenes/scene2d/Actor.html + (println (:actor screen)) ; the Actor - http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/scenes/scene2d/Actor.html (println (:input-x screen)) ; the x position of the finger/mouse (println (:input-y screen)) ; the y position of the finger/mouse (println (:pointer screen)) ; the pointer for the event @@ -278,7 +278,7 @@ via the screen map. :on-ui-exit ; the finger/mouse moved out of the ui entity (fn [screen entities] (println (:event screen)) ; the InputEvent - http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/scenes/scene2d/InputEvent.html - (println (:to-actor screen)) ; the Actor - http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/scenes/scene2d/Actor.html + (println (:actor screen)) ; the Actor - http://libgdx.badlogicgames.com/nightlies/docs/api/com/badlogic/gdx/scenes/scene2d/Actor.html (println (:input-x screen)) ; the x position of the finger/mouse (println (:input-y screen)) ; the y position of the finger/mouse (println (:pointer screen)) ; the pointer for the event diff --git a/src/play_clj/core_listeners.clj b/src/play_clj/core_listeners.clj index 5e3b03c..9128bc3 100644 --- a/src/play_clj/core_listeners.clj +++ b/src/play_clj/core_listeners.clj @@ -118,10 +118,10 @@ (execute-fn! on-ui-clicked :event e :input-x x :input-y y)) (enter [e x y p a] (execute-fn! on-ui-enter - :event e :input-x x :input-y y :pointer p :from-actor a)) + :event e :input-x x :input-y y :pointer p :actor a)) (exit [e x y p a] (execute-fn! on-ui-exit - :event e :input-x x :input-y y :pointer p :to-actor a)) + :event e :input-x x :input-y y :pointer p :actor a)) (touchDown [e x y p b] (execute-fn! on-ui-touch-down :event e :input-x x :input-y y :pointer p :button b)