Updated surface evaluators for more compatibility

Author: Onur Rauf Bingol

geomdl/BSpline.py

@@ -228,10 +228,10 @@ def evaluate(self, **kwargs):
 
         # Evaluate
         cpts = self._evaluator.evaluate(start_u=start, stop_u=stop,
-                                        sample_size=self.sample_size,
                                         degree=self.degree,
                                         knotvector=self.knotvector,
                                         ctrlpts=self._control_points,
+                                        sample_size=self.sample_size,
                                         dimension=self._dimension,
                                         precision=self._precision)
 
@@ -1018,16 +1018,15 @@ def evaluate(self, **kwargs):
         # Clean up the surface points
         self.reset(evalpts=True)
 
-        # Compute knots in the range
-        knots_u = utilities.linspace(start_u, stop_u, self.sample_size, decimals=self._precision)
-        knots_v = utilities.linspace(start_v, stop_v, self.sample_size, decimals=self._precision)
-
-        spts = self._evaluator.evaluate(knots_u=knots_u, knots_v=knots_v,
+        # Evaluate
+        spts = self._evaluator.evaluate(start_u=start_u, stop_u=stop_u, start_v=start_v, stop_v=stop_v,
                                         degree_u=self.degree_u, degree_v=self.degree_v,
                                         knotvector_u=self.knotvector_u, knotvector_v=self.knotvector_v,
                                         ctrlpts_size_u=self.ctrlpts_size_u, ctrlpts_size_v=self.ctrlpts_size_v,
                                         ctrlpts=self._control_points2D,
-                                        dimension=self._dimension)
+                                        sample_size=self.sample_size,
+                                        dimension=self._dimension,
+                                        precision=self._precision)
 
         self._surface_points = spts
 

geomdl/evaluators.py

@@ -369,8 +369,11 @@ def evaluate(self, **kwargs):
         # Call parent method
         super(SurfaceEvaluator, self).evaluate(**kwargs)
 
-        knots_u = kwargs.get('knots_u')
-        knots_v = kwargs.get('knots_v')
+        start_u = kwargs.get('start_u')
+        stop_u = kwargs.get('stop_u')
+        start_v = kwargs.get('start_v')
+        stop_v = kwargs.get('stop_v')
+        sample_size = kwargs.get('sample_size')
         degree_u = kwargs.get('degree_u')
         degree_v = kwargs.get('degree_v')
         knot_vector_u = kwargs.get('knotvector_u')
@@ -379,8 +382,12 @@ def evaluate(self, **kwargs):
         ctrlpts_size_u = kwargs.get('ctrlpts_size_u')
         ctrlpts_size_v = kwargs.get('ctrlpts_size_v')
         dimension = kwargs.get('dimension')
+        precision = kwargs.get('precision')
 
         # Algorithm A3.5
+        knots_u = utilities.linspace(start_u, stop_u, sample_size[0], decimals=precision)
+        knots_v = utilities.linspace(start_v, stop_v, sample_size[1], decimals=precision)
+
         spans_u = helpers.find_spans(knot_vector_u, ctrlpts_size_u, knots_u)
         spans_v = helpers.find_spans(knot_vector_v, ctrlpts_size_v, knots_v)