Skip to content

Commit b4b60da

Browse files
authored
Avoids HTTPS/HTTP conflicts, and linking to out-of-date documentation. (#35)
* Modernizes links
1 parent e684fe8 commit b4b60da

32 files changed

+55
-55
lines changed

AmmoDriver.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ The Ammo.js driver provides many features and new functionality that the existin
2525

2626
## Installation
2727

28-
Initial installation is the same as for Cannon.js. See: [Scripts](https://github.com/donmccurdy/aframe-physics-system/blob/master/README.md#installation), then see [Including the Ammo.js Build](#including-the-ammojs-build).
28+
Initial installation is the same as for Cannon.js. See: [Scripts](README.md#installation), then see [Including the Ammo.js Build](#including-the-ammojs-build).
2929

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://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.
33+
The latest [WebAssembly](https://developer.mozilla.org/en-US/docs/WebAssembly) build is available either via the [Ammo.js github](https://kripken.github.io/ammo.js/builds/ammo.wasm.js) (`https://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

@@ -39,7 +39,7 @@ This is the easiest way to include Ammo.js in your project and is recommended fo
3939
```html
4040
<script src="https://cdn.jsdelivr.net/gh/MozillaReality/ammo.js@8bbc0ea/builds/ammo.wasm.js"></script>
4141
or
42-
<script src="http://kripken.github.io/ammo.js/builds/ammo.wasm.js"></script>
42+
<script src="https://kripken.github.io/ammo.js/builds/ammo.wasm.js"></script>
4343
```
4444

4545
Then, add `aframe-physics-system` itself, also with a script tag:
@@ -255,7 +255,7 @@ Any entity with an `ammo-body` component can also have 1 or more `ammo-shape` co
255255
- **Cone** (`cone`) – Requires `halfExtents` if using `fit: manual`. Use `cylinderAxis` to change which axis the point of the cone is aligned.
256256
- **Hull** (`hull`) – Wraps a model in a convex hull, like a shrink-wrap. Not quite as performant as primitives, but still very fast.
257257
- **Hull Approximate Convex Decomposition** (`hacd`) – This is an experimental feature that generates multiple convex hulls to approximate any convex or concave shape.
258-
- **Volumetric Hull Approximate Convex Decomposition** (`vhacd`) – Also experimental, this is `hacd` with a different algorithm. See: http://kmamou.blogspot.com/2014/11/v-hacd-v20-is-here.html for more information.
258+
- **Volumetric Hull Approximate Convex Decomposition** (`vhacd`) – Also experimental, this is `hacd` with a different algorithm. See: https://kmamou.blogspot.com/2014/11/v-hacd-v20-is-here.html for more information.
259259
- **Mesh** (`mesh`) – Creates a 1:1 concave collision shape with the triangles of the meshes of the entity. May only be used on `static` bodies. This is the least performant shape, however they can work very well for static environments if the following is observed:
260260
- Avoid using meshes with very high triangle density relative to size of convex objects (primitives and hulls) colliding with the mesh. E.g. avoid meshes where an object could collide with dozens or more triangles in a single spot.
261261
- Avoid very high poly meshes in general and use mesh decimation (simplification) if possible.

CannonDriver.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Cannon Driver
22

3-
[CANNON.js](http://schteppe.github.io/cannon.js/) is a native JavaScript physics library, which is one of the available choices of driver in aframe-physics-system
3+
[CANNON.js](https://schteppe.github.io/cannon.js/) is a native JavaScript physics library, which is one of the available choices of driver in aframe-physics-system
44

55
This page describes how to use aframe-physics-system with the Cannon Driver
66

@@ -30,14 +30,14 @@ npm install --save @c-frame/aframe-physics-system
3030
require('aframe-physics-system');
3131
```
3232

33-
Once installed, you'll need to compile your JavaScript using something like [Browserify](http://browserify.org/) or [Webpack](http://webpack.github.io/). Example:
33+
Once installed, you'll need to compile your JavaScript using something like [Browserify](https://browserify.org/) or [Webpack](https://webpack.github.io/). Example:
3434

3535
```bash
3636
npm install -g browserify
3737
browserify my-app.js -o bundle.js
3838
```
3939

40-
`bundle.js` may then be included in your page. See [here](http://browserify.org/#middle-section) for a better introduction to Browserify.
40+
`bundle.js` may then be included in your page. See [here](https://browserify.org/#middle-section) for a better introduction to Browserify.
4141

4242
#### npm + webpack
4343

@@ -204,7 +204,7 @@ Example:
204204

205205
## Using the CANNON.js API
206206

207-
For more advanced physics, use the CANNON.js API with custom JavaScript and A-Frame components. The [CANNON.js documentation](http://schteppe.github.io/cannon.js/docs/) and source code offer good resources for learning to work with physics in JavaScript.
207+
For more advanced physics, use the CANNON.js API with custom JavaScript and A-Frame components. The [CANNON.js documentation](https://schteppe.github.io/cannon.js/docs/) and source code offer good resources for learning to work with physics in JavaScript.
208208

209209
In A-Frame, each entity's `CANNON.Body` instance is exposed on the `el.body` property. To apply a quick push to an object, you might do the following:
210210

@@ -291,9 +291,9 @@ More advanced configuration, including specifying different collision behaviors
291291

292292
Resources:
293293

294-
* [CANNON.World](http://schteppe.github.io/cannon.js/docs/classes/World.html)
294+
* [CANNON.World](https://schteppe.github.io/cannon.js/docs/classes/World.html)
295295

296-
* [CANNON.ContactMaterial](http://schteppe.github.io/cannon.js/docs/classes/ContactMaterial.html)
296+
* [CANNON.ContactMaterial](https://schteppe.github.io/cannon.js/docs/classes/ContactMaterial.html)
297297

298298

299299
## Statistics

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A C-Frame fork, collectively maintained by the A-Frame community. Also see [the
99
-->
1010
Components for A-Frame physics integration.
1111

12-
Supports [CANNON.js](http://schteppe.github.io/cannon.js/) and [Ammo.js](https://github.com/kripken/ammo.js/). See
12+
Supports [CANNON.js](https://schteppe.github.io/cannon.js/) and [Ammo.js](https://github.com/kripken/ammo.js/). See
1313
[examples](https://c-frame.github.io/aframe-physics-system/examples/).
1414

1515
## Contents

examples/ammo/compound.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Compound AMMO</title>
7-
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
99
<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>
@@ -31,10 +31,10 @@
3131
geometry="primitive: circle; radius: 0.01; segments: 4;"
3232
material="color: #FF4444; shader: flat"></a-entity>
3333
</a-entity>
34-
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
34+
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
3535
hand-controls="hand: left" grab></a-entity>
3636
<a-entity id="right-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
37-
hand-controls="hand: right" grab></a-entity>
37+
hand-controls="hand: right" grab></a-entity>
3838

3939
<!-- Terrain -->
4040
<a-box width="75" height="0.1" depth="75" ammo-body="type: static" ammo-shape visible="false"></a-box>

examples/ammo/constraints.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
1+
<!DOCTYPE html>
22
<html>
33
<head>
44
<meta http-equiv="X-UA-Compatible" content="IE=edge">
55
<meta http-equiv="content-type" content="text/html; charset=utf-8">
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>
8-
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
8+
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
99
<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>

examples/ammo/materials.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Materials AMMO</title>
7-
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
99
<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>
@@ -32,10 +32,10 @@
3232
geometry="primitive: circle; radius: 0.01; segments: 4;"
3333
material="color: #FF4444; shader: flat"></a-entity>
3434
</a-entity>
35-
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
35+
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
3636
hand-controls="hand: left" grab></a-entity>
3737
<a-entity id="right-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
38-
hand-controls="hand: right" grab></a-entity>
38+
hand-controls="hand: right" grab></a-entity>
3939

4040
<!-- Terrain -->
4141
<a-box width="75" height="0.1" depth="75" ammo-body="type: static; restitution:1" ammo-shape visible="false"></a-box>

examples/ammo/perf.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>Physics Benchmark Test - Ammo</title>
66
<meta name="description" content="Physics Benchamrk Test - Ammo">
7-
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
88
<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>

examples/ammo/sandbox.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<title>Examples • AMMO</title>
55
<meta name="description" content="Hello, WebVR! - A-Frame" />
6-
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
77
<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">

examples/ammo/spring.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
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>
7-
<script type="text/javascript" src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
7+
<script type="text/javascript" src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
88
<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">

examples/ammo/stress.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="content-type" content="text/html; charset=utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no,user-scalable=no,maximum-scale=1">
66
<title>Examples • Stress Test AMMO</title>
7-
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
88
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
99
<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>
@@ -34,10 +34,10 @@
3434
material="color: #FF4444; shader: flat"></a-entity>
3535
</a-entity>
3636

37-
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
37+
<a-entity id="left-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
3838
hand-controls="hand: left" grab></a-entity>
3939
<a-entity id="right-hand" ammo-body="type: kinematic; emitCollisionEvents: true" ammo-shape="type: sphere; fit: manual; sphereRadius: 0.02;"
40-
hand-controls="hand: right" grab></a-entity>
40+
hand-controls="hand: right" grab></a-entity>
4141

4242
<!-- Terrain -->
4343
<a-box width="75" height="0.1" depth="75" ammo-body="type: static" ammo-shape visible="false"></a-box>

0 commit comments

Comments
 (0)