mirror of
https://github.com/rabbibotton/clog.git
synced 2025-12-06 02:30:42 -08:00
More work on WebGL
This commit is contained in:
David Botton
parent
67ceca8c18
commit
8aba36e442
2 changed files with 211 additions and 3 deletions
|
|
@ -75,12 +75,15 @@
|
||||||
(stencil-operation-seperate generic-function)
|
(stencil-operation-seperate generic-function)
|
||||||
(texture-parameter-float generic-function)
|
(texture-parameter-float generic-function)
|
||||||
(texture-parameter-integer generic-function)
|
(texture-parameter-integer generic-function)
|
||||||
|
(uniform-matrix generic-function)
|
||||||
(viewport generic-function)
|
(viewport generic-function)
|
||||||
(vertex-attribute-pointer generic-function)
|
(vertex-attribute-pointer generic-function)
|
||||||
|
|
||||||
(compile-shader-source generic-function)
|
(compile-shader-source generic-function)
|
||||||
(compile-webgl-program generic-function)
|
(compile-webgl-program generic-function)
|
||||||
|
|
||||||
|
(clog-webgl-uniform class)
|
||||||
|
|
||||||
"CLOG-WebGL-Active-Info - Class for CLOG WebGL Active Info objects"
|
"CLOG-WebGL-Active-Info - Class for CLOG WebGL Active Info objects"
|
||||||
(clog-webgl-active-info class)
|
(clog-webgl-active-info class)
|
||||||
(info-name generic-function)
|
(info-name generic-function)
|
||||||
|
|
@ -783,7 +786,12 @@ Sets the behavior. The default value is :DONT_CARE. The possible values are:
|
||||||
|
|
||||||
;; WebGLRenderingContext.texSubImage2D()
|
;; WebGLRenderingContext.texSubImage2D()
|
||||||
;; WebGL2RenderingContext.uniform[1234][uif][v]()
|
;; WebGL2RenderingContext.uniform[1234][uif][v]()
|
||||||
|
|
||||||
;; WebGLRenderingContext.uniformMatrix[234]fv()
|
;; WebGLRenderingContext.uniformMatrix[234]fv()
|
||||||
|
(defmethod uniform-matrix ((obj clog-webgl) size location normalize matrix)
|
||||||
|
(execute obj (format nil "uniformMatrix~Afv(~A,~A,[~{~A~^,~}])"
|
||||||
|
size (script-id location) (p-true-js normalize) matrix)))
|
||||||
|
|
||||||
;; WebGLRenderingContext.vertexAttrib[1234]f[v]()
|
;; WebGLRenderingContext.vertexAttrib[1234]f[v]()
|
||||||
|
|
||||||
(defmethod viewport ((obj clog-webgl) x y width height)
|
(defmethod viewport ((obj clog-webgl) x y width height)
|
||||||
|
|
@ -820,6 +828,12 @@ Sets the behavior. The default value is :DONT_CARE. The possible values are:
|
||||||
(delete-program program)
|
(delete-program program)
|
||||||
(error result))))))
|
(error result))))))
|
||||||
|
|
||||||
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
;; Implementation - clog-webgl-uniform
|
||||||
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
(defclass clog-webgl-uniform (clog-obj)())
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; Implementation - clog-webgl-active-info
|
;; Implementation - clog-webgl-active-info
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
@ -999,15 +1013,20 @@ Returns a GLint indicating the number of uniform blocks containing active unifor
|
||||||
(:documentation "Returns the location of an uniform variable in clog-webgl-program"))
|
(:documentation "Returns the location of an uniform variable in clog-webgl-program"))
|
||||||
|
|
||||||
(defmethod uniform-location ((obj clog-webgl-program) name)
|
(defmethod uniform-location ((obj clog-webgl-program) name)
|
||||||
(query (gl obj) (format nil "getUniformLocation(~A, '~A')"
|
(let ((web-id (clog-connection:generate-id)))
|
||||||
(script-id obj) name)))
|
(js-execute obj (format nil "clog['~A']=~A.getUniformLocation(~A,'~A')"
|
||||||
|
web-id
|
||||||
|
(script-id (gl obj)) (script-id obj) name))
|
||||||
|
(make-instance 'clog-webgl-uniform
|
||||||
|
:connection-id (clog::connection-id obj)
|
||||||
|
:html-id web-id)))
|
||||||
|
|
||||||
(defgeneric uniform (clog-webgl-program location)
|
(defgeneric uniform (clog-webgl-program location)
|
||||||
(:documentation "Returns the value of uniform at LOCATION in clog-webgl-program"))
|
(:documentation "Returns the value of uniform at LOCATION in clog-webgl-program"))
|
||||||
|
|
||||||
(defmethod uniform ((obj clog-webgl-program) location)
|
(defmethod uniform ((obj clog-webgl-program) location)
|
||||||
(query (gl obj) (format nil "getUniform(~A, ~A)"
|
(query (gl obj) (format nil "getUniform(~A, ~A)"
|
||||||
(script-id obj) location)))
|
(script-id obj) (script-id location))))
|
||||||
|
|
||||||
(defgeneric program-info-log (clog-webgl-program)
|
(defgeneric program-info-log (clog-webgl-program)
|
||||||
(:documentation "Contains errors that occurred during failed linking or
|
(:documentation "Contains errors that occurred during failed linking or
|
||||||
|
|
|
||||||
189
tutorial/35-tutorial.lisp
Normal file
189
tutorial/35-tutorial.lisp
Normal file
|
|
@ -0,0 +1,189 @@
|
||||||
|
(defpackage #:clog-tut-35
|
||||||
|
(:use #:cl #:clog #:clog-webgl)
|
||||||
|
(:export start-tutorial))
|
||||||
|
|
||||||
|
(in-package :clog-tut-35)
|
||||||
|
|
||||||
|
;; https://github.com/mdn/dom-examples/blob/master/webgl-examples/tutorial/sample5/webgl-demo.js
|
||||||
|
;; This example uses WegGL v1
|
||||||
|
(defparameter *vertex-shader-source*
|
||||||
|
" attribute vec4 aVertexPosition;
|
||||||
|
attribute vec4 aVertexColor;
|
||||||
|
uniform mat4 uModelViewMatrix;
|
||||||
|
uniform mat4 uProjectionMatrix;
|
||||||
|
varying lowp vec4 vColor;
|
||||||
|
void main(void) {
|
||||||
|
gl_Position = uProjectionMatrix * uModelViewMatrix * aVertexPosition;
|
||||||
|
vColor = aVertexColor;
|
||||||
|
}")
|
||||||
|
|
||||||
|
(defparameter *fragment-shader-source*
|
||||||
|
" varying lowp vec4 vColor;
|
||||||
|
void main(void) {
|
||||||
|
gl_FragColor = vColor;
|
||||||
|
}")
|
||||||
|
|
||||||
|
(defun on-new-window (body)
|
||||||
|
(debug-mode body)
|
||||||
|
(setf (title (html-document body)) "Tutorial 35")
|
||||||
|
(let* ((canvas (create-canvas body :width 500 :height 500))
|
||||||
|
(gl (create-webgl canvas))
|
||||||
|
(vertex-shader (compile-shader-source gl :VERTEX_SHADER *vertex-shader-source*))
|
||||||
|
(fragment-shader (compile-shader-source gl :FRAGMENT_SHADER *fragment-shader-source*))
|
||||||
|
(program (compile-webgl-program gl vertex-shader fragment-shader))
|
||||||
|
;; Attribute locations
|
||||||
|
(vertex-position (attribute-location program "aVertexPosition"))
|
||||||
|
(vertex-color (attribute-location program "aVertexColor"))
|
||||||
|
;; Uniform locations
|
||||||
|
(model-view-matrix (uniform-location program "uModelViewMatrix"))
|
||||||
|
(projection-matrix (uniform-location program "uProjectionMatrix"))
|
||||||
|
;; Bufffers
|
||||||
|
(position-buffer (create-webgl-buffer gl))
|
||||||
|
(color-buffer (create-webgl-buffer gl))
|
||||||
|
(index-buffer (create-webgl-buffer gl)))
|
||||||
|
(bind-buffer position-buffer :ARRAY_BUFFER)
|
||||||
|
(buffer-data position-buffer
|
||||||
|
'(;; Front face
|
||||||
|
-1.0 -1.0 1.0 1.0 -1.0 1.0 1.0 1.0 1.0 -1.0 1.0 1.0
|
||||||
|
;; Back face
|
||||||
|
-1.0 -1.0 -1.0 -1.0 1.0 -1.0 1.0 1.0 -1.0 1.0 -1.0 -1.0
|
||||||
|
;; Top face
|
||||||
|
-1.0 1.0 -1.0 -1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 -1.0
|
||||||
|
;; Bottom face
|
||||||
|
-1.0 -1.0 -1.0 1.0 -1.0 -1.0 1.0 -1.0 1.0 -1.0 -1.0 1.0
|
||||||
|
;; Right face
|
||||||
|
1.0 -1.0 -1.0 1.0 1.0 -1.0 1.0 1.0 1.0 1.0 -1.0 1.0
|
||||||
|
;; Left face
|
||||||
|
-1.0 -1.0 -1.0 -1.0 -1.0 1.0 -1.0 1.0 1.0 -1.0 1.0 -1.0)
|
||||||
|
"Float32Array"
|
||||||
|
:STATIC_DRAW)
|
||||||
|
(print (is-buffer position-buffer))
|
||||||
|
(bind-buffer color-buffer :ARRAY_BUFFER)
|
||||||
|
(buffer-data color-buffer
|
||||||
|
;; Repeat each color four times for the four vertices of the face
|
||||||
|
'(;; Front face - white
|
||||||
|
1.0 1.0 1.0 1.0
|
||||||
|
1.0 1.0 1.0 1.0
|
||||||
|
1.0 1.0 1.0 1.0
|
||||||
|
1.0 1.0 1.0 1.0
|
||||||
|
;; Back face - red
|
||||||
|
1.0 0.0 0.0 1.0
|
||||||
|
1.0 0.0 0.0 1.0
|
||||||
|
1.0 0.0 0.0 1.0
|
||||||
|
1.0 0.0 0.0 1.0
|
||||||
|
;; Top face - green
|
||||||
|
0.0 1.0 0.0 1.0
|
||||||
|
0.0 1.0 0.0 1.0
|
||||||
|
0.0 1.0 0.0 1.0
|
||||||
|
0.0 1.0 0.0 1.0
|
||||||
|
;; Bottom face - blue
|
||||||
|
0.0 0.0 1.0 1.0
|
||||||
|
0.0 0.0 1.0 1.0
|
||||||
|
0.0 0.0 1.0 1.0
|
||||||
|
0.0 0.0 1.0 1.0
|
||||||
|
;; Right face - yellow
|
||||||
|
1.0 1.0 0.0 1.0
|
||||||
|
1.0 1.0 0.0 1.0
|
||||||
|
1.0 1.0 0.0 1.0
|
||||||
|
1.0 1.0 0.0 1.0
|
||||||
|
;; Left face
|
||||||
|
1.0 0.0 1.0 1.0
|
||||||
|
1.0 0.0 1.0 1.0
|
||||||
|
1.0 0.0 1.0 1.0
|
||||||
|
1.0 0.0 1.0 1.0)
|
||||||
|
"Float32Array"
|
||||||
|
:STATIC_DRAW)
|
||||||
|
(print (is-buffer color-buffer))
|
||||||
|
;; This array defines each face as two triangles, using the
|
||||||
|
;; indices into the vertex array to specify each triangle's
|
||||||
|
;; position.
|
||||||
|
(bind-buffer index-buffer :ELEMENT_ARRAY_BUFFER)
|
||||||
|
(buffer-data index-buffer
|
||||||
|
`(0
|
||||||
|
1
|
||||||
|
2
|
||||||
|
0
|
||||||
|
2
|
||||||
|
3 ; front
|
||||||
|
4
|
||||||
|
5
|
||||||
|
6
|
||||||
|
4
|
||||||
|
6
|
||||||
|
7 ; back
|
||||||
|
8
|
||||||
|
9
|
||||||
|
10
|
||||||
|
8
|
||||||
|
10
|
||||||
|
11 ; top
|
||||||
|
12
|
||||||
|
13
|
||||||
|
14
|
||||||
|
12
|
||||||
|
14
|
||||||
|
15 ; bottom
|
||||||
|
16
|
||||||
|
17
|
||||||
|
18
|
||||||
|
16
|
||||||
|
18
|
||||||
|
19 ; right
|
||||||
|
20
|
||||||
|
21
|
||||||
|
22
|
||||||
|
20
|
||||||
|
22
|
||||||
|
23) ; left
|
||||||
|
"Uint16Array"
|
||||||
|
:STATIC_DRAW)
|
||||||
|
(print (is-buffer index-buffer))
|
||||||
|
(labels ((draw-scene ()
|
||||||
|
(clear-color gl 0 0 0 1)
|
||||||
|
(clear-depth gl 1)
|
||||||
|
(enable-capability gl :DEPTH_TEST)
|
||||||
|
(depth-function gl :LEQUAL)
|
||||||
|
(clear-webgl gl :COLOR_BUFFER_BIT)
|
||||||
|
(clear-webgl gl :DEPTH_BUFFER_BIT)
|
||||||
|
;; Tell WebGL how to pull out the positions from the position
|
||||||
|
;; buffer into the vertexPosition attribute
|
||||||
|
(bind-buffer position-buffer :ARRAY_BUFFER)
|
||||||
|
(vertex-attribute-pointer gl vertex-position
|
||||||
|
3
|
||||||
|
:FLOAT
|
||||||
|
nil
|
||||||
|
0
|
||||||
|
0)
|
||||||
|
(enable-vertex-attribute-array gl vertex-position)
|
||||||
|
;; Tell WebGL how to pull out the colors from the color buffer
|
||||||
|
;; into the vertexColor attribute.
|
||||||
|
(bind-buffer color-buffer :ARRAY_BUFFER)
|
||||||
|
(vertex-attribute-pointer gl vertex-color
|
||||||
|
4
|
||||||
|
:FLOAT
|
||||||
|
nil
|
||||||
|
0
|
||||||
|
0)
|
||||||
|
(enable-vertex-attribute-array gl vertex-color)
|
||||||
|
;; Indices
|
||||||
|
(bind-buffer index-buffer :ELEMENT_ARRAY_BUFFER)
|
||||||
|
(use-program program)
|
||||||
|
(uniform-matrix gl 4 projection-matrix nil (list (random 1.0) (random 1.0) (random 1.0) (random 1.0)
|
||||||
|
(random 1.0) (random 1.0) (random 1.0) (random 1.0)
|
||||||
|
(random 1.0) (random 1.0) (random 1.0) (random 1.0)
|
||||||
|
(random 1.0) (random 1.0) (random 1.0) (random 1.0)))
|
||||||
|
(uniform-matrix gl 4 model-view-matrix nil (list (random 1.0) (random 1.0) (random 1.0) (random 1.0)
|
||||||
|
(random 1.0) (random 1.0) (random 1.0) (random 1.0)
|
||||||
|
(random 1.0) (random 1.0) (random 1.0) (random 1.0)
|
||||||
|
(random 1.0) (random 1.0) (random 1.0) (random 1.0)))
|
||||||
|
(draw-elements gl :TRIANGLES 36 :UNSIGNED_SHORT 0)))
|
||||||
|
(loop
|
||||||
|
(unless (clog:validp body)
|
||||||
|
(return))
|
||||||
|
(draw-scene)
|
||||||
|
(sleep .1)))))
|
||||||
|
|
||||||
|
(defun start-tutorial ()
|
||||||
|
"Start turtorial."
|
||||||
|
(initialize 'on-new-window)
|
||||||
|
(open-browser))
|
||||||
Loading…
Add table
Add a link
Reference in a new issue