notid/play-clj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow ModelInstance constructors to work

Browse Source
This commit is contained in:
oakes
2014-05-21 22:18:10 -04:00
parent 88bb6e54e3
commit 57673614d4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/play_clj/g3d.clj
View File

@@ -86,9 +86,9 @@
(cond (cond
(string? arg1#) (string? arg1#)
(ModelInstance. (model* arg1#)) (ModelInstance. (model* arg1#))
(:object arg1#) (isa? (type arg1#) ModelEntity)
(ModelInstance. ^ModelInstance (:object arg1#)) (ModelInstance. (. ^ModelInstance (:object arg1#) model) ~@(rest args))
(isa? arg1# ModelData) (isa? (type arg1#) ModelData)
(ModelInstance. ^Model (Model. ~@args)) (ModelInstance. ^Model (Model. ~@args))
:else :else
(ModelInstance. ~@args))))) (ModelInstance. ~@args)))))