Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Exception: Only able to fetch buffer data directly from an internal server. Try #'buffer-read instead. #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/shadertone/tone.clj
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@
(defonce fft-bus-synth
(bus-freqs->buf [:after (foundation-monitor-group)] 0 fft-buf))

(defn- buffer-data-read
"Read buffer data from internal or external server, depending on the operation mode"
[buf]
(if (server/internal-server?)
(buffer-data buf)
(buffer-read buf)))

;; user-fn for shader display of waveform and fft
(defn tone-fftwave-fn
"The shader display will call this routine on every draw. Update
Expand Down Expand Up @@ -124,8 +131,8 @@
(do
(if (buffer-live? wave-buf) ;; FIXME? assume fft-buf is live
(-> ^FloatBuffer fftwave-float-buf
(.put ^floats (buffer-data fft-buf))
(.put ^floats (buffer-data wave-buf))
(.put ^floats (buffer-data-read fft-buf))
(.put ^floats (buffer-data-read wave-buf))
(.flip)))
(GL13/glActiveTexture (+ GL13/GL_TEXTURE0 @fftwave-tex-num))
(GL11/glBindTexture GL11/GL_TEXTURE_2D @fftwave-tex-id)
Expand Down