Merge branch 'master' of https://github.com/ryobg/obj2hmap

Author: ryobg

README.md

@@ -30,6 +30,12 @@ development I used GCC 6.2. No other external dependencies.
 c++ obj2hmap.cpp -o obj2hmap -O2
 ```
 
+Or MacOS:
+
+```
+clang++ -std=c++14 -stdlib=libc++ -Weverything  obj2hmap.cpp -o obj2hmap -O2
+```
+
 Is enough. You can skip even the optimization level `-O2` and the named executable `-o obj2hmap`.
 
 I have tested with Visual Studio Community 2015 and succeeded to build:

hmap2obj.cpp

@@ -58,8 +58,8 @@ class hmap2obj
         std::string hmap;   ///< Input *.* heightmap binary file to read from
         std::string obj;    ///< Output *.obj file to write to
         uvec2 hmap_size;    ///< How big is the integer grid of the input heighmap file
-        vec3 obj_blo;       ///< The lowest corner of the obj bounding box
-        vec3 obj_bhi;       ///< The highest corner of the obj bounding box
+        dvec3 obj_blo;      ///< The lowest corner of the obj bounding box
+        dvec3 obj_bhi;      ///< The highest corner of the obj bounding box
         bool absolute;      ///< Whether height values shall occupy the whole input grid range
     };
 
@@ -116,8 +116,8 @@ hmap2obj::param_type hmap2obj::parse_cli (std::vector<std::string> const& args)
     param_type p;
     p.absolute = false;
     p.hmap_size.fill (0);
-    p.obj_blo.fill (numeric_limits<float>::quiet_NaN ());
-    p.obj_bhi.fill (numeric_limits<float>::quiet_NaN ());
+    p.obj_blo.fill (numeric_limits<decltype(p.obj_blo)::value_type>::quiet_NaN ());
+    p.obj_bhi.fill (numeric_limits<decltype(p.obj_bhi)::value_type>::quiet_NaN ());
 
     for (auto& arg: args) 
     {
@@ -158,7 +158,7 @@ hmap2obj::param_type hmap2obj::parse_cli (std::vector<std::string> const& args)
         try
         {
             bool succ = false;
-            float x = stof (arg);
+            auto x = stod (arg);
 
             for (size_t i = 0, n = p.obj_blo.size (); i < n; ++i)
                 if (isnan (p.obj_blo[i])) 

obj2hmap.cpp

@@ -61,8 +61,8 @@ class obj2hmap
         std::string hmap;   ///< Output *.* binary file to write to
         uvec3 hmap_size;    ///< Says how big is the integer grid for the heightmap
         bvec3 height_coord; ///< Toggles which one of the 3 coords is the displacement axis
-        float objmin;       ///< Optional, real OBJ lowest displacement coordinate value
-        float objmax;       ///< Optional, real OBJ highest displacement coordinate value
+        double objmin;      ///< Optional, real OBJ lowest displacement coordinate value
+        double objmax;      ///< Optional, real OBJ highest displacement coordinate value
         enum file_type      ///< Talks about what kind of heightmap values we should output
         {
             u8, u16, u32, f32,      ///< Binary 8/16/32 unsigned and 32 bit float
@@ -145,8 +145,8 @@ obj2hmap::param_type obj2hmap::parse_cli (std::vector<std::string> const& args)
     using namespace std;
 
     param_type p;
-    p.objmin = numeric_limits<float>::quiet_NaN ();
-    p.objmax = numeric_limits<float>::quiet_NaN ();
+    p.objmin = numeric_limits<decltype(p.objmin)>::quiet_NaN ();
+    p.objmax = numeric_limits<decltype(p.objmax)>::quiet_NaN ();
     p.hmap_size.fill (0);
     p.height_coord.fill (false);
 
@@ -219,7 +219,7 @@ obj2hmap::param_type obj2hmap::parse_cli (std::vector<std::string> const& args)
 
         try
         {
-            float n = stof (arg);
+            auto n = stod (arg);
             if (isnan (p.objmin))
             {
                 p.objmin = n;
@@ -412,12 +412,12 @@ void obj2hmap::dump_heightmap ()
 
     size_t haxis = find_disp_axis ();
 
-    double objmin = params.objmin;
-    double objmax = params.objmax;
+    double objmin = blo[haxis];
+    double objmax = bhi[haxis];
     if (!isnan (params.objmin) && !isnan (params.objmax))
     {
-        objmin = min<double> (objmin, params.objmin);
-        objmax = max<double> (objmax, params.objmax);
+        objmin = min (objmin, params.objmin);
+        objmax = max (objmax, params.objmax);
     }
 
     auto height = params.hmap_size.at (haxis) / (objmax - objmin);