From 0c07abac02c8b54b4c99b12b45a7710761088ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cchrisshank=E2=80=9D?= Date: Sun, 15 Dec 2024 20:00:06 -0800 Subject: [PATCH] use rapier compat --- bun.lockb | Bin 29661 -> 29246 bytes package.json | 5 ++--- src/folk-physics.ts | 3 ++- vite.config.ts | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bun.lockb b/bun.lockb index 9fecbbe462b2482f8f3380a995f60c84558e5870..0f5dc329f125160e534eaf716a26707f208c6470 100755 GIT binary patch delta 4627 zcmd5Jn1EJt>7)TUo z1%Z5RnngfuL^+xkLERL*1X?0U3IzoDgEUA`Xb5LY3uz*7!1VWKc08_x6jiBENBX|s zcfDiY`{vF2uH0hBZ?G+vjC0r6uGd??ir#x|-RFPTx7-_fujpD$Nx`#{PwjPUrk2$o zXcgqAe5;f&b61(7D15LWv~PkK3|s>Y0?u!0oIAg1sW1Fgy- z1P@-9>u&)E0T(tdT+}>A5So_EdbN4}9AR0AAcVp`8yE(x0EPoc`Ro}!Jq*ZKNC1Wj zYlQauSWn*YGLSbo3FH9>eYyu21%18G-U8$UO!N86fxNxLrzZk=djpWiJu)g=a|6ix zKM&-7FW3Dc?1KJ+~as0Wb2s36QK&ScaU=G1?Pq$#Ik zgA4V6NQ)|Z8dfMS7O5cIsrSNAK%>G7Me6|a!tiq>Py-!dH^;f6$CoPRwK0qI`tcnJmY9pV4?mjqzSSViXrZf5aW3`kY;bL28MTAQ{Wg>5clLgRYm?|hgQg%eT z#FNqFjdY4nqp2s-$()oQlsRmY@E}?f6CnmA7%@GGoH^c zBx}_5@4sn$0xwF>eBMCcnKiWC+)CrK+|&?fpdDFmHh}JAN#q}Iph?+orYBFfGzC|d zzDM`lh6}adW{$TUexv$U?d8TpKTAp2Q8V|)3u@0ry%SK*F0Bl3?Vh@#{qDw=&Bd?n zntf?jce(Yix6C(M^GnJCZ|q}8GbZ#Jdw~O~%qlT|>IBE}2tJ6aY!VwxQ{p5RNQb}; z6c8`5AZi3RQa5-og(OHUgqp!a=>&KfMJGxuoLa#n=rnjFB_&BLidKM|=puMDWh6^1 zhSq||(r4givZhEZjy8hF({=C!%1@P8B5egvqC4QpRGcQU6!L(l(gW}`DjOoPA=C*z zlpcepQ`Jz3Wzc@`VZ_oUHk_t_kDx=~nG}#AF$*<yv?SN^Cv@3IQSeWgCEEQf$+ zshceB`lLFDwIKcx@LwHn5BxI8FOc%#W}rjvmm(%Zs{rvs!2ucxN~ENTB}sNjIUs%j z27~x;{J8CKgW-8ZneLP-KKOVLpI9+yG{^I+4vot z-%*7jpkxp~iUaAv#H@@YE`bt32_Rhec`3oK`}}6l%L{(N6-<;iX?SKDBz~_=0XadV zKt-TJPyr|(#D9_e-5j)Pk}G)}q%okeAU^vEAifFdlfdxYsH4!yJy95II?yh+dNkG+btMl6SY=Eo7FOEh9P-K#i{O6_^lQjnhOU+ z8eMP7k?SXPkalWM&Cu9+Is}Zg*m5oTf?8qStZW-Fsm^m)^U(2%HgOp4$(03Ssg9Oa z+QeEN{i<@CctuAOs%#Fm^f?+H89Mzf&pI8;vDoq~RxCPJomXe?Kl}3GpqMjhnkPw5 z2dYdCUpdu&$#(SFriT*K0@Q-bZ|Ns<=AZvc)I4o^dQxRFs})+_KVPc|3V!pV7H~vQ z+0`b8TGBn5;aQ!t{me5hKrQ-i7N_}tJ$Bql%@gZKtI<@g5=RdGO`h%B3lp>ewT^sy zt$E7oWnZUjp7nlow%TM?3s2X;s=13doSvfvc>Uh4F*(#ib)EYcKfJep&_vCzma@jb zU9^sP^5-X-$1sp4*VxQz3AtorY47iTnYvQmT`ON_PY`XdF`4Cx49k7>>K}HzXFHa! zW7!rP&mO^Rqzf2at>LPj7lxbTLiTC_YL#c|>9JOyaWrY3M@EXTH96F>Fni3lnTP$1 z*blYuzQQqT+?|~VmVK;w9Kkfd)?`*I&F1c+eK~#$ZfXJ3f~f<2tEK6#{j2BQ_fPvo z3s8&K_a-z?U+fyXUGsQ?={}mO)$Xv+bUXXW=bc)BS`W{EdDpW`Tf2)j&*fk$sxz6@ z0{YfFOCNT+zB#G|2qDx`XL6_|w=HB<{dI5kEG||Z{8|uQl-fXEK F@NWPRP%;1j delta 4907 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 Vrn#xzxnlUkx&bzPZgsWKe*niav6uh= diff --git a/package.json b/package.json index 54d2d05..76fada5 100644 --- a/package.json +++ b/package.json @@ -11,12 +11,11 @@ }, "dependencies": { "@babel/parser": "^7.26.2", - "@dimforge/rapier2d": "^0.14.0", + "@dimforge/rapier2d-compat": "^0.14.0", "@lit/reactive-element": "^2.0.4", "leaflet": "^1.9.4", "perfect-arrows": "^0.3.7", - "perfect-freehand": "^1.2.2", - "vite-plugin-wasm": "^3.3.0" + "perfect-freehand": "^1.2.2" }, "devDependencies": { "@types/leaflet": "^1.9.14", diff --git a/src/folk-physics.ts b/src/folk-physics.ts index 2786088..3fd0709 100644 --- a/src/folk-physics.ts +++ b/src/folk-physics.ts @@ -1,8 +1,9 @@ import { DOMRectTransform } from './common/DOMRectTransform.ts'; import { FolkBaseSet } from './folk-base-set.ts'; import { PropertyValues } from '@lit/reactive-element'; -import * as RAPIER from '@dimforge/rapier2d'; import { FolkShape } from './folk-shape'; +import RAPIER, { init } from '@dimforge/rapier2d-compat'; +await init(); export class FolkPhysics extends FolkBaseSet { static override tagName = 'folk-physics'; diff --git a/vite.config.ts b/vite.config.ts index be50083..321baf2 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,7 +1,6 @@ import { resolve } from 'node:path'; import { readdirSync } from 'node:fs'; import { defineConfig, IndexHtmlTransformContext, Plugin } from 'vite'; -import vitePluginWasm from 'vite-plugin-wasm'; const demoDir = resolve(__dirname, 'demo'); @@ -66,7 +65,7 @@ const linkGenerator = (): Plugin => { export default defineConfig({ root: 'demo', - plugins: [linkGenerator(), vitePluginWasm()], + plugins: [linkGenerator()], build: { target: 'esnext', rollupOptions: {