Merge pull request #18 from alpinebuster/dev

Dev

Author: alpinebuster

.vscode/c_cpp_properties.json

@@ -1,5 +1,20 @@
 {
     "configurations": [
+        {
+            "name": "Emscripten",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${env:EMSDK}/upstream/emscripten/system/include",
+                "${env:EMSDK}/upstream/emscripten"
+            ],
+            "defines": [
+                "__EMSCRIPTEN__"
+            ],
+            "compilerPath": "/usr/bin/g++-13",
+            "intelliSenseMode": "linux-gcc-x64",
+            "cStandard": "c23",
+            "cppStandard": "c++23"
+        },
         {
             "name": "Linux",
             "includePath": [

.vscode/meshsdk.code-workspace

@@ -113,7 +113,8 @@
 			"streambuf": "cpp",
 			"system_error": "cpp",
 			"thread": "cpp",
-			"typeindex": "cpp"
+			"typeindex": "cpp",
+			"__config": "cpp"
 		}
 	}
 }

README.dotnet.md

@@ -48,7 +48,7 @@ services:
     # Override the command to run your build process
     command: >
       bash -c "
-        echo '=== MeshLib Emscripten Build (Multithreaded, 32-bit) ===' &&
+        echo '=== MeshSDK Emscripten Build (Multithreaded, 32-bit) ===' &&
         echo 'Git submodules and thirdparty dependencies are pre-built in the Docker image.' &&
         ln -s /usr/local/lib/emscripten/bin /meshsdk/bin &&
         ln -s /usr/local/lib/emscripten/include /meshsdk/include &&
@@ -99,7 +99,7 @@ services:
       - DEBIAN_FRONTEND=noninteractive
     command: >
       bash -c "
-        echo '=== MeshLib Emscripten Build (Single-threaded, 32-bit) ===' &&
+        echo '=== MeshSDK Emscripten Build (Single-threaded, 32-bit) ===' &&
         echo 'Using pre-built singlethreaded thirdparty dependencies.' &&
         ln -s /usr/local/lib/emscripten-single/bin /meshsdk/bin &&
         ln -s /usr/local/lib/emscripten-single/include /meshsdk/include &&
@@ -146,7 +146,7 @@ services:
       - DEBIAN_FRONTEND=noninteractive
     command: >
       bash -c "
-        echo '=== MeshLib Emscripten Build (Multithreaded, 64-bit WASM) ===' &&
+        echo '=== MeshSDK Emscripten Build (Multithreaded, 64-bit WASM) ===' &&
         echo 'Using pre-built 64-bit WASM thirdparty dependencies.' &&
         ln -s /usr/local/lib/emscripten-wasm64/bin /meshsdk/bin &&
         ln -s /usr/local/lib/emscripten-wasm64/include /meshsdk/include &&

docker-compose.yml

@@ -555,8 +555,7 @@ Editor.prototype = {
 
 			const wasmMesh = this.MeshSDK.Mesh.fromTrianglesMemoryView( jsVertices, jsIndices, true );
 			try {
-				const wasmMeshWrapper = new this.MeshSDK.MeshWrapper( wasmMesh );
-				if ( wasmMeshWrapper ) this.addWasmObject( curM.uuid, wasmMeshWrapper );
+				if ( wasmMesh ) this.addWasmObject( curM.uuid, wasmMesh );
 			}
 			finally {
 				// IMPORTANT!!!

examples/web/threejs/editor/js/Editor.js

@@ -413,6 +413,7 @@ function Loader( editor ) {
 				reader.addEventListener( 'load', async function ( event ) {
 					const contents = event.target.result;
 
+					///
 					// NOTE: Wasm Object with emscripten memory views
 					const uint8Array = new Uint8Array( contents );
 					const ptr = editor.MeshSDK._malloc( uint8Array.byteLength );
@@ -425,17 +426,21 @@ function Loader( editor ) {
 						reader.readAsArrayBuffer( file );
 						return; // Exit the current function to avoid further processing
 					}
-					const mrmeshObj = result.meshWrapper;
+					///
 
+
+					///
 					const { STLLoader } = await import( 'three/addons/loaders/STLLoader.js' );
 
 					const geometry = new STLLoader().parse( contents );
 					const material = new THREE.MeshNormalMaterial();
 
 					const mesh = new THREE.Mesh( geometry, material );
 					mesh.name = filename;
+					///
+
 
-					editor.execute( new AddObjectCommand( editor, mesh, null, null, mrmeshObj ) );
+					editor.execute( new AddObjectCommand( editor, mesh, null, null, result.mesh ) );
 
 					// NOTE: Remember to free after processing
 					editor.MeshSDK._free( ptr );