aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--wheelwork.asd3
-rw-r--r--wheelwork.lisp9
2 files changed, 4 insertions, 8 deletions
diff --git a/wheelwork.asd b/wheelwork.asd
index eac3bc5..b1fd2d5 100644
--- a/wheelwork.asd
+++ b/wheelwork.asd
@@ -15,6 +15,7 @@
#:hyperquirks
#:pngload
#:closer-mop
- #:lambda-riffs)
+ #:lambda-riffs
+ #:cl-fond)
:components ((:file "package")
(:file "wheelwork")))
diff --git a/wheelwork.lisp b/wheelwork.lisp
index 2e23c96..bf02302 100644
--- a/wheelwork.lisp
+++ b/wheelwork.lisp
@@ -547,12 +547,9 @@ give focus to whatever was clicked."
(define-symbol-macro +float-size+
(cffi:foreign-type-size :float))
-
-
(defmethod initialize-instance :after ((bitmap bitmap) &key)
(with-slots (vao shader width height texture) bitmap
- (setf texture (ensure-loaded texture)
- height (texture-height texture)
+ (setf height (texture-height texture)
width (texture-width texture))
(unless shader
(setf shader
@@ -601,9 +598,7 @@ give focus to whatever was clicked."
(gl:program-uniform-matrix-4fv
shader
(gl:get-uniform-location shader "TRANSFORM")
- (projected-matrix bitmap)
- ;(mat:marr (mat:m* (application-projection *application*) (model-matrix bitmap)))
- )
+ (projected-matrix bitmap))
(gl:bind-vertex-array vao)
(gl:draw-arrays :triangles 0 6)
(gl:bind-vertex-array 0)))