Cache a Z table for layer range search

5 files changed, 46 insertions, 14 deletions

diff --git a/xs/src/myinit.h b/xs/src/myinit.h
index e69de29bb..f2104209e 100644
--- a/xs/src/myinit.h
+++ b/xs/src/myinit.h
@@ -0,0 +1,21 @@
+#ifndef _myinit_h_
+#define _myinit_h_
+
+#include <vector>
+
+typedef std::vector<unsigned int> Ztable2;
+
+class ZTable
+{
+    public:
+    ZTable(std::vector<unsigned int>* z_array);
+    std::vector<unsigned int> get_range(unsigned int min_z, unsigned int max_z);
+    std::vector<unsigned int> z;
+};
+
+ZTable::ZTable(std::vector<unsigned int>* ztable) :
+    z(*ztable)
+{
+}
+
+#endif
diff --git a/xs/t/02_object.t b/xs/t/02_object.t
index d9b2b85dc..4ceddeda3 100644
--- a/xs/t/02_object.t
+++ b/xs/t/02_object.t
@@ -6,7 +6,7 @@ use warnings;
 use Slic3r::XS;
 use Test::More tests => 1;
 
-is_deeply Slic3r::Object::XS::get_layer_range([ 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 ], 39, 69),
-    [2, 6], 'get_layer_range';
+my $table = Slic3r::Object::XS::ZTable->new([ 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 ]);
+is_deeply $table->get_range(39, 69), [2, 6], 'get_layer_range';
 
 __END__
diff --git a/xs/xsp/Object.xsp b/xs/xsp/Object.xsp
index 9a8168d4f..d6071977b 100644
--- a/xs/xsp/Object.xsp
+++ b/xs/xsp/Object.xsp
@@ -1,49 +1,58 @@
 %module{Slic3r::XS};
-%package{Slic3r::Object::XS};
 
-#include <list>
+%{
+#include <myinit.h>
 #include <vector>
+%}
 
-%{
-PROTOTYPES: DISABLE
+%name{Slic3r::Object::XS::ZTable} class ZTable {
+    ZTable(std::vector<unsigned int>* z_array);
 
+%{
 std::vector<unsigned int>
-get_layer_range(z_array, min_z, max_z)
-    std::vector<unsigned int>* z_array;
+get_range(THIS, min_z, max_z)
+    ZTable* THIS;
     unsigned int min_z;
     unsigned int max_z;
     CODE:
         RETVAL.resize(2);
         
         unsigned int bottom = 0;
-        unsigned int top = z_array->size()-1;
+        unsigned int top = THIS->z.size()-1;
         while (1) {
             unsigned int mid = bottom + floor((top - bottom)/2.0);
             if (mid == top || mid == bottom) {
                 RETVAL[0] = mid;
                 break;
             }
-            if ((*z_array)[mid] > min_z) {
+            if (THIS->z[mid] > min_z) {
                 top = mid;
             } else {
                 bottom = mid;
             }
         }
-        top = z_array->size()-1;
+        top = THIS->z.size()-1;
         while (1) {
             unsigned int mid = bottom + ceil((top - bottom)/2.0);
             if (mid == top || mid == bottom) {
                 RETVAL[1] = mid;
                 break;
             }
-            if ((*z_array)[mid] < max_z) {
+            if (THIS->z[mid] < max_z) {
                 bottom = mid;
             } else {
                 top = mid;
             }
         }
-        delete z_array;
     OUTPUT:
         RETVAL
+%}
 
+};
+
+%package{Slic3r::Object::XS};
+
+%{
+#include <myinit.h>
+#include <vector>
 %}
diff --git a/xs/xsp/my.map b/xs/xsp/my.map
index ad7868c92..6ce884228 100644
--- a/xs/xsp/my.map
+++ b/xs/xsp/my.map
@@ -1 +1,2 @@
-std::map<uint32_t, uint32_t>*           T_PTR
+ZTable*         O_OBJECT
+std::vector< unsigned int >*	T_STD_VECTOR_UINT_PTR
diff --git a/xs/xsp/typemap.xspt b/xs/xsp/typemap.xspt
index 15a95c239..cbb66c436 100644
--- a/xs/xsp/typemap.xspt
+++ b/xs/xsp/typemap.xspt
@@ -1 +1,2 @@
 %typemap{std::string};
+%typemap{std::vector< unsigned int >*};
\ No newline at end of file