Merge pull request #109 from ThibaultLejemble/cuda

Fix compilation of Cuda example
poncateam · Oct 3, 2023 · 23cc0f0 · 23cc0f0
2 parents 0a48bd0 + e683f55
commit 23cc0f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,9 @@ Ponca changelog
 --------------------------------------------------------------------------------
 Current head (v.1.2 RC)
 
+- Examples
+    - Fix example cuda/ponca_ssgls (#109)
+
 --------------------------------------------------------------------------------
 v.1.1 RC
 This release improves the Spatial Partitioning Package with new features and

diff --git a/examples/cuda/ponca_ssgls.cu b/examples/cuda/ponca_ssgls.cu
@@ -271,21 +271,23 @@ class ProjectedWeightFunc: public Ponca::DistWeightFunc<ScreenSpacePoint,Ponca::
 public:
     typedef ScreenSpacePoint::Scalar Scalar;
     typedef ScreenSpacePoint::VectorType VectorType;
+    typedef Ponca::DistWeightFunc<ScreenSpacePoint,Ponca::SmoothWeightKernel<Scalar> >::WeightReturnType WeightReturnType;
+
 
     PONCA_MULTIARCH inline ProjectedWeightFunc(const Scalar& _t = Scalar(1.), const Scalar _dz = 0.f)
         : Ponca::DistWeightFunc<ScreenSpacePoint,Ponca::SmoothWeightKernel<Scalar> >(_t),
           m_dz(_dz) {}
 
-    PONCA_MULTIARCH inline Scalar w(const VectorType& _relativePos, const ScreenSpacePoint&  _attributes) const
+    PONCA_MULTIARCH inline WeightReturnType w(const VectorType& _relativePos, const ScreenSpacePoint&  _attributes) const
     {
         PONCA_MULTIARCH_STD_MATH(abs);
         Scalar d  = _attributes.spos().norm();
         const float dz = abs(_relativePos[2]);
         if (d > m_t || (m_dz != Scalar(0) && dz > m_dz))
         {
-            return Scalar(0.);
+            return {Scalar(0.), _relativePos};
         }
-        return m_wk.f(d/m_t);
+        return {m_wk.f(d/m_t), _relativePos};
     }
 private:
     float m_dz;