From 1185eed19824d35e4fee82ef271aae448ec17244 Mon Sep 17 00:00:00 2001
From: Marshall Quander <marshall@quander.me>
Date: Mon, 9 Jul 2018 18:51:52 -0700
Subject: [PATCH] Be parsimonious with personal space entities
---
src/hub.html | 20 +++++++-------------
src/systems/personal-space-bubble.js | 6 +++---
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/hub.html b/src/hub.html
index 3438ab9a0..e188ce44e 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -101,7 +101,7 @@
<a-entity class="model" gltf-model-plus="inflate: true">
<template data-name="RootScene">
- <a-entity ik-controller hand-pose__left hand-pose__right animation-mixer space-invader-mesh="meshSelector: .Bot_Skinned"></a-entity>
+ <a-entity ik-controller hand-pose__left hand-pose__right animation-mixer space-invader-mesh="meshName: Bot_Skinned"></a-entity>
</template>
<template data-name="Neck">
@@ -117,13 +117,12 @@
</template>
<template data-name="Chest">
- <a-entity>
- <a-entity personal-space-invader="radius: 0.2; useMaterial: true;" bone-visibility> </a-entity>
- <a-entity billboard>
- <a-entity mixin="rounded-text-button" block-button visible-while-frozen ui-class-while-frozen position="0 0 .35"> </a-entity>
- <a-entity visible-while-frozen text="value:Block; width:2.5; align:center;" position="0 0 0.36"></a-entity>
- </a-entity>
+ <a-entity personal-space-invader="radius: 0.2; useMaterial: true;" bone-visibility>
+ <a-entity billboard>
+ <a-entity mixin="rounded-text-button" block-button visible-while-frozen ui-class-while-frozen position="0 0 .35"> </a-entity>
+ <a-entity visible-while-frozen text="value:Block; width:2.5; align:center;" position="0 0 0.36"></a-entity>
</a-entity>
+ </a-entity>
</template>
<template data-name="Head">
@@ -143,11 +142,6 @@
</a-entity>
</template>
- <!-- needs to exist for the benefit of the personal space calculator -->
- <template data-name="Bot_Skinned">
- <a-entity></a-entity>
- </template>
-
<template data-name="LeftHand">
<a-entity personal-space-invader="radius: 0.1" bone-visibility></a-entity>
</template>
@@ -404,7 +398,7 @@
<a-entity bone-visibility></a-entity>
</template>
- </a-entity>
+ </a-entity>
</a-entity>
<!-- Environment -->
diff --git a/src/systems/personal-space-bubble.js b/src/systems/personal-space-bubble.js
index 238c0b63f..23da15b83 100644
--- a/src/systems/personal-space-bubble.js
+++ b/src/systems/personal-space-bubble.js
@@ -120,10 +120,10 @@ function createSphereGizmo(radius) {
*/
AFRAME.registerComponent("space-invader-mesh", {
schema: {
- meshSelector: { type: "string" }
+ meshName: { type: "string" }
},
- init() {
- this.targetMesh = this.el.querySelector(this.data.meshSelector).object3DMap.skinnedmesh;
+ update() {
+ this.targetMesh = this.el.object3D.getObjectByName(this.data.meshName);
}
});
--
GitLab