isaac-mason · isaac-mason · May 4, 2024 · May 1, 2024 · May 2, 2024 · May 4, 2024
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -12,7 +12,8 @@
     "node-cjs-example",
     "node-esm-example",
     "parcel-example",
-    "vite-example"
+    "vite-wasm-example",
+    "vite-worker-example"
   ],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true

diff --git a/.changeset/eighty-hounds-applaud.md b/.changeset/eighty-hounds-applaud.md
@@ -0,0 +1,6 @@
+---
+"@recast-navigation/core": minor
+"recast-navigation": minor
+---
+
+feat: change Crowd and NavMeshQuery constructors to take NavMesh as first arg, and options as second
diff --git a/.changeset/few-weeks-jam.md b/.changeset/few-weeks-jam.md
@@ -0,0 +1,7 @@
+---
+"@recast-navigation/core": minor
+"@recast-navigation/wasm": minor
+"recast-navigation": minor
+---
+
+fix: change findPolysAroundCircle resultCost to be a FloatArray, not a FloatRef
diff --git a/.changeset/moody-boats-own.md b/.changeset/moody-boats-own.md
@@ -0,0 +1,6 @@
+---
+"@recast-navigation/core": minor
+"recast-navigation": minor
+---
+
+feat(NavMeshQuery): rename closestPointOnPoly posOverPoly return to isPointOverPoly
diff --git a/.changeset/real-boxes-crash.md b/.changeset/real-boxes-crash.md
@@ -0,0 +1,32 @@
+---
+"@recast-navigation/core": minor
+"recast-navigation": minor
+---
+
+feat: support separate wasm file as well as inlined wasm file
+
+Progresses https://github.com/isaac-mason/recast-navigation-js/issues/164
+
+Now `init` can be optionally passed a default import of one of the `@recast-navigation/wasm` packages.
+
+The `@recast-navigation/wasm` package is no longer included in the `@recast-navigation/core` package. If nothing is passed to `init`, the inlined wasm-compat flavor is dynamically imported.
+
+Note that the other `wasm` flavor currently does not support node.js environments.
+
+```ts
+import { init } from 'recast-navigation';
+
+// import the 'wasm' flavor - has a separate wasm file, not inlined
+import RecastWasm from '@recast-navigation/wasm/wasm';
+
+await init(RecastWasm);
+```
+
+It's still possible to use the inlined wasm flavor by not passing anything to `init` as before.
+
+```ts
+import { init } from 'recast-navigation';
+
+// internally dynamically imports `@recast-navigation/wasm`
+await init();
+```
diff --git a/.changeset/sharp-maps-relate.md b/.changeset/sharp-maps-relate.md
@@ -0,0 +1,6 @@
+---
+"@recast-navigation/core": minor
+"recast-navigation": minor
+---
+
+feat(Arrays): rename 'free' to 'destroy' for consistency with other methods
diff --git a/.changeset/short-geese-give.md b/.changeset/short-geese-give.md
@@ -0,0 +1,6 @@
+---
+"@recast-navigation/core": minor
+"recast-navigation": minor
+---
+
+fix: missing cleanup for Raw Vec3 and \*Ref classes
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -18,10 +18,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 18.x
+      - name: Setup Node.js 22.x
         uses: actions/setup-node@v2
         with:
-          node-version: 18.x
+          node-version: 22.x
 
       - name: Install Dependencies
         run: yarn

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,10 +18,10 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
 
-      - name: Setup Node.js 18.x
+      - name: Setup Node.js 22.x
         uses: actions/setup-node@v2
         with:
-          node-version: 18.x
+          node-version: 22.x
 
       - name: Install Dependencies
         run: yarn

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18.12.1
+v22.0.0
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -6,7 +6,7 @@ The `recast-navigation-js` repository is structured as a yarn monorepo. You will
 
 ### Node Installation
 
-**This project uses node 18.**
+**This project uses node 22.**
 
 If you don't already use a node version manager. Give nvm a try if you don't already have one.
 

diff --git a/apps/navmesh-website/src/features/recast/crowd/recast-agent.tsx b/apps/navmesh-website/src/features/recast/crowd/recast-agent.tsx
@@ -62,10 +62,9 @@ export const RecastAgent = forwardRef<RecastAgentRef, RecastAgentProps>(
         return;
       }
 
-      const navMeshQuery = new NavMeshQuery({ navMesh });
+      const navMeshQuery = new NavMeshQuery(navMesh);
 
-      const crowd = new Crowd({
-        navMesh,
+      const crowd = new Crowd(navMesh, {
         maxAgents: 1,
         maxAgentRadius: agentRadius,
       });

diff --git a/examples/no-bundler/index.html b/examples/no-bundler/index.html
@@ -0,0 +1,84 @@
+<html>
+  <script type="importmap">
+    {
+      "imports": {
+        "@recast-navigation/core": "https://unpkg.com/@recast-navigation/[email protected]/dist/index.mjs",
+        "@recast-navigation/wasm": "https://unpkg.com/@recast-navigation/[email protected]/dist/recast-navigation.wasm-compat.js",
+        "@recast-navigation/generators": "https://unpkg.com/@recast-navigation/[email protected]/dist/index.mjs",
+        "@recast-navigation/three": "https://unpkg.com/@recast-navigation/[email protected]/dist/index.mjs",
+        "three": "https://unpkg.com/[email protected]/build/three.module.js",
+        "three/examples/jsm/controls/OrbitControls": "https://unpkg.com/[email protected]/examples/jsm/controls/OrbitControls.js"
+      }
+    }
+  </script>
+  <script type="module">
+    import * as THREE from 'three';
+    import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
+    import { init } from '@recast-navigation/core';
+    import { DebugDrawer, threeToSoloNavMesh } from '@recast-navigation/three';
+
+    await init();
+
+    const renderer = new THREE.WebGLRenderer();
+    document.body.appendChild(renderer.domElement);
+
+    const scene = new THREE.Scene();
+    const camera = new THREE.PerspectiveCamera();
+    camera.position.set(10, 10, 10);
+
+    const orbitControls = new OrbitControls(camera, renderer.domElement);
+
+    const ground = new THREE.Mesh(
+      new THREE.BoxGeometry(10, 1, 10),
+      new THREE.MeshBasicMaterial({ color: '#333' })
+    );
+
+    scene.add(ground);
+
+    const box = new THREE.Mesh(
+      new THREE.BoxGeometry(2, 2, 2),
+      new THREE.MeshBasicMaterial({ color: '#555' })
+    );
+    box.position.set(0, 1, 0);
+
+    scene.add(box);
+
+    const { success, navMesh } = threeToSoloNavMesh([ground, box], {
+      cs: 0.05,
+      ch: 0.05,
+    });
+
+    const debugDrawer = new DebugDrawer();
+    debugDrawer.drawNavMesh(navMesh);
+
+    scene.add(debugDrawer);
+
+    const onWindowResize = () => {
+      debugDrawer.resize(window.innerWidth, window.innerHeight);
+
+      camera.aspect = window.innerWidth / window.innerHeight;
+      camera.updateProjectionMatrix();
+      renderer.setSize(window.innerWidth, window.innerHeight);
+    };
+    onWindowResize();
+
+    window.addEventListener('resize', onWindowResize);
+
+    const animate = () => {
+      requestAnimationFrame(animate);
+      renderer.render(scene, camera);
+    };
+
+    animate();
+  </script>
+  <style>
+    body {
+      margin: 0;
+      overflow: hidden;
+    }
+    canvas {
+      width: 100%;
+      height: 100vh;
+    }
+  </style>
+</html>
diff --git a/examples/node-cjs-example/index.cjs b/examples/node-cjs-example/index.cjs
@@ -33,7 +33,7 @@ Recast.init().then(() => {
 
   const { navMesh } = RecastGenerators.generateSoloNavMesh(positions, indices, config);
 
-  const navMeshQuery = new Recast.NavMeshQuery({ navMesh });
+  const navMeshQuery = new Recast.NavMeshQuery(navMesh);
 
   const { point: closestPoint } = navMeshQuery.findClosestPoint({ x: 2, y: 1, z: 2 });
 

diff --git a/examples/node-cjs-example/package.json b/examples/node-cjs-example/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "description": "example of using recast-navigation in node",
   "scripts": {
-    "start": "node index.cjs"
+    "start": "node --experimental-require-module index.cjs"
   },
   "author": "",
   "license": "ISC",

diff --git a/examples/node-esm-example/index.mjs b/examples/node-esm-example/index.mjs
@@ -34,7 +34,7 @@ const indices = groundMesh.geometry.index.array;
 
 const { navMesh } = generateSoloNavMesh(positions, indices, config);
 
-const navMeshQuery = new NavMeshQuery({ navMesh });
+const navMeshQuery = new NavMeshQuery(navMesh);
 
 const { point: closestPoint } = navMeshQuery.findClosestPoint({ x: 2, y: 1, z: 2 });
 

diff --git a/examples/vite-example/.gitignore → examples/vite-wasm-example/.gitignore b/examples/vite-example/.gitignore → examples/vite-wasm-example/.gitignore
diff --git a/examples/vite-example/.prettierrc.json → examples/vite-wasm-example/.prettierrc.json b/examples/vite-example/.prettierrc.json → examples/vite-wasm-example/.prettierrc.json
diff --git a/examples/vite-example/index.html → examples/vite-wasm-example/index.html b/examples/vite-example/index.html → examples/vite-wasm-example/index.html
diff --git a/examples/vite-example/package.json → examples/vite-wasm-example/package.json b/examples/vite-example/package.json → examples/vite-wasm-example/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "vite-example",
+  "name": "vite-wasm-example",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/examples/vite-example/src/app.tsx → examples/vite-wasm-example/src/app.tsx b/examples/vite-example/src/app.tsx → examples/vite-wasm-example/src/app.tsx
@@ -1,5 +1,6 @@
-import { Environment, OrbitControls } from '@react-three/drei';
+import { OrbitControls } from '@react-three/drei';
 import { Canvas, useThree } from '@react-three/fiber';
+import RecastWasm from '@recast-navigation/wasm/wasm';
 import { useEffect, useRef } from 'react';
 import { NavMeshQuery, init } from 'recast-navigation';
 import { NavMeshHelper, threeToSoloNavMesh } from 'recast-navigation/three';
@@ -39,7 +40,7 @@ const App = () => {
 
     if (!success) return;
 
-    const navMeshQuery = new NavMeshQuery({ navMesh });
+    const navMeshQuery = new NavMeshQuery(navMesh);
 
     const navMeshHelper = new NavMeshHelper({
       navMesh,
@@ -109,7 +110,7 @@ const App = () => {
 };
 
 const RecastInit = (props: { children: JSX.Element }) => {
-  suspend(() => init(), []);
+  suspend(() => init(RecastWasm), []);
 
   return props.children;
 };
@@ -119,7 +120,8 @@ export default () => (
     <Canvas camera={{ position: [5, 5, 5] }}>
       <App />
 
-      <Environment preset="city" />
+      <ambientLight intensity={1.5} />
+      <directionalLight position={[5, 5, -5]} intensity={3} />
 
       <OrbitControls />
     </Canvas>

diff --git a/examples/vite-example/src/index.css → examples/vite-wasm-example/src/index.css b/examples/vite-example/src/index.css → examples/vite-wasm-example/src/index.css
diff --git a/examples/vite-example/src/main.tsx → examples/vite-wasm-example/src/main.tsx b/examples/vite-example/src/main.tsx → examples/vite-wasm-example/src/main.tsx
diff --git a/examples/vite-example/src/vite-env.d.ts → examples/vite-wasm-example/src/vite-env.d.ts b/examples/vite-example/src/vite-env.d.ts → examples/vite-wasm-example/src/vite-env.d.ts
diff --git a/examples/vite-example/tsconfig.json → examples/vite-wasm-example/tsconfig.json b/examples/vite-example/tsconfig.json → examples/vite-wasm-example/tsconfig.json
diff --git a/examples/vite-example/tsconfig.node.json → ...ples/vite-wasm-example/tsconfig.node.json b/examples/vite-example/tsconfig.node.json → ...ples/vite-wasm-example/tsconfig.node.json
diff --git a/examples/vite-example/vite.config.ts → examples/vite-wasm-example/vite.config.ts b/examples/vite-example/vite.config.ts → examples/vite-wasm-example/vite.config.ts
diff --git a/examples/vite-worker-example/.gitignore b/examples/vite-worker-example/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/examples/vite-worker-example/.prettierrc.json b/examples/vite-worker-example/.prettierrc.json
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true
+}
diff --git a/examples/vite-worker-example/index.html b/examples/vite-worker-example/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/examples/vite-worker-example/package.json b/examples/vite-worker-example/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "vite-worker-example",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc && vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "@react-three/drei": "^9.105.4",
+    "@react-three/fiber": "^8.15.12",
+    "react": "^18.3.1",
+    "react-dom": "^18.2.0",
+    "recast-navigation": "0.27.0",
+    "suspend-react": "^0.1.3",
+    "three": "^0.163.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.2.8",
+    "@types/three": "^0.163.0",
+    "@vitejs/plugin-react": "^4.2.0",
+    "typescript": "^5.4.3",
+    "vite": "^5.2.8"
+  }
+}