From 2fd5049736702a18b2d00413f733bf1ee69b6138 Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Wed, 28 Mar 2018 15:25:15 -0700
Subject: [PATCH] Remove old 2d hud files and git rid of hover effects on non
interactive items
---
src/components/2d-hud.css | 72 --------------------------------
src/components/2d-hud.js | 73 ---------------------------------
src/react-components/2d-hud.css | 8 ----
3 files changed, 153 deletions(-)
delete mode 100644 src/components/2d-hud.css
delete mode 100644 src/components/2d-hud.js
diff --git a/src/components/2d-hud.css b/src/components/2d-hud.css
deleted file mode 100644
index cad8ca3e8..000000000
--- a/src/components/2d-hud.css
+++ /dev/null
@@ -1,72 +0,0 @@
-:local(.container) {
- position: absolute;
- top: 10px;
- display: flex;
- justify-content: center;
- height: 60px;
- width: 100%;
-}
-
-:local(.bg) {
- position: absolute;
- display: flex;
- justify-content: space-around;
- align-items: center;
- padding: 10px;
- background-color: rgba(0, 0, 0, 0.35);
-}
-
-:local(.nametag) {
- display: flex;
- justify-content: center;
- font-size: 32px;
- font-family: sans-serif;
- color: white;
- margin: 0 10px 0 0;
-}
-
-:local(.nametag:hover) {
- color: #00eeee;
-}
-
-:local(.avatar) {
- display: flex;
- width: 48px;
- height: 48px;
- background-size: 100%;
- background-image: url(../assets/hud/avatar.jpg);
-}
-
-:local(.avatar:hover) {
- transform: scaleX(-1);
-}
-
-:local(.mic) {
- display: flex;
- width: 48px;
- height: 48px;
- mask: url(../assets/hud/unmuted.png);
- mask-size: 48px;
- background-color: white;
-}
-
-:local(.mic:hover){
- background-color: cyan;
-}
-
-:local(.mic.muted:hover){
- background-color:cyan;
-}
-
-:local(.mic:active) {
- background-color: red;
-}
-
-:local(.mic.muted) {
- mask: url(../assets/hud/muted.png);
- mask-size: 48px;
-}
-
-:local(.mic.muted:active) {
- background-color: green;
-}
diff --git a/src/components/2d-hud.js b/src/components/2d-hud.js
deleted file mode 100644
index 59877974d..000000000
--- a/src/components/2d-hud.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import styles from "./2d-hud.css";
-import avatarImg from "../assets/hud/avatar.jpg";
-
-AFRAME.registerComponent("2d-hud", {
- schema: {
- mic: { default: "#mic-flat" }
- },
-
- init() {
- this.onUsernameChanged = this.onUsernameChanged.bind(this);
- this.onStateToggled = this.onStateToggled.bind(this);
- this.onMicClick = this.onMicClick.bind(this);
- this.onMicAudio = this.onMicAudio.bind(this);
-
- this.containerEl = document.createElement("div");
- this.containerEl.classList.add(styles.container);
- this.containerEl.innerHTML = `
- <div class="${styles.bg}">
- <div class="${styles.mic}"></div>
- <div class="${styles.nametag}"></div>
- <div class="${styles.avatar}"></div>
- </div>
- `;
-
- this.nametagEl = this.containerEl.querySelector(`.${styles.nametag}`);
- this.micEl = this.containerEl.querySelector(`.${styles.mic}`);
-
- document.body.appendChild(this.containerEl);
- },
-
- play() {
- this.el.sceneEl.addEventListener("username-changed", this.onUsernameChanged);
- this.el.sceneEl.addEventListener("stateadded", this.onStateToggled);
- this.el.sceneEl.addEventListener("stateremoved", this.onStateToggled);
- this.el.sceneEl.addEventListener("micAudio", this.onMicAudio);
- this.micEl.addEventListener("click", this.onMicClick);
- },
-
- pause() {
- this.el.sceneEl.removeEventListener("username-changed", this.onUsernameChanged);
- this.el.sceneEl.removeEventListener("stateadded", this.onStateToggled);
- this.el.sceneEl.removeEventListener("stateremoved", this.onStateToggled);
- this.el.sceneEl.removeEventListener("micAudio", this.onMicAudio);
- this.micEl.removeEventListener("click", this.onMicClick);
- },
-
- remove() {
- this.conntainerEl.parentNode.removeChild(this.containerEl);
- },
-
- onUsernameChanged(evt) {
- this.nametagEl.innerHTML = evt.detail.username;
- },
-
- onMicClick() {
- this.el.emit("action_mute");
- },
-
- onMicAudio(e) {
- const red = 1.0 - e.detail.volume / 10.0;
- this.micEl.style["background-color"] = `rgb(${red * 255},240,240)`;
- },
-
- onStateToggled(e) {
- if (e.detail !== "muted") return;
- this.updateMuteState();
- },
-
- updateMuteState() {
- const muted = this.el.sceneEl.is("muted");
- this.micEl.classList.toggle(styles.muted, muted);
- }
-});
diff --git a/src/react-components/2d-hud.css b/src/react-components/2d-hud.css
index daa9bb3ec..9a6429044 100644
--- a/src/react-components/2d-hud.css
+++ b/src/react-components/2d-hud.css
@@ -25,10 +25,6 @@
margin: 0 10px 0 0;
}
-:local(.nametag:hover) {
- color: #00eeee;
-}
-
:local(.avatar) {
display: flex;
width: 48px;
@@ -37,10 +33,6 @@
background-image: url(../assets/hud/avatar.jpg);
}
-:local(.avatar:hover) {
- transform: scaleX(-1);
-}
-
:local(.mic) {
display: flex;
width: 48px;
--
GitLab