Skip to content

Commit

Permalink
Fixed Travis errors
Browse files Browse the repository at this point in the history
  • Loading branch information
MangeI89 committed Nov 8, 2016
1 parent 6a49c1d commit 3cf0d6a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions src/weather_magic/models.cljs
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
(ns weather-magic.models
(:require
[thi.ng.math.core :as m :refer [PI HALF_PI TWO_PI]]
[thi.ng.geom.core :as g]
[thi.ng.geom.gl.glmesh :as glm]
[thi.ng.geom.vector :as v :refer [vec2 vec3]]
[thi.ng.geom.sphere :as s]
[thi.ng.geom.plane :as p]
[thi.ng.geom.attribs :as attr]
[thi.ng.geom.rect :as rect]))
[thi.ng.math.core :as m :refer [PI HALF_PI TWO_PI]]
[thi.ng.geom.core :as g]
[thi.ng.geom.gl.glmesh :as glm]
[thi.ng.geom.vector :as v :refer [vec2 vec3]]
[thi.ng.geom.sphere :as s]
[thi.ng.geom.plane :as p]
[thi.ng.geom.attribs :as attr]
[thi.ng.geom.rect :as rect]))

(defonce sphere
(-> (s/sphere 1)
(g/center)
(g/as-mesh {:mesh (glm/gl-mesh 4096 #{:uv :vnorm})
:res 32
:attribs {:uv (attr/supplied-attrib
:uv (fn [[u v]] (vec2 (- 1 u) v)))
:uv (fn [[u v]] (vec2 (- 1 u) v)))
:vnorm (fn [_ _ v _] (m/normalize v))}})))

(defonce plane
(-> (rect/rect 4 3)
(g/as-mesh {:mesh (glm/gl-mesh 4096 #{:uv :vnorm})
:res 32
:attribs {:uv (attr/supplied-attrib
:uv (fn [[u v]] (vec2 (- 1 u) v)))
:uv (fn [[u v]] (vec2 (- 1 u) v)))
:vnorm (fn [_ _ v _] (m/normalize v))}})))
12 changes: 6 additions & 6 deletions src/weather_magic/util.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
(defonce tex-ready-test (volatile! false))

(defn set-view
"Change mesh and animation function depending on view"
"Change mesh and animation function depening on view"
[model-atom new-model animation-func func texture context]
(reset! model-atom new-model)
(reset! animation-func func)
(buf/load-texture context {:callback (fn [tex img]
(.generateMipmap context (:target tex))
(vreset! tex-ready-test true))
:src texture
:filter [glc/linear-mipmap-linear glc/linear]
:flip false}))
(.generateMipmap context (:target tex))
(vreset! tex-ready-test true))
:src texture
:filter [glc/linear-mipmap-linear glc/linear]
:flip false}))
2 changes: 1 addition & 1 deletion src/weather_magic/world.cljs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(ns weather-magic.world
(:require
[thi.ng.geom.vector :as v :refer [vec2 vec3]]))
[thi.ng.geom.vector :as v :refer [vec2 vec3]]))

(defn show-europe
"Rotates the sphere so that Europe is shown."
Expand Down

0 comments on commit 3cf0d6a

Please sign in to comment.