Remove origin-x and origin-y from shape
This commit is contained in:
@@ -86,29 +86,27 @@
|
||||
(.render renderer object attributes)))
|
||||
|
||||
(defrecord ShapeEntity [object] Entity
|
||||
(draw-entity! [{:keys [^ShapeRenderer object type draw! x y width height
|
||||
angle origin-x origin-y]}
|
||||
(draw-entity! [{:keys [^ShapeRenderer object type draw! x y
|
||||
scale-x scale-y angle]}
|
||||
{:keys [^Camera camera]}
|
||||
batch]
|
||||
(when batch
|
||||
(.end ^SpriteBatch batch))
|
||||
(when (or x y)
|
||||
(let [^Matrix4 m (.getTransformMatrix object)
|
||||
x (float (or x 0))
|
||||
y (float (or y 0))]
|
||||
(.setTranslation m x y 0)
|
||||
(.setTransformMatrix object m)))
|
||||
(when batch
|
||||
(.end ^SpriteBatch batch))
|
||||
(when camera
|
||||
(.setProjectionMatrix object (. camera combined)))
|
||||
(.begin object type)
|
||||
(when angle
|
||||
(let [x (float (or x 0))
|
||||
y (float (or y 0))
|
||||
origin-x (float (or origin-x (/ (or width 0) 2)))
|
||||
origin-y (float (or origin-y (/ (or height 0) 2)))
|
||||
(when (or scale-x scale-y angle)
|
||||
(let [scale-x (float (or scale-x 1))
|
||||
scale-y (float (or scale-y 1))
|
||||
angle (float (or angle 0))]
|
||||
(.identity object)
|
||||
(.translate object (+ x origin-x) (+ y origin-y) 0)
|
||||
(.scale object scale-x scale-y 1)
|
||||
(.rotate object 0 0 1 angle)))
|
||||
(draw!)
|
||||
(.end object)
|
||||
|
||||
Reference in New Issue
Block a user