Add to_vec3 and to_pt3 helper methods

Author: jdahlstrom

core/src/math/point.rs

@@ -134,6 +134,13 @@ where
     }
 }
 
+impl Point2 {
+    /// Converts `self` into a `Point3`, with z equal to 0.
+    pub fn to_pt3(self) -> Point3 {
+        pt3(self.x(), self.y(), 0.0)
+    }
+}
+
 impl<R, Sc, B> Point<R, Real<3, B>>
 where
     R: Index<usize, Output = Sc>,

core/src/math/vec.rs

@@ -266,9 +266,17 @@ where
 }
 
 // TODO Make more general - requires a "Scalar::one()" method
-impl Vec2 {
+impl<B> Vec2<B> {
+    /// Unit vector codirectional with the x-axis.
     pub const X: Self = vec2(1.0, 0.0);
+
+    /// Unit vector codirectional with the y-axis.
     pub const Y: Self = vec2(0.0, 1.0);
+
+    /// Converts `self` into a `Vec3`, with z equal to 0.
+    pub fn to_vec3(self) -> Vec3<B> {
+        vec3(self.x(), self.y(), 0.0)
+    }
 }
 
 impl<R, Sc, B> Vector<R, Real<3, B>>
@@ -335,8 +343,13 @@ where
 
 // TODO Make more general
 impl Vec3 {
+    /// Unit vector codirectional with the x-axis.
     pub const X: Self = vec3(1.0, 0.0, 0.0);
+
+    /// Unit vector codirectional with the y-axis.
     pub const Y: Self = vec3(0.0, 1.0, 0.0);
+
+    /// Unit vector codirectional with the z-axis.
     pub const Z: Self = vec3(0.0, 0.0, 1.0);
 }
 

core/src/render/text.rs

@@ -3,7 +3,7 @@ use core::fmt;
 use std::io;
 
 use crate::geom::{vertex, Mesh, Tri};
-use crate::math::{pt2, pt3, vec2, vec3, Color3, Point2, Vec2};
+use crate::math::{pt2, vec2, vec3, Color3, Point2, Vec2};
 use crate::util::buf::Buf2;
 
 use super::tex::{Atlas, Layout, SamplerClamp, TexCoord};
@@ -75,8 +75,7 @@ impl Text {
             anchor.y() * glyph_h * rows as f32,
         );*/
         let offset = vec2(0.0, 0.0);
-        let pos = *cursor - offset;
-        let pos = pt3(pos.x(), pos.y(), 0.0);
+        let pos = (*cursor - offset).to_pt3().to();
         let l = geom.verts.len();
 
         geom.verts.extend([

demos/src/bin/bezier.rs

@@ -37,8 +37,8 @@ fn main() {
         let approx = b.approximate(|err| err.len_sqr() < 1.0);
 
         for Edge(p0, p1) in approx.edges() {
-            let p0 = pt3(p0.x(), p0.y(), 0.0);
-            let p1 = pt3(p1.x(), p1.y(), 0.0);
+            let p0 = p0.to_pt3().to();
+            let p1 = p1.to_pt3().to();
             line([vertex(p0, ()), vertex(p1, ())], |sl| {
                 buf.color_buf[sl.y][sl.xs].fill(0xFF_FF_FF);
             })

demos/src/bin/sprites.rs

@@ -3,11 +3,11 @@ use core::{array::from_fn, ops::ControlFlow::Continue};
 use re::prelude::*;
 
 use re::math::rand::{Distrib, PointsInUnitBall, Xorshift64};
-use re::render::{cam::Transform, render, Model, ModelToView, ViewToProj};
+use re::render::{cam::Transform, render, ModelToView, ViewToProj};
 use re_front::minifb::Window;
 
 fn main() {
-    let verts: [Vec2<Model>; 4] = [
+    let offsets: [Vec2<View>; 4] = [
         vec2(-1.0, -1.0),
         vec2(-1.0, 1.0),
         vec2(1.0, -1.0),
@@ -19,7 +19,7 @@ fn main() {
     let verts: Vec<Vertex3<Vec2<_>>> = PointsInUnitBall
         .samples(rng)
         .take(count)
-        .flat_map(|pos| verts.map(|v| vertex(pos.to(), v)))
+        .flat_map(|pos| offsets.map(|off| vertex(pos.to(), off)))
         .collect();
 
     let tris: Vec<_> = (0..count)
@@ -35,7 +35,7 @@ fn main() {
     let shader = shader::new(
         |v: Vertex3<Vec2<_>>,
          (mv, proj): (&Mat4x4<ModelToView>, &Mat4x4<ViewToProj>)| {
-            let vertex_pos = 0.008 * vec3(v.attrib.x(), v.attrib.y(), 0.0);
+            let vertex_pos = 0.008 * v.attrib.to_vec3();
             let view_pos = mv.apply_pt(&v.pos) + vertex_pos;
             vertex(proj.apply(&view_pos), v.attrib)
         },

geom/src/solids/lathe.rs

@@ -5,8 +5,7 @@ use core::ops::Range;
 
 use re::geom::{vertex, Mesh, Normal2, Normal3, Polyline, Vertex, Vertex2};
 use re::math::{
-    polar, pt2, pt3, rotate_y, turns, vec2, vec3, Angle, Lerp, Parametric,
-    Vary, Vec3,
+    polar, pt2, rotate_y, turns, vec2, Angle, Lerp, Parametric, Vary, Vec3,
 };
 
 /// A surface of revolution generated by rotating a 2D curve around the y-axis.
@@ -113,8 +112,8 @@ impl<P: Parametric<Vertex2<Normal2, ()>>> Lathe<P> {
             .vary_to(1.0, verts_per_sec as u32)
             .map(|t| self.points.eval(t))
         {
-            let mut pos = start.apply_pt(&pt3(pos.x(), pos.y(), 0.0));
-            let mut norm = start.apply(&vec3(n.x(), n.y(), 0.0));
+            let mut pos = start.apply_pt(&pos.to_pt3());
+            let mut norm = start.apply(&n.to_vec3());
 
             for _ in 0..=secs {
                 b.push_vert(pos, norm);