From 3894b76f6b6510565a230c811464dae23be272da Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Wed, 7 Mar 2018 18:09:21 -0800
Subject: [PATCH] Rename app mode components for clarity/consistency
---
src/room.html | 18 +++++++++---------
src/systems/app-mode.js | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/room.html b/src/room.html
index bf6fab197..2ca654b66 100644
--- a/src/room.html
+++ b/src/room.html
@@ -28,7 +28,7 @@
cursor="rayOrigin: mouse;"
2d-hud
- mode-responder-input-mappings="modes: default, hud; actionSets: default, hud;"
+ app-mode-input-mappings="modes: default, hud; actionSets: default, hud;"
vr-mode-toggle-playing__raycaster="invert: true;"
vr-mode-toggle-playing__cursor="invert: true;"
vr-mode-toggle-playing__2d-hud="invert: true;"
@@ -108,10 +108,10 @@
character-controller="pivot: #player-camera"
ik-root
- mode-responder-toggle__character-controller="mode: hud; invert: true;"
- mode-responder-toggle__wasd-to-analog2d="mode: hud; invert: true;"
+ app-mode-toggle-playing__character-controller="mode: hud; invert: true;"
+ app-mode-toggle-playing__wasd-to-analog2d="mode: hud; invert: true;"
>
- <a-entity id="player-hud" vr-mode-toggle-visibility="showInVR: true;">
+ <a-entity id="player-hud" vr-mode-toggle-visibility>
<a-entity in-world-hud rotation="-39.01000608674482 0 0">
<a-box geometry="height:0.13;width:0.6;depth:0.001" material="depthTest:false; color:#000000;opacity:0.35" class="hud bg"></a-box>
<a-image src="#unmuted" scale="-0.1 0.1 0.1" position="-0.2 0 0.001" class="hud mic" material="alphaTest:0.1;depthTest:false;" geometry=""></a-image>
@@ -139,7 +139,7 @@
hand-controls2="left"
tracked-controls
teleport-controls="cameraRig: #player-rig; teleportOrigin: #player-camera; button: action_teleport_"
- mode-responder-toggle__teleport-controls="mode: hud; invert: true;"
+ app-mode-toggle-playing__teleport-controls="mode: hud; invert: true;"
haptic-feedback
></a-entity>
@@ -153,10 +153,10 @@
raycaster="objects:.hud; showLine: true;"
cursor="fuse: false; downEvents: action_ui_select_down; upEvents: action_ui_select_up;"
- mode-responder-toggle__teleport-controls="mode: hud; invert: true;"
- mode-responder-toggle__raycaster="mode: hud;"
- mode-responder-toggle__cursor="mode: hud;"
- mode-responder-property-toggle__line="mode: hud; property: visible;"
+ app-mode-toggle-playing__teleport-controls="mode: hud; invert: true;"
+ app-mode-toggle-playing__raycaster="mode: hud;"
+ app-mode-toggle-playing__cursor="mode: hud;"
+ app-mode-toggle-property__line="mode: hud; property: visible;"
></a-entity>
<a-gltf-entity src="#bot-skinned-mesh" inflate="true" ik-controller>
diff --git a/src/systems/app-mode.js b/src/systems/app-mode.js
index 9361c482c..ab117e6e5 100644
--- a/src/systems/app-mode.js
+++ b/src/systems/app-mode.js
@@ -22,7 +22,7 @@ AFRAME.registerSystem("app-mode", {
/**
* Toggle the isPlaying state of a component based on app mode
*/
-AFRAME.registerComponent("mode-responder-toggle", {
+AFRAME.registerComponent("app-mode-toggle-playing", {
multiple: true,
schema: {
mode: { type: "string" },
@@ -46,7 +46,7 @@ AFRAME.registerComponent("mode-responder-toggle", {
/**
* Toggle a boolean property of a component based on app mode
*/
-AFRAME.registerComponent("mode-responder-property-toggle", {
+AFRAME.registerComponent("app-mode-toggle-property", {
multiple: true,
schema: {
mode: { type: "string" },
@@ -71,7 +71,7 @@ AFRAME.registerComponent("mode-responder-property-toggle", {
/**
* Toggle aframe input mappings action set based on app mode
*/
-AFRAME.registerComponent("mode-responder-input-mappings", {
+AFRAME.registerComponent("app-mode-input-mappings", {
schema: {
modes: { default: [] },
actionSets: { default: [] }
--
GitLab