Round out the float changes

Author: vygr

STATUS.md

@@ -37,6 +37,15 @@ Consildated all `sin` operations to use `r_sin`.
 
 Consildated all `sqrt` operations to use `vp-sqrt-ff`.
 
+`list-bind-args` now take optional destination reg list. To better fit with
+extracting `real` register values from objects.
+
+Renamed application level `vec-xxx` functions to `vector-xxx` to avoid clashing
+with the `sys_math` class.
+
+`:quant` method added to real and reals classes. `(quant real tol) -> real` and
+`(reals-quant reals tol [reals]) -> reals)` added to `root.inc`.
+
 ------
 
 New `class/mstream/class.inc` VP class for in memory stream buffers. A seekable

apps/bubbles/app.inc

@@ -10,22 +10,22 @@
 
 (cond   ;pick number format :t/:nil
 	(:t ;reals
-		(defmacro vec (&rest _) `(reals ~_))
+		(defmacro vector (&rest _) `(reals ~_))
 		(defmacro i2n (_) `(n2r ,_))
 		(defmacro f2n (_) `(n2r ,_)))
 	(:t ;fixed point
-		(defmacro vec (&rest _) `(fixeds ~_))
+		(defmacro vector (&rest _) `(fixeds ~_))
 		(defmacro i2n (_) `(n2f ,_))
 		(defmacro f2n (_) _)))
 
-(defmacro vec-n2f (&rest _)
+(defmacro vector-n2f (&rest _)
 	(static-qq (fixeds ~(map (lambda (_) (list 'n2f _)) _))))
 
-(defmacro vec-i2n (&rest _)
-	(static-qq (vec ~(map (lambda (_) (list 'i2n _)) _))))
+(defmacro vector-i2n (&rest _)
+	(static-qq (vector ~(map (lambda (_) (list 'i2n _)) _))))
 
-(defmacro vec-f2n (&rest _)
-	(static-qq (vec ~(map (lambda (_) (list 'f2n _)) _))))
+(defmacro vector-f2n (&rest _)
+	(static-qq (vector ~(map (lambda (_) (list 'f2n _)) _))))
 
 (enums +dlist 0
 	(enum mask light_pos layer1_canvas layer1_verts))
@@ -37,4 +37,4 @@
 	(enum p v r c))
 
 (defq box_size 500 focal_len 1 max_vel 5 num_bubbles 50 bubble_radius 70
-	light_pos (vec-i2n (neg box_size) (neg box_size) (neg (* box_size 4))))
+	light_pos (vector-i2n (neg box_size) (neg box_size) (neg (* box_size 4))))

apps/bubbles/app.lisp

@@ -11,7 +11,7 @@
 
 (defq +width 600 +height 600 +min_width 300 +min_height 300
 	+rate (/ 1000000 60) +base 0.3
-	+palette (push `(,quote) (map (lambda (_) (vec-i2n
+	+palette (push `(,quote) (map (lambda (_) (vector-i2n
 			(/ (logand (>> _ 16) 0xff) 0xff)
 			(/ (logand (>> _ 8) 0xff) 0xff)
 			(/ (logand _ 0xff) 0xff)))
@@ -39,21 +39,21 @@
 	(defq out (cap num (list)))
 	(while (> (-- num) -1)
 		(push out (list
-			(vec-i2n (- (random (const (* box_size 2))) box_size)
+			(vector-i2n (- (random (const (* box_size 2))) box_size)
 				(- (random (const (* box_size 2))) box_size)
 				(- (random (const (* box_size 2))) box_size))
-			(vec-i2n (- (random (const (inc (* max_vel 2)))) (const max_vel))
+			(vector-i2n (- (random (const (inc (* max_vel 2)))) (const max_vel))
 				(- (random (const (inc (* max_vel 2)))) (const max_vel))
 				(- (random (const (inc (* max_vel 2)))) (const max_vel)))
 			(i2n (const bubble_radius))
-			(vec-add (const (vec-f2n +base +base +base))
-				(vec-scale (elem-get +palette (random (length +palette)))
+			(vector-add (const (vector-f2n +base +base +base))
+				(vector-scale (elem-get +palette (random (length +palette)))
 					(f2n (random (const (- 1.0 +base))))))))) out)
 
 (defun vertex-update (verts)
 	(each (lambda (vert)
 		(bind '(p v _ _) vert)
-		(vec-add p v p)
+		(vector-add p v p)
 		(bind '(x y z) p)
 		(bind '(vx vy vz) v)
 		(if (or (> x (const (i2n box_size))) (< x (const (i2n (neg box_size)))))
@@ -62,7 +62,7 @@
 			(setq vy (neg vy)))
 		(if (or (> z (const (i2n box_size))) (< z (const (i2n (neg box_size)))))
 			(setq vz (neg vz)))
-		(elem-set vert +vertex_v (vec vx vy vz))) verts))
+		(elem-set vert +vertex_v (vector vx vy vz))) verts))
 
 (defun fpoly (canvas col x y _)
 	;draw a polygon on a canvas
@@ -86,13 +86,13 @@
 	(reduce (lambda (out ((x y z) _ r c))
 		(setq z (+ z (const (i2n (+ (* box_size 2) max_vel)))))
 		(when (> z (const (i2n focal_len)))
-			(defq v (vec x y z) w (/ hsw z) h (/ hsh z))
-			(bind '(sx sy sz) (vec-add v (vec-scale (vec-norm
-				(vec-add v (vec-sub (elem-get dlist +dlist_light_pos) v))) r)))
+			(defq v (vector x y z) w (/ hsw z) h (/ hsh z))
+			(bind '(sx sy sz) (vector-add v (vector-scale (vector-norm
+				(vector-add v (vector-sub (elem-get dlist +dlist_light_pos) v))) r)))
 			(defq x (+ (* x h) hsw) y (+ (* y h) hsh) r (* r h)
 				sx (+ (* sx h) hsw) sy (+ (* sy h) hsh))
-			(push out (list (vec-n2f x y z) (vec-n2f sx sy) (n2f r)
-				(lighting c z) (lighting (const (vec-i2n 1 1 1)) z)))) out)
+			(push out (list (vector-n2f x y z) (vector-n2f sx sy) (n2f r)
+				(lighting c z) (lighting (const (vector-i2n 1 1 1)) z)))) out)
 		verts (cap (length verts) (list))))
 
 (defun render-verts (canvas verts)
@@ -187,7 +187,7 @@
 									(setq last_state :d)))
 							;set light pos
 							(elem-set dlist +dlist_light_pos
-								(vec-i2n (* rx 4) (* ry 4) (neg (* box_size 4)))))
+								(vector-i2n (* rx 4) (* ry 4) (neg (* box_size 4)))))
 						(:t ;mouse button is up
 							(case last_state
 								(:d ;was down last time

apps/eyes/app.lisp

@@ -99,11 +99,11 @@
 
 	; --- Left Eye ---
 	(defq vec_to_mouse (Vec2-f (- rel_mx left_eye_cx) (- rel_my eye_cy))
-		dist_to_mouse (vec-length vec_to_mouse)
+		dist_to_mouse (vector-length vec_to_mouse)
 		iris_offset (if (> dist_to_mouse 0.0)
-			(vec-scale (vec-norm vec_to_mouse) (min dist_to_mouse max_iris_dist))
+			(vector-scale (vector-norm vec_to_mouse) (min dist_to_mouse max_iris_dist))
 			(Vec2-f 0.0 0.0)))
-	(bind '(l_iris_px l_iris_py) (vec-add (Vec2-f left_eye_cx eye_cy) iris_offset))
+	(bind '(l_iris_px l_iris_py) (vector-add (Vec2-f left_eye_cx eye_cy) iris_offset))
 
 	; Draw left eye
 	(.-> *canvas*
@@ -118,11 +118,11 @@
 
 	; --- Right Eye ---
 	(defq vec_to_mouse (Vec2-f (- rel_mx right_eye_cx) (- rel_my eye_cy))
-		dist_to_mouse (vec-length vec_to_mouse)
+		dist_to_mouse (vector-length vec_to_mouse)
 		iris_offset (if (> dist_to_mouse 0.0)
-			(vec-scale (vec-norm vec_to_mouse) (min dist_to_mouse max_iris_dist))
+			(vector-scale (vector-norm vec_to_mouse) (min dist_to_mouse max_iris_dist))
 			(Vec2-f 0.0 0.0)))
-	(bind '(r_iris_px r_iris_py) (vec-add (Vec2-f right_eye_cx eye_cy) iris_offset))
+	(bind '(r_iris_px r_iris_py) (vector-add (Vec2-f right_eye_cx eye_cy) iris_offset))
 
 	; Draw right eye
 	(.-> *canvas*

apps/mandelbrot/lisp.vp

@@ -24,11 +24,10 @@
 	(errorif-lisp-args-sig 'error :r1 2)
 
 	(vp-push :r0)
-	(array-bind-args :r1 `(,ox0 ,oy0))
-	(assign `((,ox0 num_value) (,oy0 num_value)) `(,x0 ,y0))
+	(list-bind-args :r1 `(,ox0 ,oy0) '(:real :real) `(,x0 ,y0))
 
 	(vp-lea-p 'fn_consts cnt)
-	(load-fields cnt `(,(fn-const (n2r 4.0)) ,(fn-const (n2r 2.0))) `(,four ,two))
+	(load-fields cnt '((fn-const (n2r 4.0)) (fn-const (n2r 2.0))) `(,four ,two))
 
 	;init i=0, xc=0.0, yc=0.0, x2=0.0, y2=0.0
 	(vp-xor-rr cnt cnt)

apps/molecule/app.lisp

@@ -81,7 +81,7 @@
 
 (defun lighting (col at)
 	;very basic attenuation and diffuse
-	(bind '(r g b) (vec-min (vec-add (vec-scale col (* (n2f at) 255.0) +fixeds_tmp3)
+	(bind '(r g b) (vector-min (vector-add (vector-scale col (* (n2f at) 255.0) +fixeds_tmp3)
 		(const (Vec3-f 32.0 32.0 32.0)) +fixeds_tmp3)
 		(const (Vec3-f 255.0 255.0 255.0)) +fixeds_tmp3))
 	(+ 0xff000000 (<< (n2i r) 16) (<< (n2i g) 8) (n2i b)))
@@ -143,7 +143,7 @@
 		(defq scale_p (/ (const (n2r 2.0)) radius) scale_r (/ (const (n2r 0.0625)) radius))
 		(each (lambda (ball)
 			(bind '(v r _) ball)
-			(push (vec-scale (vec-sub v center v) scale_p v) +real_1)
+			(push (vector-scale (vector-sub v center v) scale_p v) +real_1)
 			(elem-set ball +ball_radius (* scale_r r))) balls)))
 
 (defun reset ()

apps/pcb/layer.inc

@@ -25,11 +25,11 @@
 (defun Record (id layer_line)
 	(defq p1 (slice layer_line +layer_line_x1 +layer_line_x2)
 		p2 (slice layer_line +layer_line_x2 +layer_line_radius)
-		pv (apply fixeds (vec-perp-2d (vec-sub p2 p1)))
-		l (vec-length pv))
+		pv (apply fixeds (vector-perp-2d (vector-sub p2 p1)))
+		l (vector-length pv))
 	(if (= l 0.0)
 		(defq norm +fixeds_zero2 dist 0.0)
-		(defq norm (vec-scale pv (recip l)) dist (vec-dot norm p1)))
+		(defq norm (vector-scale pv (recip l)) dist (vector-dot norm p1)))
 	(list id layer_line p1 p2 norm dist))
 
 (defun hit-line? (record layer_line)
@@ -39,12 +39,12 @@
 					(elem-get (elem-get record +record_layer_line) +layer_line_gap)))
 		p1 (slice layer_line +layer_line_x1 +layer_line_x2)
 		p2 (slice layer_line +layer_line_x2 +layer_line_radius)
-		dp1 (- (vec-dot (elem-get record +record_norm) p1) (elem-get record +record_dist))
-		dp2 (- (vec-dot (elem-get record +record_norm) p2) (elem-get record +record_dist)))
+		dp1 (- (vector-dot (elem-get record +record_norm) p1) (elem-get record +record_dist))
+		dp2 (- (vector-dot (elem-get record +record_norm) p2) (elem-get record +record_dist)))
 	(cond
 		((and (> dp1 d) (> dp2 d)) :nil)
 		((and (< dp1 (neg d)) (< dp2 (neg d))) :nil)
-		((vec-collide-thick-lines-2d p1 p2 (elem-get record +record_p1) (elem-get record +record_p2) d))))
+		((vector-collide-thick-lines-2d p1 p2 (elem-get record +record_p1) (elem-get record +record_p2) d))))
 
 (defun hit-line (buckets minx miny maxx maxy width id func line)
 	(defq miny (* (dec miny) width) maxy (* maxy width))

apps/pcb/router.inc

@@ -20,7 +20,7 @@
 	(while (<= y y_range)
 		(defq x (neg x_range))
 		(while (<= x x_range)
-			(defq l (vec-length (Vec2-f (n2f x) (n2f y))))
+			(defq l (vector-length (Vec2-f (n2f x) (n2f y))))
 			(and (> l 0.1) (<= l vec_range)
 				(push out (nums x y 0)))
 			(++ x))
@@ -33,8 +33,8 @@
 		maxxyz (Vec2-f -1000000.0 -1000000.0)
 		quant (n2f quant))
 	(each (lambda (p)
-		(vec-min minxyz (setq p (. p :get_pos)) minxyz)
-		(vec-max maxxyz p maxxyz)) pads)
+		(vector-min minxyz (setq p (. p :get_pos)) minxyz)
+		(vector-max maxxyz p maxxyz)) pads)
 	(bind '(minx miny) minxyz)
 	(bind '(maxx maxy) maxxyz)
 	(list (n2f (n2i (/ (* (- maxx minx) (- maxy miny)) quant)))
@@ -90,7 +90,7 @@
 		(bind '(x y z) (. p :get_pos))
 		(. p :set_pos (Vec3-f (* x grid_res) (* y grid_res) z))
 		(each (lambda (p)
-			(vec-scale p grid_res p)) (. p :get_shape))) pads)
+			(vector-scale p grid_res p)) (. p :get_shape))) pads)
 	(each (lambda (wire)
 		(each (lambda (p)
 			(bind '(x y z) p)
@@ -164,11 +164,11 @@
 					(bind '(x0 y0 z0) p0)
 					(bind '(x1 y1 z1) p1)
 					(push wire_lines (Layers-line x0 y0 z0 x1 y1 z1 radius gap))
-					(defq p (Vec2-f x0 y0) v (vec-sub p (Vec2-f x1 y1))
-						l (vec-length v) norm (vec-scale v (recip l))
+					(defq p (Vec2-f x0 y0) v (vector-sub p (Vec2-f x1 y1))
+						l (vector-length v) norm (vector-scale v (recip l))
 						i 0.0)
 					(while (< i l)
-						(bind '(x y) (vec-add p (vec-scale norm i)))
+						(bind '(x y) (vector-add p (vector-scale norm i)))
 						(. wire_nodes :insert (. pcb :pad_point_to_node (Vec3-f x y z0)))
 						(setq i (+ i 0.25)))
 					(. wire_nodes :insert (. pcb :pad_point_to_node p1))))) (list wire) 1)) wires)
@@ -277,7 +277,7 @@
 				p0 :nil p1 (. pcb :node_to_pad_point (first pth)))
 			(each! (lambda (p)
 				(setq p0 p1 p1 (. pcb :node_to_pad_point p)
-					d1 (vec-norm (vec-sub p1 p0)))
+					d1 (vector-norm (vector-sub p1 p0)))
 				(unless (eql d0 d1)
 					(push opt_path (elem-get pth (dec (!))))
 					(setq d0 d1))) (list pth) 1)
@@ -311,7 +311,7 @@
 				(:t ;sort nodes and take the first
 					(setq path_node (second (elem-get
 						(sort
-							(map (# (list (vec-squared-euclidean-distance path_node %0) %0))
+							(map (# (list (vector-squared-euclidean-distance path_node %0) %0))
 							(filter (# (= (. pcb :get_node %0) (. pcb :get_node (first nearer_nodes))))
 							(sort nearer_nodes (# (- (. pcb :get_node %0) (. pcb :get_node %1))))))
 							(# (- (first %0) (first %1)))) 0))))))
@@ -376,7 +376,7 @@
 				(if (>= verbosity 2) (write-line stream "   ;shape"))
 				(write-blk stream "   (")
 				(each (lambda (p)
-						(write-blk stream (str (vec-scale p scale))))
+						(write-blk stream (str (vector-scale p scale))))
 					(. p :get_shape))
 				(write-line stream ")")
 				(write-line stream "  )"))
@@ -481,7 +481,7 @@
 		(defq out (clear '())
 			vecm (nums (dec (get :width this)) (dec (get :height this)) (dec (get :depth this))))
 		(each (lambda (v)
-			(and (eql (vec-min vecm (vec-max (defq n (vec-add node v)) +nums_zero3 +nums_tmp3) +nums_tmp3) n)
+			(and (eql (vector-min vecm (vector-max (defq n (vector-add node v)) +nums_zero3 +nums_tmp3) +nums_tmp3) n)
 					(= (. this :get_node n) 0)
 				(push out n))) (elem-get vec (% (elem-get node +vec3_z) 2)))
 		out)
@@ -492,7 +492,7 @@
 		(defq out (clear '()) d (. this :get_node node)
 			vecm (nums (dec (get :width this)) (dec (get :height this)) (dec (get :depth this))))
 		(each (lambda (v)
-			(and (eql (vec-min vecm (vec-max (defq n (vec-add node v)) +nums_zero3 +nums_tmp3) +nums_tmp3) n)
+			(and (eql (vector-min vecm (vector-max (defq n (vector-add node v)) +nums_zero3 +nums_tmp3) +nums_tmp3) n)
 					(< 0 (. this :get_node n) d)
 				(push out n))) (elem-get vec (% (elem-get node +vec3_z) 2)))
 		out)
@@ -552,7 +552,7 @@
 		; (. pcb :unmark_distances) -> pcb
 		;set all grid values back to 0
 		(raise :nodes)
-		(vec-sub nodes nodes nodes)
+		(vector-sub nodes nodes nodes)
 		this)
 
 	(defmethod :reset_areas ()