use microverse-library 0.7.20

giulioprisco · May 18, 2024 · bbb950b · bbb950b
1 parent c984440
commit bbb950b
Show file tree

Hide file tree

Showing 2,596 changed files with 38,036 additions and 28,155 deletions.
diff --git a/behaviors/croquet/fullBodyAvatar.js b/behaviors/croquet/fullBodyAvatar.js
@@ -5,7 +5,14 @@
 // The prototype classes ActorBehavior and PawnBehavior provide
 // the features defined at the card object.
 
-import {PawnBehavior} from "../PrototypeBehavior";
+import {ActorBehavior, PawnBehavior} from "../PrototypeBehavior";
+
+class AvatarActor extends ActorBehavior {
+    nicknameOffset() {
+        console.log("nicknameOffset");
+        return [0, 0.5, 0];
+    }
+}
 
 class AvatarPawn extends PawnBehavior {
     setup() {
@@ -246,6 +253,7 @@ export default {
     modules: [
         {
             name: "FullBodyAvatarEventHandler",
+            actorBehaviors: [AvatarActor],
             pawnBehaviors: [AvatarPawn],
         }
     ]

diff --git a/behaviors/default/blowing.js b/behaviors/default/blowing.js
@@ -83,6 +83,7 @@ class BlowingPawn extends PawnBehavior {
             this.object.traverse( c =>{
                 if(c.geometry){
                     let shader = c.material.userData.shader;
+                    if (!shader) {return;}
                     shader.uniforms.time.value = 0.001*t;
                 }
             })

diff --git a/index.html b/index.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
   <title>Microverse</title>
   <link id="microverse-css" rel="stylesheet" href="./assets/css/microverse.css" />
-<script defer src="lib/index-944c638d.js"></script></head>
+<script defer src="lib/index-e1c53361.js"></script></head>
 
 <body class="no-select">
 </body>

diff --git a/lib/index-944c638d.js → lib/index-e1c53361.js b/lib/index-944c638d.js → lib/index-e1c53361.js
@@ -11191,7 +11191,7 @@ class AvatarActor extends (0,_worldcore__WEBPACK_IMPORTED_MODULE_0__.mix)(_card_
     }
 
     setAvatarData(options) {
-        // console.log("setAvatarData", options);
+        console.log("setAvatarData", options);
         this.setupAvatarBehavior(options);
         this.updateOptions(options);
         this.ensureNicknameCard();
@@ -11537,10 +11537,13 @@ class AvatarPawn extends (0,_worldcore__WEBPACK_IMPORTED_MODULE_0__.mix)(_card_j
                 actorSpec = dormantAvatarSpec;
                 actorSpec.anchor = anchor;
                 actorSpec.inWorld = true;
-                dormantAvatarSpec = null;
                 avatarSpec = actorSpec.cardData;
                 avatarName = actorSpec.name;
+                if (dormantAvatarSpec?.behaviorModules) {
+                    avatarSpec.behaviorModules = [...dormantAvatarSpec.behaviorModules];
+                }
                 avatarSpec.name = avatarName;
+                dormantAvatarSpec = null;
             } else {
                 actorSpec = { inWorld };
                 const anchor = this.anchorFromURL(window.location, !this.isPrimary);

diff --git a/meta/version.txt b/meta/version.txt
@@ -1 +1 @@
-commit: 945f4c2c3d40b7446cab795694e50a14c1d108e8 Date: Thu Mar 28 18:07:10 2024 -0700
+commit: f5c02231e63d8c5a76ecce18e0a7391c1bc2fdd3 Date: Fri May 17 16:56:54 2024 -0700
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		commit: 945f4c2c3d40b7446cab795694e50a14c1d108e8 Date: Thu Mar 28 18:07:10 2024 -0700
		commit: f5c02231e63d8c5a76ecce18e0a7391c1bc2fdd3 Date: Fri May 17 16:56:54 2024 -0700