Merge pull request #5907 from mozilla/bitecs-billboard-fix

Bitecs-billboard-fix
Hubs-Foundation · Jan 23, 2023 · d3cdd69 · d3cdd69
2 parents 554f519 + a419352
commit d3cdd69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/bit-systems/billboard.ts b/src/bit-systems/billboard.ts
@@ -5,7 +5,7 @@ import { Billboard } from "../bit-components";
 
 const billboardQuery = defineQuery([Billboard]);
 
-const isMobileVR = AFRAME.utils.device.isMobileVR() || true;
+const isMobileVR = AFRAME.utils.device.isMobileVR();
 
 const targetPos = new Vector3();
 const worldPos = new Vector3();

diff --git a/src/components/name-tag.js b/src/components/name-tag.js
@@ -157,6 +157,7 @@ AFRAME.registerComponent("name-tag", {
 
         this.neck.getWorldPosition(worldPos);
         worldPos.setY(this.nametagElPosY + this.ikRoot.position.y);
+        mat.copy(this.nametag.matrixWorld);
         mat.setPosition(worldPos);
         setMatrixWorld(this.nametag, mat);
       } else {