Skip to content

Commit

Permalink
[webgl] replace geom.webgl.arrays ns w/ thi.ng/typedarrays lib, updat…
Browse files Browse the repository at this point in the history
…e references
  • Loading branch information
postspectacular committed May 26, 2015
1 parent 0f0c099 commit 1870cdc
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 91 deletions.
83 changes: 0 additions & 83 deletions geom-webgl/src/arrays.org

This file was deleted.

2 changes: 1 addition & 1 deletion geom-webgl/src/buffers.org
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/webgl/buffers.cljs :noweb yes :mkdirp yes :padline no
(ns thi.ng.geom.webgl.buffers
(:require
[thi.ng.typedarrays.core :as arrays]
[thi.ng.geom.webgl.core :as gl]
[thi.ng.geom.webgl.arrays :as arrays]
[thi.ng.geom.webgl.shaders :as sh]
[thi.ng.common.error :as err]))

Expand Down
2 changes: 1 addition & 1 deletion geom-webgl/src/core.org
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ using the protocol.
(ns thi.ng.geom.webgl.core
(:refer-clojure :exclude [byte float int short keep repeat replace])
(:require
[thi.ng.geom.webgl.arrays :as arrays]
[thi.ng.typedarrays.core :as arrays]
[thi.ng.geom.webgl.utils :as glu]
[thi.ng.geom.core :as g]
[thi.ng.geom.core.utils :as gu]
Expand Down
6 changes: 3 additions & 3 deletions geom-webgl/src/demo.org
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#+BEGIN_SRC clojure :noweb-ref default-requires
[thi.ng.geom.webgl.core :as gl]
[thi.ng.geom.webgl.arrays :as arrays]
[thi.ng.geom.webgl.animator :as anim]
[thi.ng.geom.webgl.buffers :as buf]
[thi.ng.geom.webgl.shaders :as sh]
Expand All @@ -27,6 +26,7 @@
[thi.ng.geom.core.vector :as v :refer [vec2 vec3]]
[thi.ng.geom.core.matrix :as mat :refer [M44]]
[thi.ng.geom.types]
[thi.ng.typedarrays.core :as arrays]
[thi.ng.math.core :as m :refer [PI HALF_PI TWO_PI]]
#+END_SRC

Expand Down Expand Up @@ -305,11 +305,11 @@ rotation / transformation).
[thi.ng.geom.aabb :as a]
[thi.ng.geom.core.utils :as gu]
[thi.ng.geom.webgl.core :as gl]
[thi.ng.geom.webgl.arrays :as arrays]
[thi.ng.geom.webgl.animator :as anim]
[thi.ng.geom.webgl.buffers :as buf]
[thi.ng.geom.webgl.shaders :as sh]
[thi.ng.geom.webgl.shaders.basic :as basic]))
[thi.ng.geom.webgl.shaders.basic :as basic]
[thi.ng.typedarrays.core :as arrays]))

(defn colored-verts
[faces col]
Expand Down
1 change: 1 addition & 0 deletions geom-webgl/src/index.org
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ target/geom-webgl-<<conf-version()>>.js
[thi.ng/geom-core "<<conf-version()>>"]
[thi.ng/geom-types "<<conf-version()>>"]
[thi.ng/geom-meshops "<<conf-version()>>"]
<<dep-arrays>>
<<dep-color>>
<<dep-shadergraph>>
<<dep-cljs-log>>]
Expand Down
4 changes: 2 additions & 2 deletions geom-webgl/src/shaders.org
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ Currently the following options are supported:
[thi.ng.geom.core :as g]
[thi.ng.geom.core.matrix]
[thi.ng.geom.webgl.core :as gl]
[thi.ng.geom.webgl.arrays :as arrays]
[thi.ng.geom.webgl.utils :as glu]
[thi.ng.typedarrays.core :as arrays]
[thi.ng.color.core :as color]
[thi.ng.common.error :as err]
[clojure.string :as str]))
Expand Down Expand Up @@ -850,7 +850,7 @@ Currently the following options are supported:
[thi.ng.geom.webgl.core :as gl]
[thi.ng.geom.webgl.buffers :as buf]
[thi.ng.geom.webgl.shaders :as sh]
[thi.ng.geom.webgl.arrays :as arrays]
[thi.ng.typedarrays.core :as arrays]
[thi.ng.glsl.core :as glsl :include-macros true]
[thi.ng.math.core :as m]))

Expand Down
2 changes: 1 addition & 1 deletion geom-webgl/src/utils.org
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#+BEGIN_SRC clojure :tangle ../babel/src/thi/ng/geom/webgl/utils.cljs :noweb yes :mkdirp yes :padline no
(ns thi.ng.geom.webgl.utils
(:require
[thi.ng.geom.webgl.arrays :as arrays]
[thi.ng.typedarrays.core :as arrays]
[thi.ng.common.error :as err])
(:require-macros
[thi.ng.math.macros :as mm]))
Expand Down
6 changes: 6 additions & 0 deletions src/config.org
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ target/test-classes
[thi.ng/color "0.2.0"]
#+END_SRC

**** [[https://github.com/thi-ng/typedarrays/][thi.ng/typedarrays]]
#+NAME: dep-arrays
#+BEGIN_SRC clojure
[thi.ng/typedarrays "0.1.0"]
#+END_SRC

*** Development
**** [[https://github.com/emezeske/lein-cljsbuild][Cljsbuild]]
#+NAME: dep-cljsbuild
Expand Down

0 comments on commit 1870cdc

Please sign in to comment.