From 7a83c3bf9fedf754b192790c0a1f0a61add23a51 Mon Sep 17 00:00:00 2001 From: oakes Date: Tue, 23 Sep 2014 15:54:59 -0400 Subject: [PATCH] Load skin with asset manager --- src/play_clj/ui.clj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/play_clj/ui.clj b/src/play_clj/ui.clj index 83934df..76acc40 100644 --- a/src/play_clj/ui.clj +++ b/src/play_clj/ui.clj @@ -41,9 +41,10 @@ based on the file at `path`. (skin \"uiskin.json\")" [path & options] - `(u/calls! ^Skin (Skin. (if (string? ~path) - (.internal ^Files (Gdx/files) ~path) - ~path)) + `(u/calls! ^Skin (or (u/load-asset ~path Skin) + (Skin. (if (string? ~path) + (.internal ^Files (Gdx/files) ~path) + ~path))) ~@options)) (defmacro skin!