Skip to content

Commit daf2633

Browse files
diarmidmackenziediarmidmackenzie
authored
Merge pull request #26 from diarmidmackenzie/update-examples-to-1.4.0
Update examples to 1.4.0
2 parents c864138 + fe1e38b commit daf2633

32 files changed

+95
-64
lines changed

‎dist/aframe-physics-system.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -519,13 +519,13 @@ THREE.AmmoDebugDrawer = function(scene, world, options) {
519519
var vertices = new Float32Array(maxBufferSize * 3);
520520
var colors = new Float32Array(maxBufferSize * 3);
521521

522-
this.geometry.addAttribute("position", new THREE.BufferAttribute(vertices, 3).setDynamic(true));
523-
this.geometry.addAttribute("color", new THREE.BufferAttribute(colors, 3).setDynamic(true));
522+
this.geometry.setAttribute("position", new THREE.BufferAttribute(vertices, 3).setUsage(THREE.DynamicDrawUsage));
523+
this.geometry.setAttribute("color", new THREE.BufferAttribute(colors, 3).setUsage(THREE.DynamicDrawUsage));
524524

525525
this.index = 0;
526526

527527
var material = new THREE.LineBasicMaterial({
528-
vertexColors: THREE.VertexColors,
528+
vertexColors: true,
529529
depthTest: !drawOnTop
530530
});
531531

@@ -14523,7 +14523,7 @@ const _iterateGeometries = (function() {
1452314523
const inverse = new THREE.Matrix4();
1452414524
const bufferGeometry = new THREE.BufferGeometry();
1452514525
return function(root, options, cb) {
14526-
inverse.copy(root.matrixWorld).invert();
14526+
inverse.copy(root.matrixWorld).invert();
1452714527
root.traverse(mesh => {
1452814528
if (
1452914529
mesh.isMesh &&
@@ -17490,7 +17490,7 @@ var Shape = {
1749017490

1749117491
//rotate by 90 degrees similar to mesh2shape:createCylinderShape
1749217492
var quat = new CANNON.Quaternion();
17493-
quat.setFromEuler(90 * THREE.Math.DEG2RAD, 0, 0, 'XYZ').normalize();
17493+
quat.setFromEuler(90 * THREE.MathUtils.DEG2RAD, 0, 0, 'XYZ').normalize();
1749417494
orientation.mult(quat, orientation);
1749517495
break;
1749617496
default:

‎dist/aframe-physics-system.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ammo/compound.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 • Compound AMMO</title>
7-
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
7+
<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>
99
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>

‎examples/ammo/constraints.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
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.3.0/aframe.min.js"></script>
8+
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
99
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
10-
<script src="https://unpkg.com/[email protected].1/dist/aframe-environment-component.min.js"></script>
11-
<script src="https://cdn.jsdelivr.net/gh/fernandojsg/aframe-teleport-controls@master/dist/aframe-teleport-controls.min.js"></script>
10+
<script src="https://unpkg.com/[email protected].2/dist/aframe-environment-component.min.js"></script>
11+
<script src="https://cdn.jsdelivr.net/npm/aframe-blink-controls@0.4.3/dist/aframe-blink-controls.min.js"></script>
1212
<script src="../../dist/aframe-physics-system.js"></script>
1313
<script src="../components/force-pushable.js"></script>
1414
<link rel="stylesheet" href="../styles.css">
@@ -32,14 +32,15 @@
3232
raycaster="objects:[force-pushable]"
3333
position="0 0 -0.5"
3434
geometry="primitive: circle; radius: 0.01; segments: 4;"
35-
material="color: #FF4444; shader: flat"></a-entity>
35+
material="color: #FF4444; shader: flat">
36+
</a-entity>
3637
</a-entity>
37-
<a-entity teleport-controls="cameraRig: #cameraRig; button: trigger; type: line"
38+
<a-entity blink-controls="cameraRig: #cameraRig; button: trigger"
3839
ammo-body="type: kinematic"
3940
ammo-shape="type: box; halfExtents: 0.05 0.1 0.1; fit: manual;"
4041
hand-controls="hand: left">
4142
</a-entity>
42-
<a-entity teleport-controls="cameraRig: #cameraRig; button: trigger"
43+
<a-entity blink-controls="cameraRig: #cameraRig; button: trigger"
4344
ammo-body="type: kinematic"
4445
ammo-shape="type: box; halfExtents: 0.05 0.1 0.1; fit: manual;"
4546
hand-controls="hand: right">

‎examples/ammo/materials.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 • Materials AMMO</title>
7-
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
7+
<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>
99
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>

‎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.3.0/aframe.min.js"></script>
7+
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
88
<script src="https://mixedreality.mozilla.org/ammo.js/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.3.0/aframe.min.js"></script>
6+
<script src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
77
<script src="https://mixedreality.mozilla.org/ammo.js/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.3.0/aframe.min.js"></script>
7+
<script type="text/javascript" src="https://aframe.io/releases/1.4.0/aframe.min.js"></script>
88
<script src="https://mixedreality.mozilla.org/ammo.js/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: 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 • Stress Test AMMO</title>
7-
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
7+
<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>
99
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>

‎examples/ammo/sweeper.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 • Sweeper AMMO</title>
7-
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
7+
<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>
99
<script src="https://mixedreality.mozilla.org/ammo.js/builds/ammo.wasm.js"></script>
1010
<script src="../../dist/aframe-physics-system.js"></script>

0 commit comments

Comments
 (0)