Adding MIP offset calculation. Bumping version to 1.7.1

Author: magnusw

apps/f3dmakemip/main.cpp

@@ -252,12 +252,14 @@ void makeMIP(typename Field<Data_T>::Ptr field, const Options &options,
   cout << "  Filtering \"" << field->name << ":" << field->attribute 
        << "\" (" << field->classType() << ")" << endl;
 
+  const V3i offset = computeOffset(*field);
+  
   // Handle dense fields
   if (DenseType *dense = dynamic_cast<DenseType*>(field.get())) {
     // MIP
     typename MIPDenseType::Ptr mip = 
       makeMIP<MIPDenseType, TriangleFilter>
-      (*dense, options.minRes, options.numThreads);
+      (*dense, options.minRes, offset, options.numThreads);
     writeField<Data_T>(mip, out);
     // Min/Max
     if (options.doMinMax) {
@@ -278,7 +280,7 @@ void makeMIP(typename Field<Data_T>::Ptr field, const Options &options,
     // MIP
     typename MIPSparseType::Ptr mip = 
       makeMIP<MIPSparseType, TriangleFilter>
-      (*sparse, options.minRes, options.numThreads);
+      (*sparse, options.minRes, offset, options.numThreads);
     writeField<Data_T>(mip, out);
     // Min/Max
     if (options.doMinMax) {
@@ -299,7 +301,7 @@ void makeMIP(typename Field<Data_T>::Ptr field, const Options &options,
     // MIP
     typename MIPDenseType::Ptr mip = 
       makeMIP<MIPDenseType, TriangleFilter>
-      (*dense->concreteMipLevel(0), options.minRes, options.numThreads);
+      (*dense->concreteMipLevel(0), options.minRes, offset, options.numThreads);
     writeField<Data_T>(mip, out);
     // Min/Max
     if (options.doMinMax) {
@@ -319,7 +321,7 @@ void makeMIP(typename Field<Data_T>::Ptr field, const Options &options,
   if (MIPSparseType *sparse = dynamic_cast<MIPSparseType*>(field.get())) {
     // MIP
     typename MIPSparseType::Ptr mip = makeMIP<MIPSparseType, TriangleFilter>
-      (*sparse->concreteMipLevel(0), options.minRes, options.numThreads);
+      (*sparse->concreteMipLevel(0), options.minRes, offset, options.numThreads);
     writeField<Data_T>(mip, out);
     // Min/Max
     if (options.doMinMax) {

export/Resample.h

@@ -292,7 +292,7 @@ struct TriangleFilter : public Filter
     return 1.0f * m_width;
   }
   template <typename Value_T>
-  static void op(Value_T &accumValue, const Value_T value)
+  static void op(Value_T &/*accumValue*/, const Value_T /*value*/)
   { /* No-op */ }
 private:
   const float m_width;

export/ns.h

@@ -37,7 +37,7 @@
 
 #define FIELD3D_MAJOR_VER 1
 #define FIELD3D_MINOR_VER 7
-#define FIELD3D_MICRO_VER 0
+#define FIELD3D_MICRO_VER 1
 
 #define FIELD3D_VERSION_NS v1_7