diff --git a/src/game.ts b/src/game.ts index f36a7db..0f0ffab 100644 --- a/src/game.ts +++ b/src/game.ts @@ -11,13 +11,14 @@ import { PhysicsEntity } from "./entities/phys/physicsEntity"; import { getAssets } from "./assets"; import { GameDebugOverlay } from "./overlay"; import { GameWorld } from "./world"; -import RAPIER from "@dimforge/rapier2d"; +import RAPIER from "@dimforge/rapier2d-compat"; import { Worm } from "./entities/phys/worm"; import { readAssetsForEntities } from "./entities"; const worldWidth = 1920; const worldHeight = 1080; + export class Game { public readonly viewport: Viewport; private readonly rapierWorld: RAPIER.World; @@ -29,6 +30,7 @@ export class Game { } public static async create(window: Window, level: string): Promise { + await RAPIER.init(); const pixiApp = new Application(); await pixiApp.init({ resizeTo: window, preference: 'webgl' }); return new Game(pixiApp, level); diff --git a/src/mixins/bodyWireframe..ts b/src/mixins/bodyWireframe..ts index fe2bdf4..3287ad4 100644 --- a/src/mixins/bodyWireframe..ts +++ b/src/mixins/bodyWireframe..ts @@ -1,6 +1,6 @@ import { Graphics, Text } from "pixi.js"; import { PIXELS_PER_METER, RapierPhysicsObject } from "../world"; -import { Cuboid, RoundCuboid } from "@dimforge/rapier2d"; +import { Cuboid, RoundCuboid } from "@dimforge/rapier2d-compat"; /** * Render a wireframe in pixi.js around a matter body. diff --git a/src/overlay.ts b/src/overlay.ts index 1fba2a0..9530448 100644 --- a/src/overlay.ts +++ b/src/overlay.ts @@ -1,6 +1,6 @@ import { Container, Graphics, Text, Ticker, UPDATE_PRIORITY } from "pixi.js"; import globalFlags from "./flags"; -import RAPIER from "@dimforge/rapier2d"; +import RAPIER from "@dimforge/rapier2d-compat"; import { PIXELS_PER_METER } from "./world"; import { Viewport } from "pixi-viewport"; diff --git a/src/terrain/index.ts b/src/terrain/index.ts index 196e6a7..641b939 100644 --- a/src/terrain/index.ts +++ b/src/terrain/index.ts @@ -1,4 +1,4 @@ -import { Vector2 } from "@dimforge/rapier2d"; +import { Vector2 } from "@dimforge/rapier2d-compat"; import { Rectangle } from "pixi.js"; export function imageDataToTerrainBoundaries(boundaryX: number, boundaryY: number, imgData: ImageData): { boundaries: Vector2[], boundingBox: Rectangle} { diff --git a/src/utils/index.ts b/src/utils/index.ts index dd9c994..9d54ea6 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,4 +1,4 @@ -import { Vector, Vector2 } from "@dimforge/rapier2d"; +import { Vector, Vector2 } from "@dimforge/rapier2d-compat"; export { Coordinate, MetersValue } from "./coodinate"; diff --git a/src/weapons/grenade.ts b/src/weapons/grenade.ts index 74a299f..07f96ec 100644 --- a/src/weapons/grenade.ts +++ b/src/weapons/grenade.ts @@ -4,7 +4,7 @@ import { IWeaponCode, IWeaponDefiniton } from "./weapon"; import { Worm } from "../entities/phys/worm"; import { Game } from "../game"; import { GameWorld } from "../world"; -import { Vector2 } from "@dimforge/rapier2d"; +import { Vector2 } from "@dimforge/rapier2d-compat"; import { add } from "../utils"; export const WeaponGrenade: IWeaponDefiniton = { diff --git a/src/world.ts b/src/world.ts index 56a5e17..f8ab71e 100644 --- a/src/world.ts +++ b/src/world.ts @@ -1,7 +1,7 @@ import { IGameEntity, IMatterEntity } from "./entities/entity"; import { Ticker, UPDATE_PRIORITY } from "pixi.js"; import { Viewport } from "pixi-viewport"; -import { Ball, Collider, ColliderDesc, EventQueue, RigidBody, RigidBodyDesc, Vector2, World } from "@dimforge/rapier2d"; +import { Ball, Collider, ColliderDesc, EventQueue, RigidBody, RigidBodyDesc, Vector2, World } from "@dimforge/rapier2d-compat"; import { Coordinate, MetersValue } from "./utils/coodinate"; /**