Skip to content

Commit 04d7af4

Browse files
Merge pull request #30 from diarmidmackenzie/fixed-mozilla-build
Used a fixed mozilla build
2 parents e30337e + 6c2125f commit 04d7af4

10 files changed

+11
-11
lines changed

AmmoDriver.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ Initial installation is the same as for Cannon.js. See: [Scripts](https://github
3030
### Including the Ammo.js build
3131

3232
Ammo.js is not a dependency of this project. As a result, it must be included into your project manually. Recommended options are: [script tag](#script-tag) or [NPM and Webpack](#npm-and-webpack).
33-
The latest [WebAssembly](https://developer.mozilla.org/en-US/docs/WebAssembly) build is available either via the [Ammo.js github](http://kripken.github.io/ammo.js/builds/ammo.wasm.js) (`http://kripken.github.io/ammo.js/builds/ammo.wasm.js`) or the [Mozilla Reality fork](https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js) (`https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js`) maintained by the [Mozilla Hubs](https://github.com/mozilla/hubs) team. The latter is especially optimized for use with the Ammo Driver and includes [some functionality](#hacd-and-vhacd) not yet available in the main repository.
33+
The latest [WebAssembly](https://developer.mozilla.org/en-US/docs/WebAssembly) build is available either via the [Ammo.js github](http://kripken.github.io/ammo.js/builds/ammo.wasm.js) (`http://kripken.github.io/ammo.js/builds/ammo.wasm.js`) or the [Mozilla Reality fork](https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js) (`https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js`) created by the [Mozilla Hubs](https://github.com/mozilla/hubs) team. The latter is especially optimized for use with the Ammo Driver and includes [some functionality](#hacd-and-vhacd) not yet available in the main repository.
3434

3535
#### Script Tag
3636

3737
This is the easiest way to include Ammo.js in your project and is recommended for most AFrame projects. Simply add the following to your html file:
3838

3939
```html
40-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
40+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
4141
or
4242
<script src="http://kripken.github.io/ammo.js/builds/ammo.wasm.js"></script>
4343
```

examples/ammo/compound.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>Examples • Compound AMMO</title>
77
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
9-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>
1111
<script src="../components/force-pushable.js"></script>
1212
<script src="../components/grab.js"></script>

examples/ammo/constraints.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
77
<title>Examples • Constraints • AMMO</title>
88
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
9-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
1010
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
1111
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/aframe-blink-controls.min.js"></script>
1212
<script src="../../dist/aframe-physics-system.js"></script>

examples/ammo/materials.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>Examples • Materials AMMO</title>
77
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
9-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>
1111
<script src="../components/force-pushable.js"></script>
1212
<script src="../components/grab.js"></script>

examples/ammo/perf.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>Physics Benchmark Test - Ammo</title>
66
<meta name="description" content="Physics Benchamrk Test - Ammo">
77
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
8-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
8+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
99
<script src="../../dist/aframe-physics-system.js"></script>
1010
<script src="../components/pinboard.js"></script>
1111
<link rel="stylesheet" href="../styles.css">

examples/ammo/sandbox.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>Examples • AMMO</title>
55
<meta name="description" content="Hello, WebVR! - A-Frame" />
66
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
7-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
7+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
88
<script src="../../dist/aframe-physics-system.js"></script>
99
<link rel="stylesheet" href="../styles.css">
1010
<script>

examples/ammo/spring.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Spring AMMO</title>
77
<script type="text/javascript" src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
8-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
8+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
99
<script src="../../dist/aframe-physics-system.js"></script>
1010
<link rel="stylesheet" href="../styles.css">
1111
</head>

examples/ammo/stress.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>Examples • Stress Test AMMO</title>
77
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
9-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>
1111
<script src="../components/force-pushable.js"></script>
1212
<script src="../components/grab.js"></script>

examples/ammo/sweeper.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>Examples • Sweeper AMMO</title>
77
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
9-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
9+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>
1111
<script src="../components/grab.js"></script>
1212
<script src="../components/rain-of-entities.js"></script>

examples/ammo/ttl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>Examples • TTL AMMO</title>
55
<meta name="description" content="Hello, WebVR! - A-Frame">
66
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
7-
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
7+
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
88
<script src="../../dist/aframe-physics-system.js"></script>
99
<link rel="stylesheet" href="../styles.css">
1010
<script>

0 commit comments

Comments
 (0)