progress on scene.

This commit is contained in:
2015-05-11 20:23:47 -07:00
parent cfa462bc1c
commit c6aad2a33b
18 changed files with 80 additions and 14 deletions

View File

@@ -364,6 +364,7 @@ void main()
axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)]))
axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 11)]))
suspended (utils/make-anim "ego/suspended.png" [18 36] 0.10 [0])
suspended-talk (utils/make-anim "ego/suspended.png" [18 36] 0.20 [0 1])
ego {:right {:walk walk-right
:stand stand-anim
@@ -409,6 +410,7 @@ void main()
:axe axe
:axe-wood axe-wood
:suspended suspended
:suspended-talk suspended-talk
}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
@@ -444,7 +446,9 @@ void main()
:idea (utils/flip idea)
:axe (utils/flip axe)
:axe-wood (utils/flip axe-wood)
:suspended (utils/flip suspended)}
:suspended (utils/flip suspended)
:suspended-talk (utils/flip suspended-talk)
}
:baseline (- 240 (last start-pos))
:facing :right
:night-profile :sprite
@@ -537,6 +541,8 @@ void main()
(get-in ego [:left :love]) {:origin-x 36}
(get-in ego [:left :suspended]) {:origin-x 0 :origin-y 0}
(get-in ego [:right :suspended]) {:origin-x 0 :origin-y 0}
(get-in ego [:left :suspended-talk]) {:origin-x 0 :origin-y 0}
(get-in ego [:right :suspended-talk]) {:origin-x 0 :origin-y 0}
:default {:origin-x 9}})]
(actions/start-animation screen
(merge (animation->texture screen (:stand (:right ego))) ego)