fix gl_depth on init

Author: mclarsen

src/apcomp/compositor.cpp

@@ -192,7 +192,7 @@ Compositor::Composite()
   {
     CompositeVisOrder();
   }
-  // Make this a param to avoid the copy?
+  // TODO Make this a param/ref to avoid the copy?
   return m_images[0];
 }
 

src/apcomp/image.cpp

@@ -62,6 +62,7 @@ Image::Init(const float *color_buffer,
   m_bounds.m_max_x = width;
   m_bounds.m_max_y = height;
   m_orig_bounds = m_bounds;
+  m_gl_depth = gl_depth;
   const int size = width * height;
   m_pixels.resize(size * 4);
   m_depths.resize(size);
@@ -100,6 +101,7 @@ Image::Init(const unsigned char *color_buffer,
   m_bounds.m_max_x = width;
   m_bounds.m_max_y = height;
   m_orig_bounds = m_bounds;
+  m_gl_depth = gl_depth;
 
   const int size = width * height;
   m_pixels.resize(size * 4);
@@ -173,6 +175,7 @@ Image::SubsetFrom(const Image &image,
   m_bounds = sub_region;
   m_orig_rank = image.m_orig_rank;
   m_composite_order = image.m_composite_order;
+  m_gl_depth = image.m_gl_depth;
 
   assert(sub_region.m_min_x >= image.m_bounds.m_min_x);
   assert(sub_region.m_min_y >= image.m_bounds.m_min_y);
@@ -213,6 +216,7 @@ void
 Image::SubsetTo(Image &image) const
 {
   image.m_composite_order = m_composite_order;
+  image.m_gl_depth = m_gl_depth;
   assert(m_bounds.m_min_x >= image.m_bounds.m_min_x);
   assert(m_bounds.m_min_y >= image.m_bounds.m_min_y);
   assert(m_bounds.m_max_x <= image.m_bounds.m_max_x);
@@ -253,6 +257,7 @@ Image::Swap(Image &other)
 
   m_orig_bounds = other.m_orig_bounds;
   m_bounds      = other.m_bounds;
+  m_gl_depth = other.m_gl_depth;
 
   other.m_orig_bounds = orig;
   other.m_bounds      = bounds;
@@ -322,4 +327,50 @@ void Image::Save(std::string name)
   encoder.Save(name +  ".png");
 }
 
+void Image::SaveDepth(std::string name)
+{
+  int width = m_bounds.m_max_x - m_bounds.m_min_x + 1;
+  int height = m_bounds.m_max_y - m_bounds.m_min_y + 1;
+
+  if(width * height <= 0)
+  {
+    throw Error("Image: cannot save empty image");
+  }
+
+  float inf = std::numeric_limits<float>::infinity();
+  float min_v = inf;
+  float max_v = -inf;
+  for(int i = 0; i < width * height;++i)
+  {
+    float d = m_depths[i];
+    if(d != inf)
+    {
+      min_v = std::min(min_v, d);
+      max_v = std::max(max_v, d);
+    }
+  }
+
+  const float len = max_v - min_v;
+  std::vector<float> ndepths(width*height*4);
+
+  for(int i = 0; i < width * height;++i)
+  {
+    const float depth = m_depths[i];
+    float value = 0.f;
+    const int offset = i * 4;
+    if(depth != inf)
+    {
+      value = (depth - min_v) / len;
+    }
+    ndepths[offset + 0] = value;
+    ndepths[offset + 1] = value;
+    ndepths[offset + 2] = value;
+    ndepths[offset + 3] = 1.f;
+  }
+
+  PNGEncoder encoder;
+  encoder.Encode(&ndepths[0], width, height);
+  encoder.Save(name +  ".png");
+}
+
 } // namespace apcomp

src/apcomp/image.hpp

@@ -82,6 +82,7 @@ struct APCOMP_API Image
     std::string ToString() const;
 
     void Save(std::string name);
+    void SaveDepth(std::string name);
 };
 
 } //namespace  apcomp

src/apcomp/internal/ImageCompositor.hpp

@@ -54,7 +54,7 @@ class APCOMP_API ImageCompositor
     front.m_depths[i] = depth;
   }
 }
-// Only composite values the GL depths range (0,1)
+
 void ZBufferComposite(apcomp::Image &front, const apcomp::Image &image)
 {
   assert(front.m_depths.size() == front.m_pixels.size() / 4);
@@ -67,6 +67,7 @@ void ZBufferComposite(apcomp::Image &front, const apcomp::Image &image)
   bool gl_depth = front.m_gl_depth;
   if(gl_depth)
   {
+    // Only composite values the GL depths range (0,1)
 #ifdef apcomp_USE_OPENMP
     #pragma omp parallel for
 #endif

src/apcomp/internal/RadixKCompositor.cpp

@@ -177,6 +177,10 @@ void
 RadixKCompositor::CompositeSurface(apcompdiy::mpi::communicator &diy_comm,
                                    Image &image)
 {
+  std::cout<<"["<<diy_comm.rank()<<"] "<<image.m_gl_depth<<"\n";
+  std::stringstream ss;
+  ss<<"apcomp_depth_"<<diy_comm.rank();
+  image.SaveDepth(ss.str());
   CompositeImpl(diy_comm, image);
 }