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

Reorganize Directories #157

Merged
merged 10 commits into from
Jul 20, 2022
Merged

Reorganize Directories #157

merged 10 commits into from
Jul 20, 2022

Conversation

elalish
Copy link
Owner

@elalish elalish commented Jul 19, 2022

Replacing #156; see commentary there. The idea is to make the project's structure more clear by changing from our current layout:

root/
|--- docs/
|--- collider/
|--- manifold/
|--- meshIO/
|--- polygon/
|--- samples/
|--- test/
|--- third_party/
|    |--- assimp/
|    |--- glm/
|    |--- google_test/
|    |--- graphlite/
|    |--- pybind11/
|    |--- thrust/
|--- tools/
|--- utilities/

To this:

root/
|--- docs/
|--- bindings/
|    |--- python/
|    |    |--- examples/
|    |    |--- third_party/
|    |    |    |--- pybind11/
|    |--- wasm/
|    |    |--- examples/
|--- samples/
|--- extras/
|    |--- ...tools
|--- src/
|    |--- collider/
|    |--- manifold/
|    |--- polygon/
|    |--- utilities/
|    |--- third_party/
|    |    |--- glm/
|    |    |--- graphlite/
|    |    |--- thrust/
|--- test/
|    |--- meshIO/
|    |--- ...original tests, referencing examples
|    |--- third_party/
|    |    |--- assimp/
|    |    |--- google_test/

@elalish elalish mentioned this pull request Jul 19, 2022
@elalish
Copy link
Owner Author

elalish commented Jul 19, 2022

@pca006132 I mostly got the CMake stuff fixed, but I'm having trouble building Assimp (it can't seem to find the paths it wants). Since you got a lot of that working, would you mind taking a look?

@pca006132
Copy link
Collaborator

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 00048bc..070ccd8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(meshIO)
 
 enable_testing()
 
-file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
+set(SOURCE_FILES mesh_test.cpp polygon_test.cpp samples_test.cpp test_main.cpp)
 add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} polygon GTest::GTest manifold meshIO samples)

The old one will recursively include all code in assimp and google_test, and tries to compile them with our compilation options (which does not work).

@elalish elalish marked this pull request as ready for review July 20, 2022 04:18
@codecov-commenter
Copy link

codecov-commenter commented Jul 20, 2022

Codecov Report

Merging #157 (311ca75) into master (a149732) will increase coverage by 0.19%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #157      +/-   ##
==========================================
+ Coverage   93.81%   94.01%   +0.19%     
==========================================
  Files          32       30       -2     
  Lines        2861     2789      -72     
==========================================
- Hits         2684     2622      -62     
+ Misses        177      167      -10     
Impacted Files Coverage Δ
src/collider/include/collider.h 100.00% <ø> (ø)
src/collider/src/collider.cpp 100.00% <ø> (ø)
src/manifold/include/manifold.h 100.00% <ø> (ø)
src/manifold/src/boolean3.cpp 100.00% <ø> (ø)
src/manifold/src/boolean_result.cpp 99.03% <ø> (ø)
src/manifold/src/constructors.cpp 99.37% <ø> (ø)
src/manifold/src/csg_tree.cpp 74.73% <ø> (ø)
src/manifold/src/csg_tree.h 100.00% <ø> (ø)
src/manifold/src/edge_op.cpp 99.21% <ø> (ø)
src/manifold/src/face_op.cpp 93.97% <ø> (ø)
... and 16 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a149732...311ca75. Read the comment docs.

@elalish
Copy link
Owner Author

elalish commented Jul 20, 2022

Thanks for the pointer @pca006132! I decided to keep samples instead of renaming it examples, mostly because I have deployed GLB models there and I don't want to break those paths. Do you have any idea why check_format is failing? I swear it worked once after I updated it, but now it just unhelpfully says it can't find a file.

@elalish
Copy link
Owner Author

elalish commented Jul 20, 2022

Nevermind, I switched to a github action for format checking; simpler and it's working.

@elalish elalish merged commit 45d217b into master Jul 20, 2022
@elalish elalish deleted the organize2 branch July 20, 2022 05:45
@elalish elalish mentioned this pull request Aug 2, 2022
cartesian-theatrics pushed a commit to SovereignShop/manifold that referenced this pull request Mar 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants