Skip to content

Commit

Permalink
Merge pull request #31 from diarmidmackenzie/Update-examples-to-1.4.1
Browse files Browse the repository at this point in the history
Update examples to 1.4.2
  • Loading branch information
diarmidmackenzie committed Aug 12, 2023
2 parents 2aa66ce + 8751a6f commit 3c1ce5f
Show file tree
Hide file tree
Showing 63 changed files with 69 additions and 2,142 deletions.
4 changes: 2 additions & 2 deletions examples/animated-spheres/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/donmccurdy/aframe-extras@v6.1.1/dist/aframe-extras.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-extras@c5c5dcf/dist/aframe-extras.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/diarmidmackenzie/aframe-multi-camera@latest/src/mirror.min.js"></script>
<script src="../../src/instanced-mesh.js"></script>
<script src="./spheres.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/coloring-blocks/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/diarmidmackenzie/aframe-examples@latest/components/mouse-manipulation.min.js"></script>
<script src="../../src/instanced-mesh.js"></script>
<script src="./framed-block.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/gltf-models/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="../../src/instanced-mesh.js"></script>
<script src="./vehicles.js"></script>
<link rel="stylesheet" href="../styles.css">
Expand Down
2 changes: 1 addition & 1 deletion examples/templating/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/nunjucks/2.3.0/nunjucks.min.js"></script>
<script src="https://unpkg.com/aframe-template-component@^3.1.1/dist/aframe-template-component.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/diarmidmackenzie/aframe-examples@latest/components/mouse-manipulation.min.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions tests/3d-models-multi-mesh.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/donmccurdy/aframe-extras@v6.1.1/dist/aframe-extras.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-extras@c5c5dcf/dist/aframe-extras.min.js"></script>
<script src="../src/instanced-mesh.js"></script>
</head>
<body>
<a-scene stats renderer="colorManagement:true">
<a-asset-item id="cell"
src="./assets/animal-cell/scene.gltf"
src="./assets/animal-cell/scene.glb"
response-type="arraybuffer" crossorigin="anonymous">
</a-asset-item>

Expand Down
4 changes: 2 additions & 2 deletions tests/3d-models.htm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/donmccurdy/aframe-extras@v6.1.1/dist/aframe-extras.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-extras@c5c5dcf/dist/aframe-extras.min.js"></script>
<script src="../src/instanced-mesh.js"></script>
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions tests/add-remove-high-scale.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<!-- Add /remove blocks at high scale.
10k blocks in total
Add/remove 100 at a time.-->
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/donmccurdy/aframe-extras@v6.1.1/dist/aframe-extras.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-extras@c5c5dcf/dist/aframe-extras.min.js"></script>
<script src="../src/instanced-mesh.js"></script>
<script src="./framed-block.js"></script>
<script>
Expand Down
6 changes: 3 additions & 3 deletions tests/add-remove-multi-mesh.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/donmccurdy/aframe-extras@v6.1.1/dist/aframe-extras.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-extras@c5c5dcf/dist/aframe-extras.min.js"></script>
<script src="../src/instanced-mesh.js"></script>
<script src="./framed-block.js"></script>
<script>
Expand Down Expand Up @@ -100,7 +100,7 @@
<a-scene stats renderer="colorManagement:true">

<a-asset-item id="cell"
src="./assets/animal-cell/scene.gltf"
src="./assets/animal-cell/scene.glb"
response-type="arraybuffer" crossorigin="anonymous">
</a-asset-item>

Expand Down
4 changes: 2 additions & 2 deletions tests/add-remove.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<head>
<script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/donmccurdy/aframe-extras@v6.1.1/dist/aframe-extras.min.js"></script>
<script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-extras@c5c5dcf/dist/aframe-extras.min.js"></script>
<script src="../src/instanced-mesh.js"></script>
<script src="./framed-block.js"></script>
<script>
Expand Down
Binary file removed tests/assets/animal-cell/scene.bin
Binary file not shown.
Binary file added tests/assets/animal-cell/scene.glb
Binary file not shown.

0 comments on commit 3c1ce5f

Please sign in to comment.