Skip to content

Commit eec2f7c

Browse files
authored
Merge pull request #14 from alpinebuster/dev
Dev
2 parents c741cd1 + 083e892 commit eec2f7c

File tree

91 files changed

+794
-3676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+794
-3676
lines changed

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

Lines changed: 0 additions & 112 deletions
This file was deleted.

.github/workflows/update-docs.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,3 @@
7676
[submodule "thirdparty/OpenCTM-git"]
7777
path = thirdparty/OpenCTM-git
7878
url = https://github.com/MeshInspector/OpenCTM.git
79-
[submodule "docs/doxygen-awesome-css"]
80-
path = docs/doxygen-awesome-css
81-
url = https://github.com/jothepro/doxygen-awesome-css

.vscode/meshsdk.code-workspace

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
"atomic": "cpp",
7171
"bit": "cpp",
7272
"random": "cpp",
73-
"adolcforward": "cpp"
73+
"adolcforward": "cpp",
74+
"*.inc": "cpp"
7475
}
7576
}
7677
}

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ IF(NOT MR_EMSCRIPTEN AND NOT APPLE AND EXISTS /usr/bin/time)
1010
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "/usr/bin/time -f \",%U,%S,%C\" -a -o link_timings.txt")
1111
ENDIF()
1212

13-
project(MeshLib CXX)
13+
project(MeshSDK CXX)
1414

15-
set(MESHLIB_PROJECT_NAME "MeshLib" CACHE STRING "Project name")
15+
set(MESHLIB_PROJECT_NAME "MeshSDK" CACHE STRING "Project name")
1616
add_compile_definitions(MR_PROJECT_NAME=\"${MESHLIB_PROJECT_NAME}\")
1717

1818
include(CompilerOptions)

README.md

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,35 +39,53 @@ The MeshSDK is an open-source library that provides advanced algorithms for 3D d
3939

4040
### Linux & MacOS
4141

42+
Install emscripten toolkit:
43+
44+
```sh
45+
# Fetch the latest version of the emsdk (not needed the first time you clone)
46+
git pull
47+
48+
# Download and install the latest SDK tools.
49+
# ./emsdk install latest # ⚠️
50+
./emsdk install 4.0.10
51+
52+
# Make the "latest" SDK "active" for the current user. (writes .emscripten file)
53+
# ./emsdk activate latest # ⚠️
54+
./emsdk activate latest
55+
56+
# Activate PATH and other environment variables in the current terminal
57+
source ./emsdk_env.sh
58+
```
59+
60+
Build source code:
61+
4262
```sh
4363
git submodule update --init
64+
4465
./scripts/build_thirdparty.sh
4566
./scripts/build_source.sh
46-
47-
# Common sense
48-
emcc --clear-cache
4967
```
5068

5169
### Docker
5270

5371
```sh
54-
`docker compose up --build meshlib-emscripten-build`
72+
`docker compose up --build meshsdk-emscripten-build`
5573

56-
`docker compose up meshlib-emscripten-build`
57-
`docker compose up meshlib-emscripten-build -d`
74+
`docker compose up meshsdk-emscripten-build`
75+
`docker compose up meshsdk-emscripten-build -d`
5876

5977
`docker compose --profile singlethreaded up meshlib-emscripten-build-singlethreaded`
6078
`docker compose --profile wasm64 up meshlib-emscripten-build-wasm64`
6179

6280
#
6381
# To run custom build commands:
6482
#
65-
`docker compose exec meshlib-emscripten-build bash`
66-
`docker compose exec meshlib-emscripten-build-singlethreaded bash`
67-
`docker compose exec meshlib-emscripten-build-wasm64 bash`
83+
`docker compose exec meshsdk-emscripten-build bash`
84+
`docker compose exec meshsdk-emscripten-build-singlethreaded bash`
85+
`docker compose exec meshsdk-emscripten-build-wasm64 bash`
6886
```
6987

70-
### Windows
88+
### Windows (Desktop)
7189

7290
#### Prerequisites
7391
1. **Git**
@@ -80,7 +98,7 @@ emcc --clear-cache
8098
3. **CUDA Toolkit**
8199
- For **Visual Studio 2019**: Install [CUDA v11.4](https://developer.nvidia.com/cuda-11-4-0-download-archive)
82100
- For **Visual Studio 2022**: Install [CUDA v12.0](https://developer.nvidia.com/cuda-12-0-0-download-archive)
83-
\n Choose the appropriate version based on your Visual Studio installation.
101+
Choose the appropriate version based on your Visual Studio installation.
84102
4. **vcpkg**
85103
- To install `vcpkg`, follow these steps:
86104
1. **Open a command prompt (CMD) or PowerShell window**.
@@ -114,29 +132,29 @@ vcpkg integrate install
114132
[Learn more about](https://github.com/Microsoft/vcpkg) `vcpkg`
115133

116134
#### Installing the local build
117-
\note The following steps will require approximately 40 GB of disk space.
135+
The following steps will require approximately 40 GB of disk space.
118136

119137
1. **Clone the Submodules**:
120138
```cmd
121139
git submodule update --init
122140
# or
123141
git submodule update --init --recursive
124142
```
125-
2. \b (Optional) **Speed Up with AWS CLI**
143+
2. (Optional) **Speed Up with AWS CLI**
126144
- Optionally, [install AWS CLI v2](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html) to speed up the process before using the Installation Script. Restart your terminal after installation.
127145
3. **Install Third-Party Dependencies**
128146
- Execute the following commands to run the third-party installation script:
129147
```cmd
130148
cd vcpkg
131-
..\meshlib\thirdparty\install.bat
149+
..\meshsdk\thirdparty\install.bat
132150
```
133151
- This script automates the installation of necessary third-party dependencies.
134152
4. **Build and Run Visual Studio Solution**
135-
- Open `meshlib/source/MeshLib.sln` in Visual Studio.
153+
- Open `meshsdk/source/MeshLib.sln` in Visual Studio.
136154
- Build the solution and run the application.
137155
5. **Build and Run CMake Project**
138156
- Make sure you have the "C++ CMake tools for Windows" component installed.
139-
- Open `meshlib/CMakeLists.txt` in Visual Studio (File - Open - CMake).
157+
- Open `meshsdk/CMakeLists.txt` in Visual Studio (File - Open - CMake).
140158
- Build the project and run the application.
141159

142160
### Installation
@@ -146,18 +164,18 @@ cd vcpkg
146164
Install with npm or yarn:
147165

148166
```sh
149-
npm install @alpinebuster/meshlib
150-
yarn add @alpinebuster/meshlib
167+
npm install @alpinebuster/meshsdk
168+
yarn add @alpinebuster/meshsdk
151169
```
152170

153171
#### Python
154172

155173
For Python, simply install via pip:
156174

157-
```
175+
```sh
158176
pip install meshlib
159177
```
160178

161179
## **License**
162180

163-
Here, you can access our [Non-Commercial Free License](https://github.com/MeshInspector/MeshLib?tab=License-1-ov-file#readme) with a Commercial License Requirement. Also, see extra details on the [license page](https://meshlib.io/license/).
181+
Here, you can access our Non-Commercial Free License with a Commercial License Requirement. Also, see [license](./LICENSE).

0 commit comments

Comments
 (0)