diff options
| author | Colin Okay <colin@cicadas.surf> | 2022-06-27 08:44:13 -0500 |
|---|---|---|
| committer | Colin Okay <colin@cicadas.surf> | 2022-06-27 08:44:13 -0500 |
| commit | 23131fa9a3bb09d3633a02f9dd24b39e467ba323 (patch) | |
| tree | 84136e945c56abccc46d549ddd1fe3c8a236f3de | |
| parent | 19bbadb810017821f34fa3d186708b7969e43132 (diff) | |
[add] using cached projected matrix in bitmap rendering
| -rw-r--r-- | wheelwork.asd | 3 | ||||
| -rw-r--r-- | wheelwork.lisp | 9 |
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))) |