diff options
| -rw-r--r-- | starling/node-2d.scm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/starling/node-2d.scm b/starling/node-2d.scm index 2c4db01..3dc0804 100644 --- a/starling/node-2d.scm +++ b/starling/node-2d.scm @@ -72,9 +72,9 @@ scale scale-x scale-y - skew - skew-x - skew-y + shear + shear-x + shear-y local-matrix world-matrix width @@ -303,7 +303,7 @@ (define-class <node-2d> (<node>) ;; Transformation components: origin, position, rotation, scale, and - ;; skew. + ;; shear. (origin #:accessor origin #:init-form (vec2 0.0 0.0) #:init-keyword #:origin #:watch? #t) (origin-x #:accessor origin-x #:allocation #:virtual @@ -342,17 +342,17 @@ #:slot-set! (lambda (node y) (set-vec2-y! (scale node) y) (dirty! node))) - (skew #:accessor skew #:init-form (vec2 0.0 0.0) #:init-keyword #:skew + (shear #:accessor shear #:init-form (vec2 0.0 0.0) #:init-keyword #:shear #:watch? #t) - (skew-x #:accessor skew-x #:allocation #:virtual - #:slot-ref (lambda (node) (vec2-x (skew node))) + (shear-x #:accessor shear-x #:allocation #:virtual + #:slot-ref (lambda (node) (vec2-x (shear node))) #:slot-set! (lambda (node x) - (set-vec2-x! (skew node) x) + (set-vec2-x! (shear node) x) (dirty! node))) - (skew-y #:accessor skew-y #:allocation #:virtual - #:slot-ref (lambda (node) (vec2-y (skew node))) + (shear-y #:accessor shear-y #:allocation #:virtual + #:slot-ref (lambda (node) (vec2-y (shear node))) #:slot-set! (lambda (node y) - (set-vec2-y! (skew node) y) + (set-vec2-y! (shear node) y) (dirty! node))) ;; Some extra position vectors for defeating "temporal aliasing" ;; when rendering. @@ -399,7 +399,7 @@ #:position (render-position node) #:rotation (rotation node) #:scale (scale node) - #:skew (skew node))) + #:shear (shear node))) (define-method (refresh-world-matrix (node <node-2d>) (parent <node-2d>)) (matrix4-mult! (world-matrix node) (local-matrix node) (world-matrix parent))) @@ -429,7 +429,7 @@ (p (position node)) (o (origin node)) (r (rotation node)) - (k (skew node)) + (k (shear node)) (w (width node)) (h (height node))) (if (and (= r 0.0) @@ -468,7 +468,7 @@ (define-method (on-change (node <node-2d>) slot old new) (case slot - ((origin position rotation scale skew) + ((origin position rotation scale shear) (set! (dirty-bounding-box? node) #t) (dirty! node)) ((width height) |