diff options
Diffstat (limited to 'src/interactive-units')
| -rw-r--r-- | src/interactive-units/bitmap.lisp | 3 | ||||
| -rw-r--r-- | src/interactive-units/text.lisp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/interactive-units/bitmap.lisp b/src/interactive-units/bitmap.lisp index 95dfff5..cc4b4f7 100644 --- a/src/interactive-units/bitmap.lisp +++ b/src/interactive-units/bitmap.lisp @@ -2,7 +2,7 @@ (in-package #:wheelwork) -(defclass/std bitmap (unit interactive) +(defclass/std bitmap (affine interactive) ((texture :ri :std (error "A bitmap requires a texture.")) (vao shader :with :r :static))) @@ -57,6 +57,7 @@ (gl:delete-program shader)) (setf vao nil shader nil))) + (defmethod render ((bitmap bitmap)) (with-slots (texture vao shader) bitmap (gl:active-texture 0) diff --git a/src/interactive-units/text.lisp b/src/interactive-units/text.lisp index 1cecdbf..caba48e 100644 --- a/src/interactive-units/text.lisp +++ b/src/interactive-units/text.lisp @@ -2,7 +2,7 @@ (in-package #:wheelwork) -(defclass/std text (unit interactive) +(defclass/std text (affine interactive) ((font :with :ri :std (error "A font is required") :type font) (content :with :ri :std "") (color :with :std #(1.0 1.0 1.0 1.0)) |