From 7c5d7de6f1df7b926afb513da7f837173308658a Mon Sep 17 00:00:00 2001
From: Karsten Schmidt <k@postspectacular.com>
Date: Thu, 7 Apr 2016 08:43:23 +0100
Subject: [PATCH] [gl] bugfix JOGL example #1

---
 examples/gl/jogl.org | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/examples/gl/jogl.org b/examples/gl/jogl.org
index 4c7e4154..cf6720f0 100644
--- a/examples/gl/jogl.org
+++ b/examples/gl/jogl.org
@@ -38,15 +38,15 @@
 
   (def shader
     {:vs "
-  void main() {
-    vCol = vec4(position.xy * 0.5 + 0.5, fract(time), 1.0);
-    vUV = uv;
-    gl_Position = proj * view * model * vec4(position, 1.0);
-  }"
+    void main() {
+      vCol = vec4(position.xy * 0.5 + 0.5, fract(time), 1.0);
+      vUV = uv;
+      gl_Position = proj * view * model * vec4(position, 1.0);
+    }"
      :fs "out vec4 outCol;
-  void main() {
-    outCol = vCol * texture(tex, vUV);
-  }"
+    void main() {
+      outCol = vCol * texture(tex, vUV);
+    }"
      :version  330
      :attribs  {:position :vec3
                 :uv       :vec2}
@@ -75,14 +75,14 @@
 
   (defn display
     [^GLAutoDrawable drawable t]
-    (let [^GL3 gl (.. drawable getGL getGL3)
-          {:keys [shader] :as spec} (:model @app)
-          unis    (:uniforms shader)
-          t       (* 0.25 t)
-          view    (arc/get-view (:arcball @app))]
+    (let [{:keys [model arcball]} @app
+          ^GL3 gl (.. drawable getGL getGL3)]
       (doto gl
         (gl/clear-color-and-depth-buffer 0.3 0.3 0.3 1.0 1.0)
-        (gl/draw-with-shader (update spec :uniforms assoc :view view :time t)))))
+        (gl/draw-with-shader
+         (update model :uniforms assoc
+                 :view (arc/get-view arcball)
+                 :time (* 0.25 t))))))
 
   (defn dispose [_] (jogl/stop-animator (:anim @app)))
 
@@ -116,8 +116,7 @@
                        :display display
                        :resize  resize
                        :keys    {:press key-pressed}
-                       :mouse   {:move  mouse-moved
-                                 :press mouse-pressed
+                       :mouse   {:press mouse-pressed
                                  :drag  mouse-dragged
                                  :wheel wheel-moved}}}))
     nil)