Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added : VHACD & karimnaaji qhull implementation #781

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
e0f0db8
Added : VHACD & karimnaaji qhull implementation
Kushal-Shah-03 Mar 28, 2024
3f532aa
Attempt to fix formatting
Kushal-Shah-03 Mar 28, 2024
47ad39e
Ran format.sh to fix formatting and commented failing test cases
Kushal-Shah-03 Mar 29, 2024
1ed0b74
Made minor changes to avoid warnings/errors
Kushal-Shah-03 Mar 29, 2024
c2f82f5
Formatting
Kushal-Shah-03 Mar 29, 2024
2264668
Hopefully Fixed Bracket issue
Kushal-Shah-03 Mar 29, 2024
b7aa4c1
Fix : Memory Overhead
Kushal-Shah-03 Mar 29, 2024
79e7ded
Test : Reduced size of testcase
Kushal-Shah-03 Mar 29, 2024
151904e
Fix : Reduced VHACD testcase for time constraints
Kushal-Shah-03 Mar 29, 2024
96d9ac8
Fix : Added EXPECT_NEAR instead of EXPECT for test
Kushal-Shah-03 Mar 29, 2024
f5cca30
Fixed : Implicit type cast and Formatting
Kushal-Shah-03 Mar 29, 2024
e812e90
Fix : Implicit typecast
Kushal-Shah-03 Mar 29, 2024
cd82511
Attempt to fix typecasting
Kushal-Shah-03 Mar 29, 2024
b8f1e82
Fix Attempt
Kushal-Shah-03 Mar 29, 2024
462bb3d
Typecast
Kushal-Shah-03 Apr 3, 2024
f7d35cd
Merge branch 'master' into master
Kushal-Shah-03 Apr 3, 2024
ea83517
Formatting after merge
Kushal-Shah-03 Apr 3, 2024
1bb7596
Error in Merge
Kushal-Shah-03 Apr 3, 2024
61a520b
Checking Implementation Typecast
Kushal-Shah-03 Apr 3, 2024
cc3f70e
Trying to identify typecast issue
Kushal-Shah-03 Apr 3, 2024
3d738e4
Attempt 2
Kushal-Shah-03 Apr 3, 2024
80920a2
Attempt 3
Kushal-Shah-03 Apr 3, 2024
095b62d
Attempt 4
Kushal-Shah-03 Apr 3, 2024
6f6ea07
Attempt 5
Kushal-Shah-03 Apr 3, 2024
7c75a0d
Error fix
Kushal-Shah-03 Apr 3, 2024
30049db
Attempt 6
Kushal-Shah-03 Apr 3, 2024
fb4293d
Final Attempt
Kushal-Shah-03 Apr 3, 2024
d75fffd
Checking int
Kushal-Shah-03 Apr 3, 2024
d12eff4
Final Check for the issue
Kushal-Shah-03 Apr 3, 2024
984e687
Dynamic array attempt
Kushal-Shah-03 Apr 3, 2024
4274fe6
Checking Issue resolution
Kushal-Shah-03 Apr 3, 2024
2916aeb
Formatting
Kushal-Shah-03 Apr 3, 2024
670cdfa
Added: leomccormack convhull algorithm
Kushal-Shah-03 Apr 10, 2024
2e0962a
Fixed : path initialization
Kushal-Shah-03 Apr 10, 2024
004bf80
Menger Sponge Hull
Kushal-Shah-03 May 16, 2024
c13701c
Merge branch 'master' into master
Kushal-Shah-03 May 16, 2024
bdb6d88
Formatting
Kushal-Shah-03 May 16, 2024
25f1201
FIxed Merging issue
Kushal-Shah-03 May 16, 2024
aec3b81
Added : Menger Sponge and Sphere Test
Kushal-Shah-03 May 25, 2024
d93bd1d
Increased dimension
Kushal-Shah-03 May 27, 2024
97faaa2
Added : Script to run Thingi10K datset
Kushal-Shah-03 Jun 3, 2024
22c8fee
Added : Script to store outputs of hull impelemtnations and python sc…
Kushal-Shah-03 Jun 19, 2024
5e55104
Fixed : Calculating Statistics
Kushal-Shah-03 Jun 19, 2024
3a049be
Added : GLB Files to analyse the outputs, Modified : normalize and st…
Kushal-Shah-03 Jun 24, 2024
9fb9b9c
Added : Hull 5 and Hull6; Narrow down set of points for Horizon Edge …
Kushal-Shah-03 Jun 29, 2024
6448874
Added: Random search to reduce the points for volume case
Kushal-Shah-03 Jul 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
*.o
*.obj

# Thingi10K dataset
extras/Thingi10K/*

# Output file
*/output_log_fin.txt

# Precompiled Headers
*.gch
*.pch
Expand Down
9 changes: 7 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,12 @@
"format": "cpp",
"numbers": "cpp",
"ranges": "cpp",
"stop_token": "cpp"
"stop_token": "cpp",
"csetjmp": "cpp",
"cuchar": "cpp",
"propagate_const": "cpp",
"scoped_allocator": "cpp",
"filesystem": "cpp"
},
"C_Cpp.clang_format_fallbackStyle": "google",
"editor.formatOnSave": true,
Expand Down Expand Up @@ -150,4 +155,4 @@
},
"python.formatting.provider": "none",
"clang-format.executable": "clang-format",
}
}
2 changes: 2 additions & 0 deletions extras/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.csv
*.txt
7 changes: 6 additions & 1 deletion extras/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ if(MANIFOLD_EXPORT)
endif()

if(BUILD_TEST_CGAL)
add_executable(perfTestCGAL perf_test_cgal.cpp)
add_executable(perfTestCGAL perf_test_cgal.cpp ${PROJECT_SOURCE_DIR}/../samples/src/menger_sponge.cpp)
target_include_directories(perfTestCGAL
PUBLIC ${PROJECT_SOURCE_DIR}/../samples/include
)
target_link_libraries(perfTestCGAL manifold)
target_link_libraries(perfTestCGAL meshIO)
find_package(CGAL REQUIRED COMPONENTS Core)
find_package(Boost REQUIRED COMPONENTS thread)
target_compile_definitions(perfTestCGAL PRIVATE CGAL_USE_GMPXX)
Expand Down
Binary file added extras/GLB_Files/1750623.glb
Binary file not shown.
Binary file added extras/GLB_Files/1750623.stl
Binary file not shown.
Binary file added extras/GLB_Files/1750623_hull1.glb
Binary file not shown.
Binary file added extras/GLB_Files/1750623_hull1_hull2.glb
Binary file not shown.
Binary file added extras/GLB_Files/1750623_hull2.glb
Binary file not shown.
Binary file added extras/GLB_Files/18points.bin
Binary file not shown.
Loading