samples/bounce.scm

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