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

camera shake.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-10 18:14:54 -07:00
parent 86f5b3484f
commit 4d154ce47f
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/src-common/advent/actions.clj
View File

@@ -880,3 +880,35 @@
(fade-out-georgia entities) (fade-out-georgia entities)
(do-stop entities :georgia-face) (do-stop entities :georgia-face)
(transition-music entities nil :duration 1.0)))) (transition-music entities nil :duration 1.0))))
(defn do-pan [entities x y scale-fn & [ease duration]]
(actions/run-action entities
(begin [this screen entities]
(pan-to screen entities x y scale-fn ease duration))
(continue [this screen entities]
entities)
(done? [this screen entities]
(nil? (get-in entities [:tweens :cam-y])))
(terminate [this screen entities]
entities)
(skip-type [this screen entities]
:none)))
(defn camera-shake [entities length]
(dotimes [n length]
(actions/do-pan entities (get-in @entities [:cam :x])
(+ (get-in @entities [:cam :y])
5)
(constantly (get-in @entities [:cam :zoom]))
nil
(* 0.01 (inc n)))
(actions/do-pan entities (get-in @entities [:cam :x])
(- (get-in @entities [:cam :y])
5)
(constantly (get-in @entities [:cam :zoom]))
nil
(* 0.01 (inc n)))))

2
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -263,6 +263,8 @@
(particle-effect! (get-in @entities [:room :entities :magic]) :allow-completion) (particle-effect! (get-in @entities [:room :entities :magic]) :allow-completion)
(actions/resume-camera entities) (actions/resume-camera entities)
(actions/transition-music entities nil) (actions/transition-music entities nil)
(actions/camera-shake entities 12)
(Thread/sleep 500)
(actions/do-dialogue entities :ego "That was weird." (actions/do-dialogue entities :ego "That was weird."
:ego "I have to go show my friends!") :ego "I have to go show my friends!")

5
desktop/src-common/advent/screens/rooms/inside_jail.clj
View File

@@ -258,7 +258,10 @@
(actions/do-dialogue entities :ego "Geronimo!!") (actions/do-dialogue entities :ego "Geronimo!!")
(actions/play-sound entities (actions/play-sound entities
"inside-jail/guard-crash.ogg" "inside-jail/guard-crash.ogg"
0.5) 0.6 false)
(actions/camera-shake entities 6)
(actions/begin-animation entities :warden :stand) (actions/begin-animation entities :warden :stand)
(Thread/sleep 300) (Thread/sleep 300)
(actions/do-dialogue entities (actions/do-dialogue entities