Skip to content

Commit

Permalink
fiddle with shaders
Browse files Browse the repository at this point in the history
  • Loading branch information
Jules Butcher committed May 6, 2015
1 parent cb7d711 commit 1d01dd1
Showing 1 changed file with 34 additions and 13 deletions.
47 changes: 34 additions & 13 deletions src/rhombrick/core.clj
Expand Up @@ -70,7 +70,7 @@
;(def test-surface (atom {}))
(def rendering? (atom true))

(def ^:dynamic edge-shader)
(def edge-shader (atom nil))

(def phi-palette-offset (atom 0))

Expand Down Expand Up @@ -125,7 +125,8 @@
;(.mouseMove robot 0 0)
;(.mouseMove robot (/ (width) 2) (/ (height) 2))
;(smooth)
(def edge-shader (load-shader "data/edges.glsl"))
;(def edge-shader (load-shader "data/edges.glsl"))
(reset! edge-shader (load-shader "data/test.frag"))
(frame-rate 60)
(update-camera)
(println "setting font")
Expand Down Expand Up @@ -487,6 +488,10 @@
(reset! bbox-tex-idx (mod (inc @bbox-tex-idx) (count bbox-textures)))
(reset! bbox-tex (load-image (bbox-textures @bbox-tex-idx)))
)
\` #(do
(reset-shader)
(reset! edge-shader (load-shader "data/test.frag"))
)
; \D #(do
; (osc-send client "/rhombrick.game" "destroy-neighbourhood" @game/selected-candidate-idx)
; (game/destroy-neighbourhood)
Expand Down Expand Up @@ -639,15 +644,14 @@


(defn draw []
;(shader edge-shader)
;(get-location-on-screen)
(let [frame-start-time (System/nanoTime)]

;(when (< (editor/get-level) 2)
(do-movement-keys)
; )

(blend-mode :blend)
;(blend-mode :blend)
; (when @tiler-auto-seed?
; (auto-seed-tiler))
; auto seed mode
Expand Down Expand Up @@ -675,10 +679,10 @@
(update-gliders))


;(background 255 255 255 )
; (background 64 64 64 )
(background 255 255 255 )
;(background 64 64 64 )
;(background 16 24 32)
(background 0 0 0)
; (background 0 0 0)

(push-matrix)

Expand Down Expand Up @@ -973,8 +977,8 @@
;(camera)
;(ortho)
;(hint :disable-depth-test)
(when @draw-info?
(draw-info 10 (- (height) 370)))
;(when @draw-info?
; (draw-info 10 (- (height) 370)))

(camera)

Expand Down Expand Up @@ -1004,8 +1008,25 @@

;(display-filter :erode)
;(display-filter :posterize 4)
;(.set edge-shader "modelscale" (float @model-scale))
;(filter-shader edge-shader)
(no-lights)
(let [zoom 1.0
mx (/ (float (mouse-x)) (width))
my (/ (float (mouse-y)) (height))
ar (/ (float (width)) (height))
px (* (- mx 0.5) ar zoom)
py (* (- my 0.5) zoom)
]
(.set @edge-shader "framecount" (frame-count))
(.set @edge-shader "aspect_ratio" (float ar))
(.set @edge-shader "mousex" (float px))
(.set @edge-shader "mousey" (float py))
(.set @edge-shader "zoom" (float zoom))
(.set @edge-shader "width" (float (width)))
(.set @edge-shader "height" (float (height)))

(texture-wrap :repeat)
(filter-shader @edge-shader)
)
;(display-filter :dilate)
;(display-filter :erode)
;(display-filter :invert)
Expand Down Expand Up @@ -1052,8 +1073,8 @@
:size :fullscreen
:features [:present :resizable]
;:features [:resizable]
;:renderer :opengl
:renderer :p3d
:renderer :opengl
;:renderer :p3d
:key-typed key-typed
:key-pressed key-pressed
:key-released key-released
Expand Down

0 comments on commit 1d01dd1

Please sign in to comment.