diff options
author | David Thompson <dthompson2@worcester.edu> | 2021-09-21 20:05:17 -0400 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2021-09-21 20:34:43 -0400 |
commit | b9fa5959cbd7ad512566029b202d00a443ea3f15 (patch) | |
tree | 534a60bffe5b615a1551f52617688a7776c8d589 /chickadee | |
parent | ee17d9897cfaf382d36e2cf0a1aae3da5e2ef2f7 (diff) |
math: vector: Deprecate #v syntax and remove uses of it.
Diffstat (limited to 'chickadee')
-rw-r--r-- | chickadee/graphics/pbr.scm | 4 | ||||
-rw-r--r-- | chickadee/math/bezier.scm | 2 | ||||
-rw-r--r-- | chickadee/math/vector.scm | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/chickadee/graphics/pbr.scm b/chickadee/graphics/pbr.scm index e1641ec..bc224e0 100644 --- a/chickadee/graphics/pbr.scm +++ b/chickadee/graphics/pbr.scm @@ -64,14 +64,14 @@ (float alpha-cutoff pbr-properties-alpha-cutoff)) (define default-pbr-properties - (make-pbr-properties #:base-color-factor #v(1.0 1.0 1.0) + (make-pbr-properties #:base-color-factor (vec3 1.0 1.0 1.0) #:base-color-texcoord 0 #:metallic-factor 1.0 #:roughness-factor 1.0 #:metallic-roughness-texcoord 0 #:normal-texcoord 0 #:occlusion-texcoord 0 - #:emissive-factor #v(1.0 1.0 1.0) + #:emissive-factor (vec3 1.0 1.0 1.0) #:emissive-texcoord 0 #:alpha-mode 0 #:alpha-cutoff 0.5)) diff --git a/chickadee/math/bezier.scm b/chickadee/math/bezier.scm index e3dfbba..fa41b40 100644 --- a/chickadee/math/bezier.scm +++ b/chickadee/math/bezier.scm @@ -67,7 +67,7 @@ to the 2D vector DEST." (define (bezier-curve-point-at bezier t) "Return the coordinates for BEZIER at T (a value in the range [0, 1]) as a 2D vector." - (let ((v #v(0.0 0.0))) + (let ((v (vec2 0.0 0.0))) (bezier-curve-point-at! v bezier t) v)) diff --git a/chickadee/math/vector.scm b/chickadee/math/vector.scm index 680fb0f..747200e 100644 --- a/chickadee/math/vector.scm +++ b/chickadee/math/vector.scm @@ -402,6 +402,8 @@ polar coordinate (R, THETA) with an arbitrary ORIGIN point." (when (char-whitespace? (peek-char port)) (read-char port) (consume-whitespace port))) + (display "warning: #v syntax is deprecated, use vec2, vec3, etc. instead.\n" + (current-error-port)) (if (eq? (peek-char port) #\() (read-char port) (error "expected opening #\\(")) |