From 953375ca9cbfec5f5c697d00265e06b114154b19 Mon Sep 17 00:00:00 2001 From: chitalu Date: Mon, 12 Jun 2023 00:10:20 +0200 Subject: [PATCH] update version in mcut.h --- CMakeLists.txt | 2 +- include/mcut/mcut.h | 8 +++++++- source/kernel.cpp | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c73d4ea..464854d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(MCUT_MAJOR 1) -set(MCUT_MINOR 1) +set(MCUT_MINOR 2) set(MCUT_PATCH 0) set( MCUT_VERSION "${MCUT_MAJOR}.${MCUT_MINOR}.${MCUT_PATCH}" ) diff --git a/include/mcut/mcut.h b/include/mcut/mcut.h index b0197c2..76f68f3 100644 --- a/include/mcut/mcut.h +++ b/include/mcut/mcut.h @@ -50,6 +50,12 @@ extern "C" { /** MCUT 1.0 version number */ #define MC_API_VERSION_1_0 MC_MAKE_VERSION(1, 0, 0) // Patch version should always be set to 0 +/** MCUT 1.1 version number */ +#define MC_API_VERSION_1_1 MC_MAKE_VERSION(1, 1, 0) // Patch version should always be set to 0 + +/** MCUT 1.2 version number */ +#define MC_API_VERSION_1_2 MC_MAKE_VERSION(1, 2, 0) // Patch version should always be set to 0 + /** Macro to decode MCUT version (MAJOR) from MC_HEADER_VERSION_COMPLETE */ #define MC_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) @@ -63,7 +69,7 @@ extern "C" { #define MC_HEADER_VERSION 100 /** Complete version of this file */ -#define MC_HEADER_VERSION_COMPLETE MC_MAKE_VERSION(1, 0, MC_HEADER_VERSION) +#define MC_HEADER_VERSION_COMPLETE MC_MAKE_VERSION(1, 2, MC_HEADER_VERSION) /** Constant value assigned to null variables and parameters */ #define MC_NULL_HANDLE 0 diff --git a/source/kernel.cpp b/source/kernel.cpp index b98166a..4ec7232 100644 --- a/source/kernel.cpp +++ b/source/kernel.cpp @@ -3320,7 +3320,7 @@ void dispatch(output_t& output, const input_t& input) std::vector // list of halfedges whose target is the intersection point > ivtx_to_incoming_hlist; -#if 1 // used for debugging colinearity bug, which occur when we have poly with eg. > 3 +#if 0 // used for debugging colinearity bug, which occur when we have poly with eg. > 3 // vertices where at least 3 more-or-less are colinear but exact predicate says no. for (std::map, std::vector>::const_iterator cutpath_edge_creation_info_iter = cutpath_edge_creation_info.cbegin(); cutpath_edge_creation_info_iter != cutpath_edge_creation_info.cend();