merged with master

Inncee81 · Aug 27, 2020 · fa97a4e · fa97a4e
1 parent c37d8bf
commit fa97a4e
Show file tree

Hide file tree

Showing 89 changed files with 246,480 additions and 192 deletions.
diff --git a/aframe b/aframe
diff --git a/icons.css b/icons.css
@@ -0,0 +1,43 @@
+#iconsDiv {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    position: absolute;
+    top: 50px;
+    right: 50px;
+}
+
+.arena-icon-button {
+    background: rgba(0, 0, 0, 0.20) 50% 50% no-repeat;
+    background-size: 90% 90%;
+    border: 0;
+    margin-bottom: 10px;
+    border-radius: 10px;
+    cursor: pointer;
+    min-width: 55px;
+    min-height: 55px;
+    padding-right: 0;
+    padding-top: 0;
+    transition: background-color .25s ease;
+    -webkit-transition: background-color .25s ease;
+    z-index: 9999;
+    border-radius: 10px;
+    touch-action: manipulation; /* Prevent iOS double tap zoom on the button */
+    opacity: 0;
+
+    animation: fadein 0.5s;
+    -moz-animation: fadein 0.5s; /* Firefox */
+    -webkit-animation: fadein 0.5s; /* Safari and Chrome */
+    -o-animation: fadein 0.5s; /* Opera */
+    animation-fill-mode: forwards;
+}
+
+.arena-icon-button:active,
+.arena-icon-button:hover {
+    background-color: #ef2d5e;
+}
+
+@keyframes fadein {
+    0% { opacity: 0; }
+    100% { opacity: 1; }
+}
diff --git a/icons.js b/icons.js
@@ -0,0 +1,107 @@
+window.mobileOrTablet = function() {
+    let check = false;
+    (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
+    return check;
+};
+
+const ICON_BTN_CLASS = 'arena-icon-button';
+function createIconButton(img, onClick) {
+    var iconButton;
+    var wrapper;
+
+    // Create elements.
+    wrapper = document.createElement('div');
+    iconButton = document.createElement('button');
+    iconButton.style.backgroundImage = `url('images/icons/${img}.png')`;
+    iconButton.className = ICON_BTN_CLASS;
+
+    // Insert elements.
+    wrapper.appendChild(iconButton);
+    iconButton.addEventListener('click', function (evt) {
+        onClick();
+        evt.stopPropagation();
+    });
+
+    return wrapper;
+}
+
+function publishAvatarMsg(avatarOn) {
+    publish("realm/s/" + globals.scenenameParam + "/camera_" + globals.idTag + "/face/avatarStatus", {"object_id":"face_"+globals.idTag,"avatar":avatarOn});
+}
+
+function setupIcons() {
+    const audioBtn = createIconButton("roundedaudio", () => {
+        audioBtn.not_toggled = !audioBtn.not_toggled;
+        if (jitsiAudioTrack) {
+            if (!audioBtn.not_toggled) {
+                audioBtn.childNodes[0].style.backgroundImage = "url('images/icons/roundedaudio.png')";
+                jitsiAudioTrack.unmute();
+            }
+            else {
+                audioBtn.childNodes[0].style.backgroundImage = "url('images/icons/slashroundedaudio.png')";
+                jitsiAudioTrack.mute();
+            }
+        }
+    });
+
+    const videoBtn = createIconButton("roundedvideo", () => {
+        videoBtn.not_toggled = !videoBtn.not_toggled;
+        if (jitsiVideoTrack) {
+            if (!videoBtn.not_toggled) { // toggled
+                videoBtn.childNodes[0].style.backgroundImage = "url('images/icons/roundedvideo.png')";
+                avatarBtn.childNodes[0].style.backgroundImage = "url('images/icons/slashroundedavatar.png')";
+                jitsiVideoTrack.unmute();
+                avatarBtn.toggled = false;
+                globals.sceneObjects["arena-vid-plane"].setAttribute("visible", "true");
+                window.trackFaceOff();
+                publishAvatarMsg(false);
+            }
+            else {
+                videoBtn.childNodes[0].style.backgroundImage = "url('images/icons/slashroundedvideo.png')";
+                jitsiVideoTrack.mute();
+                globals.sceneObjects["arena-vid-plane"].setAttribute("visible", "false");
+            }
+        }
+    });
+
+    const avatarBtn = createIconButton("slashroundedavatar", () => {
+        if (window.mobileOrTablet()) return;
+        avatarBtn.toggled = !avatarBtn.toggled;
+        if (avatarBtn.toggled) { // toggled
+            avatarBtn.childNodes[0].style.backgroundImage = "url('images/icons/roundedavatar.png')";
+            videoBtn.childNodes[0].style.backgroundImage = "url('images/icons/slashroundedvideo.png')";
+            jitsiVideoTrack.mute();
+            videoBtn.not_toggled = true;
+            globals.sceneObjects["arena-vid-plane"].setAttribute("visible", "false");
+            window.trackFaceOn();
+            publishAvatarMsg(true);
+        }
+        else {
+            avatarBtn.childNodes[0].style.backgroundImage = "url('images/icons/slashroundedavatar.png')";
+            window.trackFaceOff();
+            publishAvatarMsg(false);
+        }
+    });
+
+    const settingsBtn = createIconButton("roundedsettings", () => {
+      // settingsBtn.not_toggled = !settingsBtn.not_toggled;
+      // if (!settingsBtn.not_toggled) { // toggled
+      //   settingsBtn.childNodes[0].style.backgroundImage = "url('images/icons/roundedsettings.png')";
+      // }
+      // else {
+      //   settingsBtn.childNodes[0].style.backgroundImage = "url('images/icons/slashroundedsettings.png')";
+      // }
+    });
+
+    var iconsDiv = document.getElementById('iconsDiv');
+    iconsDiv.appendChild(audioBtn);
+    iconsDiv.appendChild(videoBtn);
+    iconsDiv.appendChild(avatarBtn);
+    iconsDiv.appendChild(settingsBtn);
+}
+
+AFRAME.registerComponent('iconsinit', {
+    init: function () {
+        setupIcons();
+    }
+});
diff --git a/images/.Trash-1000/files/west (copy).tga b/images/.Trash-1000/files/west (copy).tga
diff --git a/images/.Trash-1000/info/west (copy).tga.trashinfo b/images/.Trash-1000/info/west (copy).tga.trashinfo
@@ -0,0 +1,3 @@
+[Trash Info]
+Path=west%20%28copy%29.tga
+DeletionDate=2020-07-04T18:43:05
diff --git a/images/256-face-black.png b/images/256-face-black.png
diff --git a/images/DudeFace.png b/images/DudeFace.png
diff --git a/images/Frontera_AAAAAAAAAAAAAAAAAAAAAABkAGQAAABF.tga b/images/Frontera_AAAAAAAAAAAAAAAAAAAAAABkAGQAAABF.tga
diff --git a/images/WaterBump.jpg b/images/WaterBump.jpg
diff --git a/images/camOFF.png b/images/camOFF.png
diff --git a/images/camON.png b/images/camON.png
diff --git a/images/cemetery.jpg b/images/cemetery.jpg
diff --git a/images/conix-face-white-small.jpg b/images/conix-face-white-small.jpg
diff --git a/images/conix-face.white.jpg b/images/conix-face.white.jpg
diff --git a/images/dartmoor.mp4 b/images/dartmoor.mp4
diff --git a/images/dice/side1.png b/images/dice/side1.png
diff --git a/images/dice/side2.png b/images/dice/side2.png
diff --git a/images/dice/side3.png b/images/dice/side3.png
diff --git a/images/dice/side4.png b/images/dice/side4.png
diff --git a/images/dice/side5.png b/images/dice/side5.png
diff --git a/images/dice/side6.png b/images/dice/side6.png
diff --git a/images/env.png b/images/env.png
diff --git a/images/f0070229-coronavirus_artwork-spl.jpg b/images/f0070229-coronavirus_artwork-spl.jpg
diff --git a/images/grid.png b/images/grid.png
diff --git a/images/home.png b/images/home.png
diff --git a/images/icons/backup/roundedaudio.png b/images/icons/backup/roundedaudio.png
diff --git a/images/icons/backup/roundedavatar.png b/images/icons/backup/roundedavatar.png
diff --git a/images/icons/backup/roundedsettings.png b/images/icons/backup/roundedsettings.png
diff --git a/images/icons/backup/roundedvideo.png b/images/icons/backup/roundedvideo.png
diff --git a/images/icons/backup/slashroundedaudio.png b/images/icons/backup/slashroundedaudio.png
diff --git a/images/icons/backup/slashroundedavatar.png b/images/icons/backup/slashroundedavatar.png
diff --git a/images/icons/backup/slashroundedsettings.png b/images/icons/backup/slashroundedsettings.png
diff --git a/images/icons/backup/slashroundedvideo.png b/images/icons/backup/slashroundedvideo.png
diff --git a/images/icons/roundedaudio.png b/images/icons/roundedaudio.png
diff --git a/images/icons/roundedavatar.png b/images/icons/roundedavatar.png
diff --git a/images/icons/roundedsettings.png b/images/icons/roundedsettings.png
diff --git a/images/icons/roundedvideo.png b/images/icons/roundedvideo.png
diff --git a/images/icons/slashroundedaudio.png b/images/icons/slashroundedaudio.png
diff --git a/images/icons/slashroundedavatar.png b/images/icons/slashroundedavatar.png
diff --git a/images/icons/slashroundedsettings.png b/images/icons/slashroundedsettings.png
diff --git a/images/icons/slashroundedvideo.png b/images/icons/slashroundedvideo.png
diff --git a/images/innuintendo.mp4 b/images/innuintendo.mp4
diff --git a/images/micOFF.png b/images/micOFF.png
diff --git a/images/micON.png b/images/micON.png
diff --git a/images/scanhenge-old.png b/images/scanhenge-old.png
diff --git a/images/sound.flac b/images/sound.flac
diff --git a/images/sound.mp3 b/images/sound.mp3
diff --git a/images/testcam.mp4 b/images/testcam.mp4