merge 1.0.2 from main

NVIDIAGameWorks · Aug 4, 2023 · b81bd37 · b81bd37
2 parents fdb6a91 + ff2fa5c
commit b81bd37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/omm-sdk/include/omm.h b/omm-sdk/include/omm.h
@@ -16,7 +16,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
 
 #define OMM_VERSION_MAJOR 1
 #define OMM_VERSION_MINOR 0
-#define OMM_VERSION_BUILD 1
+#define OMM_VERSION_BUILD 2
 
 #define OMM_MAX_TRANSIENT_POOL_BUFFERS 8
 

diff --git a/omm-sdk/scripts/omm_header_c.txt b/omm-sdk/scripts/omm_header_c.txt
@@ -16,7 +16,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
 
 #define OMM_VERSION_MAJOR 1
 #define OMM_VERSION_MINOR 0
-#define OMM_VERSION_BUILD 1
+#define OMM_VERSION_BUILD 2
 
 #define OMM_MAX_TRANSIENT_POOL_BUFFERS 8
 

diff --git a/omm-sdk/src/bake_kernels_cpu.h b/omm-sdk/src/bake_kernels_cpu.h
@@ -120,16 +120,16 @@ struct LevelLineIntersectionKernel
         }
 
         bool IsPointOnEdge(const float2& p) const {
-            return IsZero(length(p - _p0) + length(p - _p1) - _length);
+            const float l = length(p - _p0) + length(p - _p1) - _length;
+            return IsZero(l, 1e-5f);
         }
     private:
         const float2 _p0;
         const float2 _p1;
         const float _length;
     };
 
-    static bool IsZero(float value) {
-        constexpr float kEpsilon = 1e-6f;
+    static bool IsZero(float value, float kEpsilon = 1e-6f) {
         return std::abs(value) < kEpsilon;
     };
 

diff --git a/omm-sdk/src/version.h b/omm-sdk/src/version.h
@@ -13,7 +13,7 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
 
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
 #define VERSION_REVISION 0
 
 #define VERSION_STRING STR(VERSION_MAJOR.VERSION_MINOR.VERSION_BUILD.VERSION_REVISION)