diff options
| author | David Thompson <dthompson2@worcester.edu> | 2014-06-07 19:57:06 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2014-06-07 19:57:06 -0400 |
| commit | c2a4f0636569978a40cb5c98875d798624909eb2 (patch) | |
| tree | ca0d993826c0adde719e3a88aec255626281340d /2d/shader.scm | |
| parent | def69615603e49bb17b09c7352295578f9dd67af (diff) | |
Replace vector2 module with a more generic vector module.
* 2d/vector2.scm: Delete it.
* 2d/vector.scm: New file.
* Makefile.am (SOURCES): s/vector2/vector.
* 2d/font.scm:
* 2d/keyboard.scm:
* 2d/mouse.scm:
* 2d/rect.scm:
* 2d/shader.scm:
* 2d/sprite.scm:
* 2d/texture.scm:
* 2d/transform.scm:
* 2d/window.scm:
* examples/2048/2048:
* examples/animation.scm:
* examples/coroutine.scm:
* examples/font.scm:
* examples/particles.scm:
* examples/simple.scm:
* examples/tilemap.scm: Use vectors instead of defunct vector2.
Diffstat (limited to '2d/shader.scm')
| -rw-r--r-- | 2d/shader.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/2d/shader.scm b/2d/shader.scm index 4fffcb3..56a4e03 100644 --- a/2d/shader.scm +++ b/2d/shader.scm @@ -26,7 +26,7 @@ #:use-module (gl low-level) #:use-module (2d helpers) #:use-module (2d transform) - #:use-module (2d vector2) + #:use-module (2d vector) #:use-module (2d color) #:use-module (2d wrappers gl) #:export (make-shader @@ -249,7 +249,7 @@ location." (cons (make-uniform-setter predicate setter) %uniform-setters))) -;; Built-in uniform setters for booleans, numbers, vector2s, and +;; Built-in uniform setters for booleans, numbers, vectors, and ;; colors. (register-uniform-setter! boolean? (lambda (location b) @@ -263,6 +263,14 @@ location." (lambda (location v) (glUniform2f location (vx v) (vy v)))) +(register-uniform-setter! vector3? + (lambda (location v) + (glUniform3f location (vx v) (vy v) (vz v)))) + +(register-uniform-setter! vector4? + (lambda (location v) + (glUniform4f location (vx v) (vy v) (vz v) (vw v)))) + (register-uniform-setter! transform? (lambda (location t) (let ((pointer |