Skip to content

Commit

Permalink
Under windows, we got parsing errors in CSG files, this may
Browse files Browse the repository at this point in the history
come from load_file_as_string() that may get an additional character
in the end under windows. Added display messages to show end of file.
  • Loading branch information
BrunoLevy committed Nov 11, 2023
1 parent aa44100 commit c746807
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions src/lib/geogram/mesh/mesh_CSG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,13 @@ namespace GEO {
);
}

for(index_t i=index_t(source.length())-20; i<source.length(); ++i) {
Logger::out("CSG check") << int(source[i])
<< ": \'" << source[i]
<< "\'" << std::endl;
}


// Add the directory that contains the file to the builder's file path,
// so that import() instructions are able to find files in the same
// directory.
Expand Down
2 changes: 1 addition & 1 deletion src/lib/geogram/mesh/mesh_surface_intersection.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
// exact_nt coordinates makes the algorithm 10x to 20x faster
// and have no risk of underflow / overflow.
#ifdef GEOGRAM_WITH_GEOGRAMPLUS
//#define INTERSECTIONS_USE_EXACT_NT
#define INTERSECTIONS_USE_EXACT_NT
#endif

namespace GEO {
Expand Down
2 changes: 1 addition & 1 deletion tests/CSG.robot
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*** Settings ***
Test Setup Prepare Test
Test Teardown Cleanup Test
Force Tags Intersect smoke daily daily_valgrind
Force Tags CSG smoke daily daily_valgrind
Library OperatingSystem
Library String
Library lib/VorpatestLibrary.py
Expand Down

0 comments on commit c746807

Please sign in to comment.