Fix Reserve (#54)

* Stubs for the new decimater

* Fix reserve

* Remove the other stuff

* Clean up the option reference stuff

* Clippy

Author: ranjeethmahankali

src/lib.rs

@@ -148,7 +148,7 @@ pub mod use_glam;
 mod subdiv;
 
 #[cfg(feature = "decimate")]
-pub mod decimate;
+mod decimate;
 
 #[cfg(feature = "decimate")]
 pub use decimate::{

src/property.rs

@@ -52,6 +52,9 @@ where
         self.props.push(prop);
     }
 
+    /**
+     * Reserve memory to accomodate an additional `n` elements.
+     */
     pub fn reserve(&mut self, n: usize) -> Result<(), Error> {
         for prop in self.props.iter_mut() {
             prop.reserve(n)?;
@@ -486,6 +489,9 @@ where
     T: Clone + Copy,
     H: Handle,
 {
+    /**
+     * Reserve memory for an additional `n` values.
+     */
     fn reserve(&mut self, n: usize) -> Result<(), Error> {
         if let Some(prop) = self.data.upgrade() {
             prop.try_borrow_mut()

src/subdiv/catmull.rs

@@ -31,19 +31,24 @@ where
     fn reserve(
         niter: usize,
         mesh: &mut Topology,
-        vertex_points: &mut Option<Vec<A::Vector>>,
+        mut vertex_points: Option<&mut Vec<A::Vector>>,
         edge_points: &mut Vec<A::Vector>,
         face_points: &mut Vec<A::Vector>,
     ) -> Result<(), Error> {
+        if let Some(vpts) = vertex_points.as_mut() {
+            vpts.clear();
+        }
+        edge_points.clear();
+        face_points.clear();
         debug_assert!(niter > 0);
         let mut nv = mesh.num_vertices();
         let mut ne = mesh.num_edges();
         let mut nf = mesh.num_faces();
         for i in 0..niter {
             if i == niter - 1 {
                 // Reserve the pos arrays.
-                if let Some(vpos) = vertex_points {
-                    vpos.reserve(nv);
+                if let Some(vpts) = vertex_points.as_mut() {
+                    vpts.reserve(nv);
                 }
                 edge_points.reserve(ne);
                 face_points.reserve(nf);
@@ -256,7 +261,7 @@ where
         CatmullClark::<DIM, A>::reserve(
             iterations,
             &mut self.topol,
-            &mut vpos,
+            vpos.as_mut(),
             &mut epos,
             &mut fpos,
         )?;

src/subdiv/loop_subd.rs

@@ -105,6 +105,8 @@ where
         edge_points: &mut Vec<A::Vector>,
     ) -> Result<(), Error> {
         let (mut nv, mut ne, mut nf) = (mesh.num_vertices(), mesh.num_edges(), mesh.num_faces());
+        vertex_points.clear();
+        edge_points.clear();
         for i in 0..iterations {
             if i == iterations - 1 {
                 vertex_points.reserve(nv);

src/topol.rs

@@ -197,7 +197,7 @@ pub trait HasTopology: Sized {
         self.topology().fprops.num_properties()
     }
 
-    /// Reserve memory for the given number of elements.
+    /// Reserve memory for the given number of `additional` elements.
     ///
     /// The memory is also reserved for all properties.
     fn reserve(&mut self, nverts: usize, nedges: usize, nfaces: usize) -> Result<(), Error> {