aboutsummaryrefslogtreecommitdiffhomepage
path: root/wheelwork.lisp
diff options
context:
space:
mode:
Diffstat (limited to 'wheelwork.lisp')
-rw-r--r--wheelwork.lisp9
1 files changed, 2 insertions, 7 deletions
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)))