Updates to use A-Frame 1.6.0

DougReeder · Aug 7, 2024 · 7c6bdbd · 7c6bdbd
1 parent 9d1dd02
commit 7c6bdbd
Show file tree

Hide file tree

Showing 31 changed files with 86 additions and 238 deletions.
diff --git a/CREDITS.md b/CREDITS.md
@@ -24,8 +24,8 @@ by "7718" (https://sketchfab.com/7718) is licensed under Creative Commons Attrib
 Hermit's Windmill (https://sketchfab.com/models/f7f354caaf50408fa3f3525eec716d7b)
 by "doop" (https://sketchfab.com/doop) is licensed under Creative Commons Attribution
 
-Tower (https://sketchfab.com/3d-models/tower-b08d8f5a40894169b851d269b18ebbbd)
-by "beherca" (https://sketchfab.com/beherca) is licensed under Creative Commons Attribution
+Tower Crane (https://sketchfab.com/3d-models/tower-crane-49851dc7a51b43bda6aea06856c26a85#download)
+by "Chamod1999" (https://sketchfab.com/Chamodp) is licensed under Creative Commons Attribution
 
 konoha tengu (https://sketchfab.com/3d-models/konoha-tengu-low-poly-realtime-character-892bfcdaba3d4a1899214f92ef5e9a63)
 is copyrighted by Manoel Darocha Deoliveira

diff --git a/arches/index.html b/arches/index.html
@@ -5,17 +5,16 @@
     <title>Arches - Elfland Glider</title>
     <meta name="description" content="Collect all the stars">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
-    <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
-    <script src="https://unpkg.com/aframe-environment-component@^1.3.2/dist/aframe-environment-component.min.js"></script>
+    <script src="https://aframe.io/releases/1.6.0/aframe.min.js"></script>
+    <script src="https://unpkg.com/aframe-environment-component@^1.3.7/dist/aframe-environment-component.min.js"></script>
     <script src="https://unpkg.com/aframe-button-controls@^1.1.0/aframe-button-controls.js"></script>
-    <script src="https://unpkg.com/aframe-state-component@^4.7.0/dist/aframe-state-component.min.js"></script>
-    <script src="https://unpkg.com/aframe-dial@^1.2.1/dist/dial.js"></script>
-    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.0/dist/aframe-aabb-collider-component.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@6bebc86ee57f2ccc57637db442f1a36d31f5f61d/dist/aframe-glow-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-state-component@^7.1.1/dist/aframe-state-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-dial@^1.2.2/dist/dial.js"></script>
+    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.2/dist/aframe-aabb-collider-component.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@modernize/dist/aframe-glow-component.min.js"></script>
     <link href="https://fonts.googleapis.com/css?family=Niconne" rel="stylesheet">
     <script src="../dist/arches.js">
     </script>
-    <meta name="monetization" content="$ilp.uphold.com/jU9WUDJZNgQi">
 </head>
 <body>
 <a-scene arches>

diff --git a/assets/tower/source/tower.gltf b/assets/tower/source/tower.gltf
diff --git a/assets/tower/textures/stage_tower@512_0.jpeg b/assets/tower/textures/stage_tower@512_0.jpeg
diff --git a/canyon/index.html b/canyon/index.html
@@ -17,19 +17,18 @@
     <meta name="twitter:card" content="summary_large_image" />
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
-    <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.6.0/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-button-controls@^1.1.0/aframe-button-controls.js"></script>
-    <script src="https://unpkg.com/aframe-state-component@^4.7.0/dist/aframe-state-component.min.js"></script>
-    <script src="https://unpkg.com/aframe-dial@^1.2.1/dist/dial.js"></script>
+    <script src="https://unpkg.com/aframe-state-component@^7.1.1/dist/aframe-state-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-dial@^1.2.2/dist/dial.js"></script>
     <script src="https://unpkg.com/aframe-simple-sun-sky@^1.2.3/simple-sun-sky.js"></script>
     <script src="https://unpkg.com/aframe-dust-component@^1.1.0/aframe-dust-component.js"></script>
-    <script src="https://unpkg.com/aframe-aabb-collider-component@^2.2.1/dist/aframe-aabb-collider-component.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@6bebc86ee57f2ccc57637db442f1a36d31f5f61d/dist/aframe-glow-component.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/gh/donmccurdy/aframe-extras@v6.1.1/dist/aframe-extras.loaders.min.js"></script>
+    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.2/dist/aframe-aabb-collider-component.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@modernize/dist/aframe-glow-component.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/c-frame/aframe-extras@7.5.0/dist/aframe-extras.loaders.min.js"></script>
     <link href="https://fonts.googleapis.com/css?family=Niconne" rel="stylesheet">
     <!--<script src="https://unpkg.com/aframe-fps-counter-component/dist/aframe-fps-counter-component.min.js"></script>-->
     <script src="../dist/canyon.js" type="application/javascript"></script>
-    <meta name="monetization" content="$ilp.uphold.com/jU9WUDJZNgQi">
 </head>
 <body>
 <a-scene canyon background="color:#398bc5">
@@ -59,7 +58,7 @@
               material="shader:canyon; src:#rock" class="landscape"></a-entity>
 
 
-    <a-dust num-points="512" dispersion="33" color="#101010"></a-dust>
+    <a-dust num-points="512" dispersion="50" color="#101010"></a-dust>
 
     <a-entity class="powerup" position="2 -185 256" material="visible: false"
               geometry="primitive:triangle; vertexA:-1.5 -1.5 -1.5; vertexB:1.5 -1.5 1.5; vertexC:1.5 1.5 -1.5">

diff --git a/city/city.js b/city/city.js
@@ -1,5 +1,5 @@
 // city.js - a domed arctic city, for Elfland Glider
-// Copyright © 2019-2023 P. Douglas Reeder; Licensed under the GNU GPL-3.0
+// Copyright © 2019–2024 P. Douglas Reeder; Licensed under the GNU GPL-3.0
 
 import {isDesktop, setEnvironmentalSound} from "../src/elfland-utils";
 import '../src/state.js'
@@ -172,10 +172,9 @@ AFRAME.registerComponent('city', {
         if (isDesktop()) {
             // This decoration does not need to be pre-loaded via the asset mgr
             let towerEl = document.createElement('a-gltf-model');
-            towerEl.setAttribute('src', '../assets/tower/source/tower.gltf');
-            towerEl.setAttribute('position', '0 -3 0');
-            towerEl.setAttribute('rotation', '0 -135 0');
-            towerEl.setAttribute('scale', '15 15 15');
+            towerEl.setAttribute('src', './tower_crane.glb');
+            towerEl.setAttribute('position', '44 0 52');
+            towerEl.setAttribute('scale', '2 2 2');
             towerEl.classList.add('landscape');
             sceneEl.appendChild(towerEl);
         }

diff --git a/city/index.html b/city/index.html
@@ -17,21 +17,20 @@
     <meta name="twitter:card" content="summary_large_image" />
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
-    <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.6.0/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-button-controls@^1.1.0/aframe-button-controls.js"></script>
-    <script src="https://unpkg.com/aframe-state-component@^4.7.0/dist/aframe-state-component.min.js"></script>
-    <script src="https://unpkg.com/aframe-dial@^1.2.1/dist/dial.js"></script>
+    <script src="https://unpkg.com/aframe-state-component@^7.1.1/dist/aframe-state-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-dial@^1.2.2/dist/dial.js"></script>
     <script src="https://unpkg.com/aframe-simple-sun-sky@^1.2.3/simple-sun-sky.js"></script>
     <script src="https://unpkg.com/aframe-dust-component@^1.1.0/aframe-dust-component.js"></script>
-    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.0/dist/aframe-aabb-collider-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.2/dist/aframe-aabb-collider-component.min.js"></script>
 
-    <script src="https://unpkg.com/aframe-shader-buildings@^2.0.0/dist/main.js"></script>
-    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@6bebc86ee57f2ccc57637db442f1a36d31f5f61d/dist/aframe-glow-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-shader-buildings@^2.0.1/dist/main.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@modernize/dist/aframe-glow-component.min.js"></script>
 
     <link href="https://fonts.googleapis.com/css?family=Niconne" rel="stylesheet">
     <script src="../dist/city.js">
     </script>
-    <meta name="monetization" content="$ilp.uphold.com/jU9WUDJZNgQi">
 </head>
 <body>
 <a-scene city background="color:#398bc5">
@@ -78,7 +77,7 @@
     <a-entity geometry="primitive:triangle; vertexA:-1700 0 1600; vertexB:-1700 0 -5000; vertexC:-5000 0 1600"
               material="shader:settlement; sunPosition:-1 0.75 1" class="landscape"></a-entity>
 
-    <a-dust num-points="512" dispersion="50" color="gray"></a-dust>
+    <a-dust num-points="512" dispersion="75" color="gray"></a-dust>
 
 
     <a-entity id="armature" geometry="primitive: box; width: 2; height: 2; depth: 2" material="visible:false"

diff --git a/city/tower_crane.glb b/city/tower_crane.glb
diff --git a/dist/arches.js b/dist/arches.js
diff --git a/dist/arches.js.map b/dist/arches.js.map
diff --git a/dist/canyon.js b/dist/canyon.js
diff --git a/dist/canyon.js.map b/dist/canyon.js.map
diff --git a/dist/city.js b/dist/city.js
diff --git a/dist/city.js.map b/dist/city.js.map
diff --git a/dist/ginnungagap.js b/dist/ginnungagap.js
diff --git a/dist/ginnungagap.js.map b/dist/ginnungagap.js.map
diff --git a/dist/island.js b/dist/island.js
diff --git a/dist/island.js.map b/dist/island.js.map
diff --git a/dist/tutorial.js b/dist/tutorial.js
diff --git a/dist/tutorial.js.map b/dist/tutorial.js.map
diff --git a/dist/yggdrasil.js b/dist/yggdrasil.js
diff --git a/dist/yggdrasil.js.map b/dist/yggdrasil.js.map
diff --git a/ginnungagap/index.html b/ginnungagap/index.html
@@ -5,15 +5,13 @@
     <title>Ginnungagap - Elfland Glider</title>
     <meta name="description" content="Reflect on the choices that led you here">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
-    <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.6.0/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-button-controls@^1.1.0/aframe-button-controls.js"></script>
-    <script src="https://unpkg.com/aframe-state-component@^4.7.0/dist/aframe-state-component.min.js"></script>
-    <script src="https://unpkg.com/aframe-dial@^1.2.1/dist/dial.js"></script>
-    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.0/dist/aframe-aabb-collider-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-state-component@^7.1.1/dist/aframe-state-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-dial@^1.2.2/dist/dial.js"></script>
+    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.2/dist/aframe-aabb-collider-component.min.js"></script>
 
-    <script src="https://unpkg.com/aframe-particle-system-component@^1.1.3/dist/aframe-particle-system-component.min.js"></script>
-    <script src="../dist/ginnungagap.js"></script>
-    <meta name="monetization" content="$ilp.uphold.com/jU9WUDJZNgQi">
+    <script src="https://cdn.jsdelivr.net/gh/c-frame/[email protected]/dist/aframe-particle-system-component.min.js"></script>    <script src="../dist/ginnungagap.js"></script>
 </head>
 <body>
 <a-scene background="color:#616279" ginnungagap pool__clouds="mixin:cloud; size:250; dynamic:true"

diff --git a/island/aframe-island-component.js b/island/aframe-island-component.js
@@ -1,5 +1,5 @@
 // aframe-island-component.js - island terrain for Elfland Glider
-// Copyright © 2018-2019 P. Douglas Reeder; Licensed under the GNU GPL-3.0
+// Copyright © 2018–2024 P. Douglas Reeder; Licensed under the GNU GPL-3.0
 
 import ImprovedNoise from "../src/ImprovedNoise.js"
 
@@ -74,7 +74,7 @@ AFRAME.registerComponent('island', {
         texture.wrapT = THREE.ClampToEdgeWrapping;
 
         // Create geometry.
-        var geometry = new THREE.PlaneBufferGeometry(1000, 1000, worldWidth - 1, worldDepth - 1);
+        var geometry = new THREE.PlaneGeometry(1000, 1000, worldWidth - 1, worldDepth - 1);
         geometry.rotateX(-Math.PI / 2);
         var vertices = geometry.attributes.position.array;
         for (var i = 0, j = 0, l = vertices.length; i < l; i++, j += 3) {

diff --git a/island/index.html b/island/index.html
@@ -17,20 +17,19 @@
     <meta name="twitter:card" content="summary_large_image" />
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
-    <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.6.0/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-button-controls@^1.1.0/aframe-button-controls.js"></script>
-    <script src="https://unpkg.com/aframe-state-component@^4.7.0/dist/aframe-state-component.js"></script>
-    <script src="https://unpkg.com/aframe-dial@^1.2.1/dist/dial.js"></script>
+    <script src="https://unpkg.com/aframe-state-component@^7.1.1/dist/aframe-state-component.js"></script>
+    <script src="https://unpkg.com/aframe-dial@^1.2.2/dist/dial.js"></script>
     <script src="https://unpkg.com/aframe-simple-sun-sky@^1.2.3/simple-sun-sky.js"></script>
     <script src="https://unpkg.com/aframe-dust-component@^1.1.0/aframe-dust-component.js"></script>
-    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.0/dist/aframe-aabb-collider-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.2/dist/aframe-aabb-collider-component.min.js"></script>
 
-    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@6bebc86ee57f2ccc57637db442f1a36d31f5f61d/dist/aframe-glow-component.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/DougReeder/aframe-glow@moderize/dist/aframe-glow-component.min.js"></script>
     <link href="https://fonts.googleapis.com/css?family=Niconne" rel="stylesheet">
     <script src="../dist/island.js"></script>
 
     <!--<script src="https://unpkg.com/aframe-fps-counter-component/dist/aframe-fps-counter-component.min.js"></script>-->
-    <meta name="monetization" content="$ilp.uphold.com/jU9WUDJZNgQi">
 </head>
 <body>
 <a-scene island-world background="color:#398bc5">
@@ -56,7 +55,7 @@
     <a-entity geometry="primitive:triangle; vertexA:-500 0 500; vertexB:-500 0 -7483; vertexC:-7483 0 500"
             material="shader: flat; color:#006994;" class="landscape"></a-entity>
 
-    <a-dust num-points="512" dispersion="50" color="#f0c"></a-dust>
+    <a-dust num-points="512" dispersion="75" color="#f0c"></a-dust>
 
     <a-entity id="nextQuestPortal" position="0 15 -500" scale="5 5 0"
               link="href:../canyon; title: Canyon; image:../canyon/screenshot.png; on:hitstart; visualAspectEnabled:true"

diff --git a/jasmine/aframe-stub.js b/jasmine/aframe-stub.js
@@ -1,5 +1,5 @@
 // aframe-stub.js - allows testing app code that uses A-Frame
-// Copyright © 2017-2023 P. Douglas Reeder; Licensed under the GNU GPL-3.0
+// Copyright © 2017–2024 P. Douglas Reeder; Licensed under the GNU GPL-3.0
 
 var elementParam = {};   // keyed by name
 
@@ -80,15 +80,15 @@ var THREE = {
     PlaneGeometry: function () {
         this.attributes = {position: {array: []}};
     },
-    PlaneBufferGeometry: function () {
+    BufferGeometry: function () {
         this.attributes = {position: {array: []}};
     },
     MeshBasicMaterial: function () {},
     Mesh: function () {}
 };
 THREE.Vector3.prototype.normalize = function () {};
 THREE.Vector3.prototype.dot = function (other) {return this;};
-THREE.PlaneBufferGeometry.prototype.rotateX = function () {};
+THREE.PlaneGeometry.prototype.rotateX = function () {};
 
 class MockElement {
     constructor(attributes) {

diff --git a/src/elfland-utils.js b/src/elfland-utils.js
@@ -1,5 +1,5 @@
 // elfland-utils.js - common functions for Elfland Glider
-// Copyright © 2018-2019 P. Douglas Reeder; Licensed under the GNU GPL-3.0
+// Copyright © 2018-2024 P. Douglas Reeder; Licensed under the GNU GPL-3.0
 
 
 function goFullscreenLandscape() {
@@ -120,19 +120,4 @@ document.addEventListener('visibilitychange', () => {
 }, false);
 
 
-/** Web Monetization */
-if (document.monetization)  {
-    function handleMonetizationStart(evt) {
-        console.log("monetization started:", evt);
-    }
-    document.monetization.addEventListener('monetizationstart', handleMonetizationStart);
-
-    function handleMonetizationStop(evt) {
-        console.log("monetization stopped:", evt);
-    }
-    document.monetization.addEventListener('monetizationstop', handleMonetizationStop);
-} else {
-    console.log("no monetization API");
-}
-
 export {goFullscreenLandscape, isDesktop, isMagicWindow, calcPosChange, placeholderTexture, setEnvironmentalSound, pokeEnvironmentalSound};
diff --git a/tutorial/index.html b/tutorial/index.html
@@ -5,16 +5,15 @@
     <title>Tutorial - Elfland Glider</title>
     <meta name="description" content="Learn to fly!">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/howler/2.2.3/howler.core.min.js"></script>
-    <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.6.0/aframe.min.js"></script>
     <script src="https://unpkg.com/aframe-button-controls@^1.1.0/aframe-button-controls.js"></script>
-    <script src="https://unpkg.com/aframe-state-component@^4.7.0/dist/aframe-state-component.min.js"></script>
-    <script src="https://unpkg.com/aframe-dial@^1.2.1/dist/dial.js"></script>
+    <script src="https://unpkg.com/aframe-state-component@^7.1.1/dist/aframe-state-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-dial@^1.2.2/dist/dial.js"></script>
     <script src="https://unpkg.com/aframe-simple-sun-sky@^1.2.3/simple-sun-sky.js"></script>
-    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.0/dist/aframe-aabb-collider-component.min.js"></script>
+    <script src="https://unpkg.com/aframe-aabb-collider-component@^3.2.2/dist/aframe-aabb-collider-component.min.js"></script>
     <link href="https://fonts.googleapis.com/css?family=Niconne" rel="stylesheet">
 
     <script src="../dist/tutorial.js"></script>
-    <meta name="monetization" content="$ilp.uphold.com/jU9WUDJZNgQi">
 
     <!--<script src="https://unpkg.com/aframe-fps-counter-component/dist/aframe-fps-counter-component.min.js"></script>-->
 </head>

diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js
@@ -1,5 +1,5 @@
 // tutorial.js - Learn to fly, in Elfland Glider
-// Copyright © 2019 P. Douglas Reeder; Licensed under the GNU GPL-3.0
+// Copyright © 2019, 2024 P. Douglas Reeder; Licensed under the GNU GPL-3.0
 
 import {isDesktop} from "../src/elfland-utils";
 import '../src/state.js'
@@ -9,8 +9,7 @@ import '../src/intro.js'
 AFRAME.registerComponent('tutorial', {
     init: function () {
         let sceneEl = this.el;
-        sceneEl.emit('setState', {gliderPositionStart: {x: 0, y: 501, z: 0}});
-        sceneEl.emit('setState', {gliderPosition: {x: 0, y: 501, z: 0}});
+        sceneEl.emit('setState', {gliderPositionStart: {x: 0, y: 501, z: 0}, gliderPosition: {x: 0, y: 501, z: 0}});
 
         for (let x = -2000; x <= 2000; x += 500) {
             for (let z = -2000; z <= 2000; z += 500) {