forked from elalish/manifold
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request elalish#157 from elalish/organize2
Reorganize Directories
- Loading branch information
Showing
73 changed files
with
175 additions
and
224 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
[submodule "third_party/assimp"] | ||
path = third_party/assimp | ||
path = test/third_party/assimp | ||
url = https://github.com/assimp/assimp | ||
[submodule "third_party/thrust"] | ||
path = third_party/thrust | ||
path = src/third_party/thrust | ||
url = https://github.com/NVIDIA/thrust | ||
[submodule "third_party/glm"] | ||
path = third_party/glm | ||
path = src/third_party/glm | ||
url = https://github.com/g-truc/glm | ||
[submodule "third_party/google_test"] | ||
path = third_party/google_test | ||
path = test/third_party/google_test | ||
url = https://github.com/google/googletest.git | ||
[submodule "third_party/pybind11"] | ||
path = third_party/pybind11 | ||
path = bindings/python/third_party/pybind11 | ||
url = https://github.com/pybind/pybind11 | ||
branch = stable |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
|
||
if(NOT EMSCRIPTEN) | ||
add_subdirectory(python) | ||
endif() | ||
|
||
if(EMSCRIPTEN) | ||
add_subdirectory(wasm) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
project(python) | ||
|
||
add_subdirectory(third_party) | ||
pybind11_add_module(pymanifold pymanifold.cpp) | ||
target_link_libraries(pymanifold PRIVATE manifold meshIO) | ||
target_compile_options(pymanifold PRIVATE ${MANIFOLD_FLAGS}) | ||
target_compile_features(pymanifold PUBLIC cxx_std_14) | ||
target_include_directories(pymanifold | ||
PRIVATE ${PYBIND11_DIR}/include | ||
) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
add_subdirectory(pybind11) |
Submodule pybind11
updated
from 000000 to ffa346
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
project (wasm) | ||
project(wasm) | ||
|
||
add_executable(manifoldjs bindings.cpp) | ||
target_link_libraries(manifoldjs manifold) | ||
target_compile_options(manifoldjs PRIVATE ${MANIFOLD_FLAGS} -fexceptions) | ||
target_link_options(manifoldjs PUBLIC --bind) | ||
target_compile_features(manifoldjs PUBLIC cxx_std_14) | ||
set_target_properties(manifoldjs PROPERTIES OUTPUT_NAME "manifold") | ||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/index.html DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) | ||
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/examples/index.html DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
#include <emscripten/bind.h> | ||
|
||
using namespace emscripten; | ||
|
||
#include <manifold.h> | ||
|
||
using namespace manifold; | ||
|
||
Manifold Union(Manifold& a, Manifold& b) { return a + b; } | ||
void Add(Manifold& a, Manifold& b) { a += b; } | ||
|
||
Manifold Difference(Manifold& a, Manifold& b) { return a - b; } | ||
void Subtract(Manifold& a, Manifold& b) { a -= b; } | ||
|
||
Manifold Intersection(Manifold& a, Manifold& b) { return a ^ b; } | ||
void Intersect(Manifold& a, Manifold& b) { a ^= b; } | ||
|
||
EMSCRIPTEN_BINDINGS(whatever) { | ||
value_object<glm::ivec3>("ivec3") | ||
.field("0", &glm::ivec3::x) | ||
.field("1", &glm::ivec3::y) | ||
.field("2", &glm::ivec3::z); | ||
|
||
register_vector<glm::ivec3>("Vector_ivec3"); | ||
|
||
value_object<glm::vec3>("vec3") | ||
.field("x", &glm::vec3::x) | ||
.field("y", &glm::vec3::y) | ||
.field("z", &glm::vec3::z); | ||
|
||
register_vector<glm::vec3>("Vector_vec3"); | ||
|
||
value_object<glm::vec4>("vec4") | ||
.field("x", &glm::vec4::x) | ||
.field("y", &glm::vec4::y) | ||
.field("z", &glm::vec4::z) | ||
.field("w", &glm::vec4::w); | ||
|
||
register_vector<glm::vec4>("Vector_vec4"); | ||
|
||
value_object<Mesh>("Mesh") | ||
.field("vertPos", &Mesh::vertPos) | ||
.field("triVerts", &Mesh::triVerts) | ||
.field("vertNormal", &Mesh::vertNormal) | ||
.field("halfedgeTangent", &Mesh::halfedgeTangent); | ||
|
||
class_<Manifold>("Manifold") | ||
.constructor<Mesh>() | ||
.function("Add", &Add) | ||
.function("Subtract", &Subtract) | ||
.function("Intersect", &Intersect) | ||
.function("GetMesh", &Manifold::GetMesh); | ||
|
||
function("Union", &Union); | ||
function("Difference", &Difference); | ||
function("Intersection", &Intersection); | ||
} |
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,6 +20,7 @@ set -x | |
|
||
DEPLOYABLE_STATIC_FILES=( \ | ||
samples/models \ | ||
bindings/wasm/examples \ | ||
) | ||
|
||
PACKAGE_ROOT=`pwd` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
project(extras) | ||
|
||
add_executable(perfTest perf_test.cpp) | ||
target_link_libraries(perfTest manifold) | ||
|
||
target_compile_options(perfTest PRIVATE ${MANIFOLD_FLAGS}) | ||
target_compile_features(perfTest PUBLIC cxx_std_14) | ||
|
||
if(BUILD_TEST_CGAL) | ||
add_executable(perfTestCGAL perf_test_cgal.cpp) | ||
find_package(CGAL REQUIRED COMPONENTS Core) | ||
target_compile_definitions(perfTestCGAL PRIVATE CGAL_USE_GMPXX) | ||
|
||
# target_compile_definitions(perfTestCGAL PRIVATE CGAL_DEBUG) | ||
target_link_libraries(perfTestCGAL manifold CGAL::CGAL CGAL::CGAL_Core) | ||
|
||
target_compile_options(perfTestCGAL PRIVATE ${MANIFOLD_FLAGS}) | ||
target_compile_features(perfTestCGAL PUBLIC cxx_std_14) | ||
endif() | ||
|
||
# add_executable(playground playground.cpp) | ||
# target_link_libraries(playground manifold meshIO samples) | ||
|
||
# target_compile_options(playground PRIVATE ${MANIFOLD_FLAGS}) | ||
# target_compile_features(playground PUBLIC cxx_std_14) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
add_subdirectory(third_party) | ||
add_subdirectory(utilities) | ||
add_subdirectory(collider) | ||
add_subdirectory(polygon) | ||
add_subdirectory(manifold) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
add_subdirectory(graphlite) |
Submodule glm
updated
from 000000 to bf71a8
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Submodule thrust
updated
from 000000 to d997cd
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
Oops, something went wrong.