+ -> v+, * -> v*

This commit is contained in:
BirDt_ 2026-04-17 19:55:16 +08:00
parent 190a32ac54
commit 072c66c334

View file

@ -23,8 +23,8 @@
(push-render-object 'screen (push-render-object 'screen
(visual-2d-layer vis-2d) (visual-2d-layer vis-2d)
(lambda () (lambda ()
(let ((draw-pos (+ (position transform) (let ((draw-pos (v+ (position transform)
(circle-2d-center circle)))) (circle-2d-center circle))))
((if (circle-2d-filled? circle) ((if (circle-2d-filled? circle)
draw-circle draw-circle
draw-circle-lines) draw-circle-lines)
@ -49,9 +49,9 @@
'(<rigidbody-2d>) '(<rigidbody-2d>)
(lambda (_ rbody) (lambda (_ rbody)
(set-rigidbody-2d-velocity! rbody (set-rigidbody-2d-velocity! rbody
(+ (rigidbody-2d-velocity rbody) (v+ (rigidbody-2d-velocity rbody)
(* (get-frame-time) (v* (get-frame-time)
+gravity+)))))) +gravity+))))))
(add-system (add-system
(make-system 'apply-bounce (make-system 'apply-bounce
@ -61,8 +61,8 @@
(lambda (_ rbody transform) (lambda (_ rbody transform)
(when (> (vector-y (position transform)) (- (cdr (*window-size*)) +ball-radius+)) (when (> (vector-y (position transform)) (- (cdr (*window-size*)) +ball-radius+))
(set-rigidbody-2d-velocity! rbody (set-rigidbody-2d-velocity! rbody
(* (rigidbody-2d-velocity rbody) (v* (rigidbody-2d-velocity rbody)
(make-vector 1 -1))))))) (make-vector 1 -1)))))))
(add-system (add-system
(make-system 'apply-wall-bounce (make-system 'apply-wall-bounce
@ -73,8 +73,8 @@
(when (or (> (vector-x (position transform)) (- (car (*window-size*)) +ball-radius+)) (when (or (> (vector-x (position transform)) (- (car (*window-size*)) +ball-radius+))
(< (vector-x (position transform)) (+ 0 +ball-radius+))) (< (vector-x (position transform)) (+ 0 +ball-radius+)))
(set-rigidbody-2d-velocity! rbody (set-rigidbody-2d-velocity! rbody
(* (rigidbody-2d-velocity rbody) (v* (rigidbody-2d-velocity rbody)
(make-vector -1 1))))))) (make-vector -1 1)))))))
(add-system (add-system
(make-system 'apply-friction (make-system 'apply-friction
@ -83,9 +83,10 @@
'(<rigidbody-2d>) '(<rigidbody-2d>)
(lambda (_ rbody) (lambda (_ rbody)
(set-rigidbody-2d-velocity! rbody (set-rigidbody-2d-velocity! rbody
(+ (rigidbody-2d-velocity rbody) (v+ (rigidbody-2d-velocity rbody)
(* (get-frame-time) +friction+ (v* (get-frame-time)
(rigidbody-2d-velocity rbody))))))) +friction+
(rigidbody-2d-velocity rbody)))))))
(add-system (add-system
(make-system 'move-rigidbody (make-system 'move-rigidbody
@ -94,8 +95,8 @@
'(<rigidbody-2d> <screen-transform>) '(<rigidbody-2d> <screen-transform>)
(lambda (_ rbody transform) (lambda (_ rbody transform)
(set-position! transform (set-position! transform
(+ (rigidbody-2d-velocity rbody) (v+ (rigidbody-2d-velocity rbody)
(position transform)))))) (position transform))))))
(register-action 'boost 'key-press KEY_SPACE) (register-action 'boost 'key-press KEY_SPACE)
@ -105,18 +106,10 @@
'entity 'entity
'(<rigidbody-2d>) '(<rigidbody-2d>)
(lambda (_ rbody) (lambda (_ rbody)
(when (peek-event 'input 'boost) (when (pop-event 'input 'boost)
(set-rigidbody-2d-velocity! rbody (set-rigidbody-2d-velocity! rbody
(* 2 (v* 2
(rigidbody-2d-velocity rbody))))))) (rigidbody-2d-velocity rbody)))))))
(add-system
(make-system 'clear-boost-input
10
'global
'()
(lambda ()
(pop-event 'input 'boost))))
(create-entity (create-entity
(make-visual-2d (make-visual-2d