samples/bounce.scm

@@ -39,7 +39,7 @@
   rigidbody-2d?
   (velocity rigidbody-2d-velocity set-rigidbody-2d-velocity!))
 
-(define +gravity+ (make-vector2 0 9.8))
+(define +gravity+ (make-vector 0 9.8))
 (define +friction+ -0.1)
 
 (add-system
@@ -49,10 +49,8 @@
 	      '(<rigidbody-2d>)
 	      (lambda (_ rbody)
 		(set-rigidbody-2d-velocity! rbody
-					    (vector-+ (rigidbody-2d-velocity rbody)
-						      (vector-*
-						       (make-vector2 (get-frame-time)
-								     (get-frame-time))
+					    (+ (rigidbody-2d-velocity rbody)
+					       (* (get-frame-time)
 						  +gravity+))))))
 
 (add-system
@@ -63,7 +61,8 @@
 	      (lambda (_ rbody transform)
 		(when (> (vector-y (position transform)) (- (cdr (*window-size*)) +ball-radius+))
 		  (set-rigidbody-2d-velocity! rbody
-					      (make-vector2 (vector-x (rigidbody-2d-velocity rbody)) (* -1 (vector-y (rigidbody-2d-velocity rbody)))))))))
+					      (* (rigidbody-2d-velocity rbody)
+						 (make-vector 1 -1)))))))
 
 (add-system
  (make-system 'apply-wall-bounce
@@ -74,7 +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
-					      (make-vector2 (* -1 (vector-x (rigidbody-2d-velocity rbody))) (vector-y (rigidbody-2d-velocity rbody))))))))
+					      (* (rigidbody-2d-velocity rbody)
+						 (make-vector -1 1)))))))
 
 (add-system
  (make-system 'apply-friction
@@ -83,9 +83,8 @@
 	      '(<rigidbody-2d>)
 	      (lambda (_ rbody)
 		(set-rigidbody-2d-velocity! rbody
-					    (vector-+ (rigidbody-2d-velocity rbody)
-						      (vector-*
-						       (make-vector2 (* (get-frame-time) +friction+) (* (get-frame-time) +friction+))
+					    (+ (rigidbody-2d-velocity rbody)
+					       (* (get-frame-time) +friction+
 						  (rigidbody-2d-velocity rbody)))))))
 
 (add-system
@@ -95,7 +94,7 @@
 	      '(<rigidbody-2d> <screen-transform>)
 	      (lambda (_ rbody transform)
 		(set-position! transform
-			       (vector-+ (rigidbody-2d-velocity rbody)
+			       (+ (rigidbody-2d-velocity rbody)
 				  (position transform))))))
 
 (define-record-type <key-press>
@@ -120,7 +119,7 @@
 	      (lambda (_ rbody)
 		(when (peek-event 'input 'boost)
 		  (set-rigidbody-2d-velocity! rbody
-					      (vector-* (make-vector2 2 2)
+					      (* 2
 						 (rigidbody-2d-velocity rbody)))))))
 
 (add-system
@@ -134,53 +133,53 @@
 (create-entity
  (make-visual-2d
   (make-circle-2d
-   (make-vector2 0 0)
+   (make-vector 0 0)
    +ball-radius+
    #t)
   (make-color 0 0 1 1)
   0)
  (make-screen-transform
-  (make-vector2 100 100)
-  (make-vector2 0 0)
+  (make-vector 100 100)
+  (make-vector 0 0)
   0
-  (make-vector2 1 1)
+  (make-vector 1 1)
   'center
   'none)
- (make-rigidbody-2d (make-vector2 5 1)))
+ (make-rigidbody-2d (make-vector 5 1)))
 
 (create-entity
  (make-visual-2d
   (make-circle-2d
-   (make-vector2 0 0)
+   (make-vector 0 0)
    +ball-radius+
    #t)
   (make-color 0 1 0 1)
   0)
  (make-screen-transform
-  (make-vector2 100 100)
-  (make-vector2 0 0)
+  (make-vector 100 100)
+  (make-vector 0 0)
   0
-  (make-vector2 1 1)
+  (make-vector 1 1)
   'center
   'none)
- (make-rigidbody-2d (make-vector2 -2 -2)))
+ (make-rigidbody-2d (make-vector -2 -2)))
 
 (create-entity
  (make-visual-2d
   (make-circle-2d
-   (make-vector2 0 0)
+   (make-vector 0 0)
    +ball-radius+
    #t)
   (make-color 1 0 0 1)
   0)
  (make-screen-transform
-  (make-vector2 100 100)
-  (make-vector2 0 0)
+  (make-vector 100 100)
+  (make-vector 0 0)
   0
-  (make-vector2 1 1)
+  (make-vector 1 1)
   'center
   'none)
- (make-rigidbody-2d (make-vector2 10 -5)))
+ (make-rigidbody-2d (make-vector 10 -5)))
 
 (create-window)
 )