elalish · elalish · Sep 6, 2022 · Sep 6, 2022 · Sep 6, 2022 · Sep 6, 2022
diff --git a/.github/workflows/manifold.yml b/.github/workflows/manifold.yml
@@ -24,16 +24,14 @@ jobs:
     - name: Install dependencies
       run: |
         apt-get -y update
-        DEBIAN_FRONTEND=noninteractive apt install -y libomp-dev git libtbb-dev pkg-config libpython3-dev python3 python3-distutils python3-pip lcov
+        DEBIAN_FRONTEND=noninteractive apt install -y libomp-dev libassimp-dev git libtbb-dev pkg-config libpython3-dev python3 python3-distutils python3-pip lcov
         pip install meshio[all]
     - uses: actions/checkout@v3
       with:
         submodules: true
     - uses: jwlawson/actions-setup-cmake@v1.12
     - name: Build ${{matrix.backend}}
       run: |
-        # patch assimp
-        patch test/third_party/assimp/code/CMakeLists.txt < assimp.diff
         git apply thrust.diff
         mkdir build
         cd build
@@ -91,8 +89,6 @@ jobs:
     - name: Build WASM
       run: |
         source ./emsdk/emsdk_env.sh
-        # patch assimp
-        patch test/third_party/assimp/code/CMakeLists.txt < assimp.diff
         git apply thrust.diff
         mkdir build
         cd build
@@ -123,9 +119,6 @@ jobs:
       with:
         submodules: true
     - uses: jwlawson/actions-setup-cmake@v1.12
-    - name: Patch assimp
-      shell: bash
-      run: patch test/third_party/assimp/code/CMakeLists.txt < assimp.diff
     - uses: ilammy/msvc-dev-cmd@v1
     - name: Install CUDA
       if: matrix.backend == 'CUDA'

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "third_party/assimp"]
-	path = test/third_party/assimp
-	url = https://github.com/assimp/assimp
 [submodule "third_party/thrust"]
 	path = src/third_party/thrust
 	url = https://github.com/NVIDIA/thrust

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,25 +36,8 @@ option(PYBIND11_FINDPYTHON on)
 option(BUILD_TEST_CGAL off)
 
 option(BUILD_SHARED_LIBS off)
-set(ASSIMP_INC_DIR
-    ${PROJECT_SOURCE_DIR}/test/third_party/assimp/include
-    ${CMAKE_BINARY_DIR}/test/third_party/assimp/include)
 set(GLM_INC_DIR ${PROJECT_SOURCE_DIR}/src/third_party/glm)
 set(PYBIND11_DIR ${PROJECT_SOURCE_DIR}/bindings/python/third_party/pybind11)
-
-option(ASSIMP_FAST_BUILD "build ASSIMP just for tests" ON)
-
-if(ASSIMP_FAST_BUILD)
-    option(ASSIMP_INSTALL FALSE)
-    option(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT FALSE)
-    option(ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT FALSE)
-
-    foreach(FMT OBJ;PLY;STL;GLTF)
-        set(ASSIMP_BUILD_${FMT}_IMPORTER TRUE)
-        set(ASSIMP_BUILD_${FMT}_EXPORTER TRUE)
-    endforeach()
-endif()
-
 set(THRUST_INC_DIR ${PROJECT_SOURCE_DIR}/src/third_party/thrust)
 
 if(MANIFOLD_USE_CUDA)

diff --git a/assimp.diff b/assimp.diff
diff --git a/flake.nix b/flake.nix
@@ -25,7 +25,7 @@
                   "manifold-${parallel-backend}";
               version = "beta";
               src = self;
-              patches = [ ./assimp.diff ./thrust.diff ];
+              patches = [ ./thrust.diff ];
               nativeBuildInputs = (with pkgs; [ cmake (python39.withPackages(ps: with ps; [meshio])) ]) ++ build-tools ++
                 (if cuda-support then with pkgs.cudaPackages; [ cuda_nvcc cuda_cudart cuda_cccl pkgs.addOpenGLRunpath ] else [ ]);
               cmakeFlags = [
@@ -42,7 +42,6 @@
               installPhase = ''
                 mkdir -p $out
                 cp src/manifold/libmanifold.a $out/
-                cp test/meshIO/libmeshIO.a $out/
                 cp extras/perfTest $out
                 cp bindings/python/pymanifold* $out
               '';
@@ -92,7 +91,6 @@
               name = "manifold-js";
               version = "beta";
               src = self;
-              patches = [ ./assimp.diff ];
               nativeBuildInputs = (with pkgs; [ cmake python39 ]);
               buildInputs = [ pkgs.nodejs ];
               configurePhase = ''

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -15,7 +15,6 @@
 project(manifold_test)
 
 add_subdirectory(third_party)
-add_subdirectory(meshIO)
 
 enable_testing()
 
@@ -24,6 +23,7 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} polygon GTest::GTest manifold samples samplesGPU)
 
 if(MANIFOLD_EXPORT)
+  add_subdirectory(meshIO)
   target_link_libraries(${PROJECT_NAME} meshIO)
   target_compile_options(${PROJECT_NAME} PUBLIC -DMANIFOLD_EXPORT)
 endif()

diff --git a/test/meshIO/CMakeLists.txt b/test/meshIO/CMakeLists.txt
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@ project(meshIO)
 add_library(${PROJECT_NAME} src/meshIO.cpp)
 
 target_include_directories(${PROJECT_NAME}
-    PUBLIC ${PROJECT_SOURCE_DIR}/include ${ASSIMP_INC_DIR}
+    PUBLIC ${PROJECT_SOURCE_DIR}/include
 )
 
 target_link_libraries(${PROJECT_NAME}

diff --git a/test/meshIO/src/meshIO.cpp b/test/meshIO/src/meshIO.cpp
@@ -18,8 +18,8 @@
 #include <iostream>
 
 #include "assimp/Exporter.hpp"
-#include "assimp/GltfMaterial.h"
 #include "assimp/Importer.hpp"
+#include "assimp/pbrmaterial.h"
 #include "assimp/postprocess.h"
 #include "assimp/scene.h"
 #include "optional_assert.h"
@@ -126,8 +126,10 @@ void ExportMesh(const std::string& filename, const Mesh& mesh,
   scene->mMaterials[0] = new aiMaterial();
 
   aiMaterial* material = scene->mMaterials[0];
-  material->AddProperty(&options.mat.roughness, 1, AI_MATKEY_ROUGHNESS_FACTOR);
-  material->AddProperty(&options.mat.metalness, 1, AI_MATKEY_METALLIC_FACTOR);
+  material->AddProperty(&options.mat.roughness, 1,
+                        AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_ROUGHNESS_FACTOR);
+  material->AddProperty(&options.mat.metalness, 1,
+                        AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLIC_FACTOR);
   const glm::vec4& color = options.mat.color;
   aiColor4D baseColor(color.r, color.g, color.b, color.a);
   material->AddProperty(&baseColor, 1, AI_MATKEY_COLOR_DIFFUSE);

diff --git a/test/third_party/CMakeLists.txt b/test/third_party/CMakeLists.txt
@@ -4,21 +4,14 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     https://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-############################################################################
-#                         BUILD ASSIMP LIBRARY                             #
-############################################################################
-option(ASSIMP_BUILD_ASSIMP_TOOLS off)
-option(ASSIMP_BUILD_TESTS off)
-add_subdirectory(assimp)
-
 # ###########################################################################
 # Build Google Test                              #
 # ###########################################################################

diff --git a/test/third_party/assimp b/test/third_party/assimp