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

progress on getting ios version working well.

Browse Source
This commit is contained in:
Bryce Covert
2017-02-19 18:31:11 -08:00
parent 00a90e2313
commit 9c7946384e
7 changed files with 103 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
desktop/src-common/advent/screens/scene.clj
View File

@@ -181,7 +181,8 @@
(and (get-in entities [:state :active?])
(or (not (get-in entities [:state :hud-active?]))
(get-in entities [:fg-actions :script-running?]))
(= 0.0 (get-in entities [:fade :opacity])))
(= 0.0 (get-in entities [:fade :opacity]))
(not (get-in entities [:cam :pinching])))
(left-click screen entities options)
:else
@@ -1013,7 +1014,8 @@
e)))
(defn mouse-moved [screen entities {:keys [input-x input-y] :as options}]
(utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y]) options))
(when-not (get-in entities [:cam :pinching])
(utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y]) options)))
(defn grab-layers [entities]
(update-in entities [:room]
@@ -1070,7 +1072,7 @@
(let [{cam :camera :as screen} (utils/setup-viewport screen 320 240)
screen (assoc screen :total-time 0)]
(set! (. cam zoom) utils/min-zoom)
(let [shader (ShaderProgram. ^String v-shader ^String pix-shader)
(let [shader (ShaderProgram. ^String (v-shader) ^String (pix-shader))
_ (log/info "shader log:" (.getLog shader))
state (get-state @utils/selected-save)
start-pos [(:x state) (:y state)]
@@ -1225,33 +1227,30 @@
(update-in [:cam] dissoc :start-zoom :pinching) )))
:on-pinch
(fn [screen entities {:keys [initial-pointer-1 initial-pointer-2]}]
(when (and (not (get-in entities [:cam :pinching]))
(get-in entities [:state :active?]))
(let [[pointer-1-x pointer-1-y] (utils/unproject screen nil [(.x initial-pointer-1) (.y initial-pointer-1)])
[pointer-2-x pointer-2-y] (utils/unproject screen nil [(.x initial-pointer-2) (.y initial-pointer-2)])]
(-> entities
(remove-cam-tweens)
(assoc-in [:cursor :last-pos] [0 0])
(assoc-in [:cam :ideal-x] (* 0.5 (+ pointer-1-x pointer-2-x)))
(assoc-in [:cam :ideal-y] (* 0.5 (+ pointer-1-y pointer-2-y)))
(assoc-in [:cam :pinching] true)))))
:on-zoom
(fn [{:keys [^OrthographicCamera camera ^FitViewport viewport ^Stage renderer] :as screen} entities {:keys [initial-distance distance]}]
(fn [screen entities {:keys [initial-pointer-1 initial-pointer-2 pointer-1 pointer-2]}]
(log/info "pinching...")
(when (get-in entities [:state :active?])
(let [start-zoom (get-in entities [:cam :start-zoom])
zoom (get-in entities [:cam :zoom])
entities (as-> entities entities
(if (not start-zoom)
(assoc-in entities [:cam :start-zoom] zoom)
entities)
(remove-cam-tweens entities)
(assoc-in entities [:cam :zoom] (max utils/max-zoom (min utils/min-zoom (* (or start-zoom zoom) (/ initial-distance distance)))))
(assoc-in entities [:cam :x] (utils/bound-to-camera (get-in entities [:cam :ideal-x]) 320 (get-in entities [:cam :zoom])) )
(assoc-in entities [:cam :y] (utils/bound-to-camera (get-in entities [:cam :ideal-y]) 240 (get-in entities [:cam :zoom])) ))]
entities
)))
initial-distance (.dst initial-pointer-1 initial-pointer-2)
distance (.dst pointer-1 pointer-2)
[pointer-1-x pointer-1-y] (utils/unproject screen nil [(.x initial-pointer-1) (.y initial-pointer-1)])
[pointer-2-x pointer-2-y] (utils/unproject screen nil [(.x initial-pointer-2) (.y initial-pointer-2)])]
(as-> entities entities
(remove-cam-tweens entities)
(if (not start-zoom)
(assoc-in entities [:cam :start-zoom] zoom)
entities)
(assoc-in entities [:cursor :last-pos] [0 0])
(assoc-in entities [:cam :ideal-x] (* 0.5 (+ pointer-1-x pointer-2-x)))
(assoc-in entities [:cam :ideal-y] (* 0.5 (+ pointer-1-y pointer-2-y)))
(assoc-in entities [:cam :pinching] true)
(assoc-in entities [:cam :x] (utils/bound-to-camera (get-in entities [:cam :ideal-x]) 320 (get-in entities [:cam :zoom])) )
(assoc-in entities [:cam :y] (utils/bound-to-camera (get-in entities [:cam :ideal-y]) 240 (get-in entities [:cam :zoom])) )
(assoc-in entities [:cam :zoom] (max utils/max-zoom (min utils/min-zoom (* (or start-zoom zoom) (/ initial-distance distance)))))))))
#_#_:on-scrolled
(fn [{:keys [^OrthographicCamera camera ^FitViewport viewport ^Stage renderer] :as screen} entities options]