MCP

.github/workflows/build-test-linux-vcpkg.yml

@@ -115,7 +115,7 @@ jobs:
           # related issue: https://github.com/actions/checkout/issues/1779
           export HOME=${RUNNER_TEMP}
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
-          git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/mrbind-pybind11 thirdparty/mrbind
+          git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/mrbind-pybind11 thirdparty/mrbind thirdparty/fastmcpp thirdparty/nlohmann-json thirdparty/cpp-httplib
 
       - name: Install MRBind
         if: ${{ inputs.mrbind || inputs.mrbind_c }}

.github/workflows/build-test-ubuntu-arm64.yml

@@ -99,6 +99,7 @@ jobs:
         run: |
           ln -s /usr/local/lib/meshlib-thirdparty-lib/lib ./lib
           ln -s /usr/local/lib/meshlib-thirdparty-lib/include ./include
+          ln -s /usr/local/lib/meshlib-thirdparty-lib/share ./share
 
       - name: Install MRBind
         if: ${{ inputs.mrbind || inputs.mrbind_c }}

.github/workflows/build-test-ubuntu-x64.yml

@@ -78,6 +78,7 @@ jobs:
         run: |
           ln -s /usr/local/lib/meshlib-thirdparty-lib/lib ./lib
           ln -s /usr/local/lib/meshlib-thirdparty-lib/include ./include
+          ln -s /usr/local/lib/meshlib-thirdparty-lib/share ./share
 
       - name: Install MRBind
         if: ${{ inputs.mrbind || inputs.mrbind_c }}

.github/workflows/update-docs-manual.yml

@@ -47,11 +47,12 @@ jobs:
           export HOME=${RUNNER_TEMP}
           git config --global --add safe.directory '*'
           git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/eigen thirdparty/parallel-hashmap thirdparty/mrbind-pybind11 thirdparty/mrbind
-          
+
       - name: Install thirdparty libs
         run: |
           ln -s /usr/local/lib/meshlib-thirdparty-lib/lib ./lib
           ln -s /usr/local/lib/meshlib-thirdparty-lib/include ./include
+          ln -s /usr/local/lib/meshlib-thirdparty-lib/share ./share
 
       - name: Install mrbind
         run: scripts/mrbind/install_mrbind_ubuntu.sh

.gitmodules

@@ -76,3 +76,12 @@
 [submodule "thirdparty/OpenCTM-git"]
 	path = thirdparty/OpenCTM-git
 	url = https://github.com/MeshInspector/OpenCTM.git
+[submodule "thirdparty/fastmcpp"]
+	path = thirdparty/fastmcpp
+	url = https://github.com/MeshInspector/fastmcpp
+[submodule "thirdparty/nlohmann-json"]
+	path = thirdparty/nlohmann-json
+	url = https://github.com/nlohmann/json
+[submodule "thirdparty/cpp-httplib"]
+	path = thirdparty/cpp-httplib
+	url = https://github.com/yhirose/cpp-httplib

.gitpod.yml

@@ -9,3 +9,4 @@ tasks:
     init: |
       ln -s /usr/local/lib/meshlib-thirdparty-lib/lib ./lib
       ln -s /usr/local/lib/meshlib-thirdparty-lib/include ./include
+      ln -s /usr/local/lib/meshlib-thirdparty-lib/share ./share

CMakeLists.txt

@@ -53,10 +53,14 @@ option(MESHLIB_BUILD_MESHCONV "Build meshconv utility" ON)
 option(MESHLIB_BUILD_SYMBOLMESH "Build symbol-to-mesh library" ON)
 option(MESHLIB_BUILD_VOXELS "Build voxels library" ON)
 option(MESHLIB_BUILD_EXTRA_IO_FORMATS "Build extra IO format support library" ON)
+option(MESHLIB_BUILD_MCP "Enable MCP server" ON)
 option(MESHLIB_BUILD_GENERATED_C_BINDINGS "Build C bindings (assuming they are already generated)" OFF)
 
 option(MESHLIB_BUILD_MRCUDA "Build MRCuda library" ON)
 option(MESHLIB_EXPERIMENTAL_HIP "(experimental) Use HIP toolkit for MRCuda library" OFF)
+IF(MR_EMSCRIPTEN)
+  set(MESHLIB_BUILD_MCP OFF)
+ENDIF()
 IF(MR_EMSCRIPTEN OR APPLE)
   set(MESHLIB_BUILD_MRCUDA OFF)
 ENDIF()
@@ -293,6 +297,10 @@ IF(NOT MR_EMSCRIPTEN AND NOT APPLE)
   ENDIF()
 ENDIF()
 
+IF(MESHLIB_BUILD_MCP AND NOT MR_EMSCRIPTEN)
+  add_subdirectory(${PROJECT_SOURCE_DIR}/MRMcp ./MRMcp)
+ENDIF()
+
 IF(BUILD_TESTING)
   enable_testing()
   add_subdirectory(${PROJECT_SOURCE_DIR}/MRTest ./MRTest)

cmake/Modules/CompilerOptions.cmake

@@ -32,7 +32,7 @@ ENDIF()
 # Warnings and misc compiler settings.
 IF(MSVC)
   # C++-specific flags.
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}   /DImDrawIdx=unsigned /D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING /D_SILENCE_CXX20_OLD_SHARED_PTR_ATOMIC_SUPPORT_DEPRECATION_WARNING /D_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING /D_SILENCE_CXX23_DENORM_DEPRECATION_WARNING /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DImDrawIdx=unsigned /D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING /D_SILENCE_CXX20_OLD_SHARED_PTR_ATOMIC_SUPPORT_DEPRECATION_WARNING /D_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING /D_SILENCE_CXX23_DENORM_DEPRECATION_WARNING /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
 
   # Common C/C++ flags:
 

docker/ubuntu22Dockerfile

@@ -44,6 +44,7 @@ COPY scripts/mrbind-pybind11/install_all_python_versions_ubuntu_pkgs.sh scripts/
 
 COPY --from=build /home/MeshLib/lib /usr/local/lib/meshlib-thirdparty-lib/lib
 COPY --from=build /home/MeshLib/include /usr/local/lib/meshlib-thirdparty-lib/include
+COPY --from=build /home/MeshLib/share /usr/local/lib/meshlib-thirdparty-lib/share
 
 ENV MR_STATE=DOCKER_BUILD
 

docker/ubuntu24Dockerfile

@@ -52,6 +52,7 @@ COPY scripts/mrbind-pybind11/install_all_python_versions_ubuntu_pkgs.sh scripts/
 
 COPY --from=build /home/MeshLib/lib /usr/local/lib/meshlib-thirdparty-lib/lib
 COPY --from=build /home/MeshLib/include /usr/local/lib/meshlib-thirdparty-lib/include
+COPY --from=build /home/MeshLib/share /usr/local/lib/meshlib-thirdparty-lib/share
 COPY --from=cuda /usr/local/cuda-12.6 /usr/local/cuda-12.6
 
 ENV MR_STATE=DOCKER_BUILD

docs/testing_mcp.md

@@ -0,0 +1,25 @@
+# How to test MCP?
+
+Use "MCP Inspector". Run it with `npx @modelcontextprotocol/inspector`, where `npx` is installed as a part of Node.JS.
+
+Set:
+* Transport Type = SSE
+* URL = http://localhost:8080/sse
+* Connection Type = Via Proxy  (Doesn't work for me without proxy now when we're using the Fastmcpp library, but did work with another library; not sure why.)
+
+Press `Connect`.
+
+Press `List Tools` (if grayed out, do `Clear` first).
+
+Click on your tool.
+
+On the right panel, set parameters. For some parameter types, it helps to press `Switch to JSON` on the right, then type them as JSON.
+
+Press `Run Tool`. If you get weird errors, try pressing it again. In some cases, the first press passes stale/empty parameters.
+
+Then check for validation errors, below this button.
+
+If it complains that your output doesn't match the schema you specified, paste both the output and the schema (using the `Copy` button in the top-right corner of the code blocks; that copies JSON properly, unlike Ctrl+C in this case)
+  into a schema validator, e.g. https://www.jsonschemavalidator.net/
+
+**NOTE:** It doesn't seem to validate the input schema (only output schema). Check it by eye.

scripts/ask_emscripten_mode.src

@@ -0,0 +1,40 @@
+#!/bin/false
+# This file is supposed to be sourced.
+
+[[ ${MR_EMSCRIPTEN_SINGLETHREAD:=} ]] || export MR_EMSCRIPTEN_SINGLETHREAD=0
+[[ ${MR_EMSCRIPTEN_WASM64:=} ]] || export MR_EMSCRIPTEN_WASM64=0
+
+if [[ $OSTYPE == "linux"* && $MR_STATE != "DOCKER_BUILD" ]]; then
+  if [ ! -n "$MR_EMSCRIPTEN" ]; then
+    read -t 5 -p "Build with emscripten? Press (y) in 5 seconds to build (y/s/l/N) (s - singlethreaded, l - 64-bit)" -rsn 1
+    echo;
+    case $REPLY in
+      Y|y)
+        export MR_EMSCRIPTEN="ON";;
+      S|s)
+        export MR_EMSCRIPTEN="ON"
+        export MR_EMSCRIPTEN_SINGLETHREAD=1;;
+      L|l)
+        export MR_EMSCRIPTEN="ON"
+        export MR_EMSCRIPTEN_WASM64=1;;
+      *)
+        export MR_EMSCRIPTEN="OFF";;
+    esac
+  fi
+else
+  if [ ! -n "$MR_EMSCRIPTEN" ]; then
+    MR_EMSCRIPTEN="OFF"
+  fi
+fi
+
+# Normalize the spelling of some variables.
+if [ $MR_EMSCRIPTEN == "ON" ]; then
+  if [[ $MR_EMSCRIPTEN_SINGLE == "ON" ]]; then
+    MR_EMSCRIPTEN_SINGLETHREAD=1
+  fi
+  if [[ $MR_EMSCRIPTEN_WASM64 == "ON" ]]; then
+    MR_EMSCRIPTEN_WASM64=1
+  fi
+fi
+
+echo "Emscripten ${MR_EMSCRIPTEN}, singlethread ${MR_EMSCRIPTEN_SINGLETHREAD}, 64-bit ${MR_EMSCRIPTEN_WASM64}"

scripts/build_source.sh

@@ -8,39 +8,9 @@ logfile="`pwd`/build_source_${dt}.log"
 echo "Project build script started."
 echo "You could find output in ${logfile}"
 
-MR_EMSCRIPTEN_SINGLETHREAD=0
-if [[ $OSTYPE == "linux"* ]]; then
-  if [ ! -n "$MR_EMSCRIPTEN" ]; then
-    read -t 5 -p "Build with emscripten? Press (y) in 5 seconds to build (y/s/l/N) (s - singlethreaded, l - 64-bit)" -rsn 1
-    echo;
-    case $REPLY in
-      Y|y)
-        MR_EMSCRIPTEN="ON";;
-      S|s)
-        MR_EMSCRIPTEN="ON"
-        MR_EMSCRIPTEN_SINGLETHREAD=1;;
-      L|l)
-        MR_EMSCRIPTEN="ON"
-        MR_EMSCRIPTEN_WASM64=1;;
-      *)
-        MR_EMSCRIPTEN="OFF";;
-    esac
-  fi
-else
-  if [ ! -n "$MR_EMSCRIPTEN" ]; then
-    MR_EMSCRIPTEN="OFF"
-  fi
-fi
-echo "Emscripten ${MR_EMSCRIPTEN}, singlethread ${MR_EMSCRIPTEN_SINGLETHREAD}, 64-bit ${MR_EMSCRIPTEN_WASM64}"
+SCRIPT_DIR="$(dirname "$BASH_SOURCE")"
 
-if [ $MR_EMSCRIPTEN == "ON" ]; then
-  if [[ $MR_EMSCRIPTEN_SINGLE == "ON" ]]; then
-    MR_EMSCRIPTEN_SINGLETHREAD=1
-  fi
-  if [[ $MR_EMSCRIPTEN_WASM64 == "ON" ]]; then
-    MR_EMSCRIPTEN_WASM64=1
-  fi
-fi
+. "$SCRIPT_DIR/ask_emscripten_mode.src"
 
 if [ ! -n "$MESHLIB_BUILD_RELEASE" ]; then
   read -t 5 -p "Build MeshLib Release? Press (n) in 5 seconds to cancel (Y/n)" -rsn 1

scripts/build_thirdparty.sh

@@ -32,38 +32,10 @@ else
   echo "Host system: ${OSTYPE}"
 fi
 
-MR_EMSCRIPTEN_SINGLETHREAD=0
-if [[ $OSTYPE == "linux"* ]] && [ "${MR_STATE}" != "DOCKER_BUILD" ]; then
-  if [ ! -n "$MR_EMSCRIPTEN" ]; then
-    read -t 5 -p "Build with emscripten? Press (y) in 5 seconds to build (y/s/l/N) (s - singlethreaded, l - 64-bit)" -rsn 1
-    echo;
-    case $REPLY in
-      Y|y)
-        MR_EMSCRIPTEN="ON";;
-      S|s)
-        MR_EMSCRIPTEN="ON"
-        MR_EMSCRIPTEN_SINGLETHREAD=1;;
-      L|l)
-        MR_EMSCRIPTEN="ON"
-        MR_EMSCRIPTEN_WASM64=1;;
-      *)
-        MR_EMSCRIPTEN="OFF";;
-    esac
-  fi  
-else
-  if [ ! -n "$MR_EMSCRIPTEN" ]; then
-    MR_EMSCRIPTEN="OFF"
-  fi
-fi
-echo "Emscripten ${MR_EMSCRIPTEN}, singlethread ${MR_EMSCRIPTEN_SINGLETHREAD}, 64-bit ${MR_EMSCRIPTEN_WASM64}"
+. "$SCRIPT_DIR/ask_emscripten_mode.src"
 
 if [ $MR_EMSCRIPTEN == "ON" ]; then
-  if [[ $MR_EMSCRIPTEN_SINGLE == "ON" ]]; then
-    MR_EMSCRIPTEN_SINGLETHREAD=1
-  fi
-  if [[ $MR_EMSCRIPTEN_WASM64 == "ON" ]]; then
-    MR_EMSCRIPTEN_WASM64=1
-  fi
+  true # Nothing.
 elif [ -n "${INSTALL_REQUIREMENTS}" ]; then
   echo "Check requirements. Running ${INSTALL_REQUIREMENTS} ..."
   ${SCRIPT_DIR}/$INSTALL_REQUIREMENTS
@@ -165,6 +137,17 @@ else
 
   # build clip separately
   CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/clip.sh ${MESHLIB_THIRDPARTY_DIR}/clip
+
+  # Skip this on Mac, we use `add_subdirectory()` for those libraries there.
+  # This is because we can't use `find_package()` there to find our own libraries, because that breaks Python modules, as documented in the root `CMakeLists.txt`.
+  if [[ $OSTYPE != 'darwin'* ]]; then
+    # Build nlohmann-json separately. It is header-only, this just installs it. It is a dependency of fastmcpp.
+    CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/nlohmann-json.sh "$MESHLIB_THIRDPARTY_DIR/nlohmann-json"
+    # Build cpp-httplib separately. It is header-only, this just installs it. It is a dependency of fastmcpp.
+    CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/cpp-httplib.sh "$MESHLIB_THIRDPARTY_DIR/cpp-httplib"
+    # Build fastmcpp separately.
+    CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/fastmcpp.sh "$MESHLIB_THIRDPARTY_DIR/fastmcpp" ./fastmcpp_build "${MESHLIB_THIRDPARTY_ROOT_DIR}"
+  fi
 fi
 popd
 

scripts/thirdparty/cpp-httplib.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -eo pipefail
+
+SOURCE_DIR="$1"
+BUILD_DIR="${2:-./cpp-httplib_build}"
+
+CMAKE_OPTIONS="${CMAKE_OPTIONS} \
+  -D HTTPLIB_TEST=OFF \
+  -D HTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF \
+  -D HTTPLIB_USE_OPENSSL_IF_AVAILABLE=OFF \
+  -D HTTPLIB_USE_ZLIB_IF_AVAILABLE=OFF \
+  -D HTTPLIB_USE_ZSTD_IF_AVAILABLE=OFF \
+"
+
+cmake -S "${SOURCE_DIR}" -B "${BUILD_DIR}" -D CMAKE_C_FLAGS="${CFLAGS}" ${CMAKE_OPTIONS}
+cmake --build "${BUILD_DIR}" -j `nproc`
+cmake --install "${BUILD_DIR}"

scripts/thirdparty/fastmcpp.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -exo pipefail
+
+SOURCE_DIR="$1"
+BUILD_DIR="${2:-./fastmcpp_build}"
+
+# Sync those flags with `source/fastmcpp/CMakeLists.txt`.
+CMAKE_OPTIONS="${CMAKE_OPTIONS} \
+  -D FASTMCPP_BUILD_TESTS=OFF \
+  -D FASTMCPP_BUILD_EXAMPLES=OFF \
+  -D FASTMCPP_FETCH_CURL=OFF \
+  -D CMAKE_CXX_FLAGS=-fPIC \
+"
+
+cmake -S "${SOURCE_DIR}" -B "${BUILD_DIR}" -D CMAKE_C_FLAGS="${CFLAGS}" ${CMAKE_OPTIONS}
+cmake --build "${BUILD_DIR}" -j `nproc`
+cmake --install "${BUILD_DIR}"

scripts/thirdparty/nlohmann-json.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -eo pipefail
+
+SOURCE_DIR="$1"
+BUILD_DIR="${2:-./nlohmann-json_build}"
+
+CMAKE_OPTIONS="${CMAKE_OPTIONS} \
+  -D JSON_BuildTests=OFF \
+"
+
+cmake -S "${SOURCE_DIR}" -B "${BUILD_DIR}" -D CMAKE_C_FLAGS="${CFLAGS}" ${CMAKE_OPTIONS}
+cmake --build "${BUILD_DIR}" -j `nproc`
+cmake --install "${BUILD_DIR}"

source/MRMcp/CMakeLists.txt

@@ -0,0 +1,55 @@
+project(MRMcp CXX)
+
+file(GLOB HEADERS "*.h" "*.ipp")
+file(GLOB SOURCES "*.cpp")
+
+add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
+
+target_link_libraries(${PROJECT_NAME}
+  PUBLIC
+    MRMesh
+)
+
+IF(MR_PCH)
+  target_precompile_headers(${PROJECT_NAME} REUSE_FROM MRPch)
+ENDIF()
+
+# On Windows, and on Linux+Vcpkg there is no third-party build script, so add fastmcpp as a subdirectory.
+IF(MESHLIB_USE_VCPKG OR APPLE)
+  set(FASTMCPP_DEPS_ADD_SUBDIRECTORY ON)
+  add_subdirectory(../fastmcpp fastmcpp)
+  target_link_libraries(${PROJECT_NAME} PRIVATE fastmcpp_core)
+  target_include_directories(${PROJECT_NAME} PRIVATE
+    ${MESHLIB_THIRDPARTY_DIR}/fastmcpp/include
+    ${MESHLIB_THIRDPARTY_DIR}/cpp-httplib
+    ${MESHLIB_THIRDPARTY_DIR}/nlohmann-json/include
+  )
+ELSE()
+  find_package(fastmcpp REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC fastmcpp::fastmcpp_core)
+ENDIF()
+
+install(
+  TARGETS ${PROJECT_NAME}
+  EXPORT ${PROJECT_NAME}
+  LIBRARY DESTINATION "${MR_MAIN_LIB_DIR}"
+  ARCHIVE DESTINATION "${MR_MAIN_LIB_DIR}"
+  RUNTIME DESTINATION "${MR_BIN_DIR}"
+)
+
+install(
+  FILES ${HEADERS}
+  DESTINATION "${MR_INCLUDE_DIR}/${PROJECT_NAME}"
+)
+
+install(
+  FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake
+  DESTINATION ${MR_CONFIG_DIR}
+)
+
+install(
+  EXPORT ${PROJECT_NAME}
+  FILE ${PROJECT_NAME}Targets.cmake
+  NAMESPACE MeshLib::
+  DESTINATION ${MR_CONFIG_DIR}
+)