diff options
Diffstat (limited to 'chickadee/render/shapes.scm')
| -rw-r--r-- | chickadee/render/shapes.scm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/chickadee/render/shapes.scm b/chickadee/render/shapes.scm index db54e3d..f7412e8 100644 --- a/chickadee/render/shapes.scm +++ b/chickadee/render/shapes.scm @@ -42,14 +42,14 @@ (define draw-filled-rect (let* ((vertex-buffer (delay - (make-streaming-typed-buffer 'vec2 'float 4 - #:name "rect-typed-buffer"))) + (make-streaming-buffer-view 'vec2 'float 4 + #:name "rect-buffer-view"))) (index-buffer (delay - (make-typed-buffer #:type 'scalar - #:component-type 'unsigned-int - #:buffer (make-buffer (u32vector 0 3 2 0 2 1) - #:target 'index)))) + (make-buffer-view #:type 'scalar + #:component-type 'unsigned-int + #:buffer (make-buffer (u32vector 0 3 2 0 2 1) + #:target 'index)))) (vertex-array (delay (make-vertex-array #:indices (force index-buffer) @@ -88,8 +88,8 @@ void main (void) { (y1 (rect-y region)) (x2 (+ x1 (rect-width region))) (y2 (+ y1 (rect-height region)))) - (with-mapped-typed-buffer (force vertex-buffer) - (let ((bv (typed-buffer-data (force vertex-buffer)))) + (with-mapped-buffer-view (force vertex-buffer) + (let ((bv (buffer-view-data (force vertex-buffer)))) (f32vector-set! bv 0 x1) (f32vector-set! bv 1 y1) (f32vector-set! bv 2 x2) @@ -112,18 +112,18 @@ void main (void) { (let* ((mvp (make-null-matrix4)) (vertex-buffer (delay - (make-streaming-typed-buffer 'vec2 'float 4 - #:name "line-typed-buffer"))) + (make-streaming-buffer-view 'vec2 'float 4 + #:name "line-buffer-view"))) (texcoord-buffer (delay - (make-streaming-typed-buffer 'vec2 'float 4 - #:name "line-typed-buffer"))) + (make-streaming-buffer-view 'vec2 'float 4 + #:name "line-buffer-view"))) (index-buffer (delay - (make-typed-buffer #:type 'scalar - #:component-type 'unsigned-int - #:buffer (make-buffer (u32vector 0 3 2 0 2 1) - #:target 'index)))) + (make-buffer-view #:type 'scalar + #:component-type 'unsigned-int + #:buffer (make-buffer (u32vector 0 3 2 0 2 1) + #:target 'index)))) (vertex-array (delay (make-vertex-array #:indices (force index-buffer) @@ -255,8 +255,8 @@ may use SHADER to override the built-in line segment shader." (vy4 (+ (+ y2 ypad) (- xpad))) (s4 (+ length padding)) (t4 padding)) - (with-mapped-typed-buffer (force vertex-buffer) - (let ((bv (typed-buffer-data (force vertex-buffer)))) + (with-mapped-buffer-view (force vertex-buffer) + (let ((bv (buffer-view-data (force vertex-buffer)))) (f32vector-set! bv 0 vx1) (f32vector-set! bv 1 vy1) (f32vector-set! bv 2 vx2) @@ -265,8 +265,8 @@ may use SHADER to override the built-in line segment shader." (f32vector-set! bv 5 vy3) (f32vector-set! bv 6 vx4) (f32vector-set! bv 7 vy4))) - (with-mapped-typed-buffer (force texcoord-buffer) - (let ((bv (typed-buffer-data (force texcoord-buffer)))) + (with-mapped-buffer-view (force texcoord-buffer) + (let ((bv (buffer-view-data (force texcoord-buffer)))) (f32vector-set! bv 0 s1) (f32vector-set! bv 1 t1) (f32vector-set! bv 2 s2) |