Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback changes

Browse source
This commit is contained in:
RebeccaStankus 2019-08-20 13:29:02 -07:00
parent e48e733343
commit cc22386f06
7 changed files with 9 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -240,7 +240,7 @@ Flickable {
}
}
Connections {
Connections {
target: Camera
onModeUpdated: {

6
scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-a.svg
View file

@ -1,6 +0,0 @@
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" preserveAspectRatio="xMidYMid" viewBox="0 0 63 78.75" version="1.1" x="0px" y="0px"><defs><style>
.cls-3 {
fill: #000000;
}
</style></defs><path style="" d="M 31.160156 0.01171875 C 13.985156 0.01171875 0.013671875 13.987016 0.013671875 31.166016 C 0.013671875 48.344016 13.985156 62.320312 31.160156 62.320312 C 48.334156 62.320312 62.306641 48.344016 62.306641 31.166016 C 62.306641 13.987016 48.334156 0.01171875 31.160156 0.01171875 z M 31.160156 3.0117188 C 46.681156 3.0117188 59.306641 15.642016 59.306641 31.166016 C 59.306641 46.690016 46.681156 59.320312 31.160156 59.320312 C 15.640156 59.320312 3.0136719 46.690016 3.0136719 31.166016 C 3.0136719 15.642016 15.640156 3.0117187 31.160156 3.0117188 z M 21.660156 18.306641 C 19.951281 18.286766 18.248188 18.902203 16.992188 20.158203 C 16.406188 20.744203 16.406188 21.69525 16.992188 22.28125 C 17.578187 22.86725 18.527281 22.86725 19.113281 22.28125 C 20.477281 20.91825 22.826047 20.969625 24.248047 22.390625 C 24.541047 22.683625 24.926547 22.830078 25.310547 22.830078 C 25.693547 22.830078 26.076141 22.683625 26.369141 22.390625 C 26.955141 21.805625 26.955141 20.854531 26.369141 20.269531 C 25.083641 18.983031 23.369031 18.326516 21.660156 18.306641 z M 42.0625 18.306641 C 40.353625 18.286766 38.652484 18.902203 37.396484 20.158203 C 36.811484 20.744203 36.811484 21.69525 37.396484 22.28125 C 37.982484 22.86725 38.932578 22.86725 39.517578 22.28125 C 40.881578 20.91825 43.230344 20.969625 44.652344 22.390625 C 44.945344 22.683625 45.330844 22.830078 45.714844 22.830078 C 46.098844 22.830078 46.480438 22.683625 46.773438 22.390625 C 47.359438 21.805625 47.359437 20.854531 46.773438 20.269531 C 45.487938 18.983031 43.771375 18.326516 42.0625 18.306641 z M 18.857422 34.193359 C 18.029422 34.193359 17.357422 34.865359 17.357422 35.693359 C 17.357422 42.478359 22.758344 47.792969 29.652344 47.792969 L 35.052734 47.792969 C 41.946734 47.792969 47.347656 42.566531 47.347656 35.894531 C 47.347656 35.065531 46.675656 34.394531 45.847656 34.394531 C 45.018656 34.394531 44.347656 35.065531 44.347656 35.894531 C 44.347656 40.883531 40.265734 44.791016 35.052734 44.791016 L 29.652344 44.791016 C 24.439344 44.791016 20.357422 40.795359 20.357422 35.693359 C 20.357422 34.865359 19.685422 34.193359 18.857422 34.193359 z " fill="#000000" fill-rule="evenodd"/><text x="0" y="78" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">Created by Shital Patel</text><text x="0" y="83" fill="#000000" font-size="5px" font-weight="bold" font-family="'Helvetica Neue', Helvetica, Arial-Unicode, Arial, Sans-serif">from the Noun Project</text></svg>
Side by side

Before

Width:  |  Height:  |  Size: 3 KiB

22
scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-i.svg
View file

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="Layer_1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 63 78.8"
style="enable-background:new 0 0 63 78.8;" xml:space="preserve">
<style type="text/css">
.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
.st1{fill:#FFFFFF;}
.st2{font-family:'Arial-BoldMT';}
.st3{font-size:5px;}
</style>
<path class="st0" d="M31.2,0C14,0,0,14,0,31.2c0,17.2,14,31.2,31.1,31.2c17.2,0,31.1-14,31.1-31.2C62.3,14,48.3,0,31.2,0z M31.2,3
c15.5,0,28.1,12.6,28.1,28.2S46.7,59.3,31.2,59.3C15.6,59.3,3,46.7,3,31.2S15.6,3,31.2,3z M21.7,18.3c-1.7,0-3.4,0.6-4.7,1.9
c-0.6,0.6-0.6,1.5,0,2.1s1.5,0.6,2.1,0c1.4-1.4,3.7-1.3,5.1,0.1c0.3,0.3,0.7,0.4,1.1,0.4c0.4,0,0.8-0.1,1.1-0.4
c0.6-0.6,0.6-1.5,0-2.1C25.1,19,23.4,18.3,21.7,18.3z M42.1,18.3c-1.7,0-3.4,0.6-4.7,1.9c-0.6,0.6-0.6,1.5,0,2.1
c0.6,0.6,1.5,0.6,2.1,0c1.4-1.4,3.7-1.3,5.1,0.1c0.3,0.3,0.7,0.4,1.1,0.4s0.8-0.1,1.1-0.4c0.6-0.6,0.6-1.5,0-2.1
C45.5,19,43.8,18.3,42.1,18.3z M18.9,34.2c-0.8,0-1.5,0.7-1.5,1.5c0,6.8,5.4,12.1,12.3,12.1h5.4c6.9,0,12.3-5.2,12.3-11.9
c0-0.8-0.7-1.5-1.5-1.5c-0.8,0-1.5,0.7-1.5,1.5c0,5-4.1,8.9-9.3,8.9h-5.4c-5.2,0-9.3-4-9.3-9.1C20.4,34.9,19.7,34.2,18.9,34.2z"/>
<text transform="matrix(1 0 0 1 0 78)" class="st1 st2 st3">Created by Shital Patel</text>
<text transform="matrix(1 0 0 1 0 83)" class="st1 st2 st3">from the Noun Project</text>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 1.8 KiB

19
scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
View file

@ -15,14 +15,14 @@
// #region dependencies
// Custom module for handling entities
var EntityMaker = Script.require("./resources/modules/entityMaker.js?" + Date.now());
var EntityMaker = Script.require("./resources/modules/entityMaker.js");
// Add nice smoothing functions to the animations
var EasingFunctions = Script.require("./resources/modules/easing.js?");
var EasingFunctions = Script.require("./resources/modules/easing.js");
// The information needed to properly use the sprite sheets and get the general information
// about the emojis
var emojiList = Script.require("./resources/modules/emojiList.js?" + Date.now());
var customEmojiList = Script.require("./resources/modules/customEmojiList.js?" + Date.now());
var emojiList = Script.require("./resources/modules/emojiList.js");
var customEmojiList = Script.require("./resources/modules/customEmojiList.js");
var imageURLBase = Script.resolvePath("./resources/images/emojis/1024px/");
@ -95,6 +95,7 @@ function startTimeoutDelete() {
// This is called to start the shrink animation and also where the deleting happens when that is done
maybePlayPop("off");
selectedEmojiFilename = null;
defaultTimeout = false;
}, TOTAL_EMOJI_DURATION_MS - POP_ANIMATION_OUT_DURATION_MS);
}
@ -104,11 +105,7 @@ var COUNT_DOWN_INTERVAL_MS = 100;
function beginCountDownTimer() {
_this._avimojiQMLWindow.sendToQml({
"source": "simplifiedEmoji.js",
"method": "beginCountdownTimer",
"data": {
"interval": COUNT_DOWN_INTERVAL_MS,
"duration": TOTAL_EMOJI_DURATION_MS
}
"method": "beginCountdownTimer"
});
}
@ -118,14 +115,12 @@ function clearCountDownTimerHandler() {
if (_this._avimojiQMLWindow) {
_this._avimojiQMLWindow.sendToQml({
"source": "simplifiedEmoji.js",
"method": "clearCountdownTimer",
"data": {}
"method": "clearCountdownTimer"
});
}
}
function resetEmojis() {
pruneOldAvimojis();
maybeClearPop();

6
scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconBackground.svg
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
<path d="M64,0C28.7,0,0,28.7,0,64s28.7,64,64,64s64-28.7,64-64S99.3,0,64,0z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 434 B

7
scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconStroke.svg
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
<path d="M64,0C28.7,0,0,28.7,0,64s28.7,64,64,64s64-28.7,64-64S99.3,0,64,0z M64,124.1C30.8,124.1,3.9,97.2,3.9,64S30.8,3.9,64,3.9
c33.2,0,60.1,26.9,60.1,60.1S97.2,124.1,64,124.1z"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 537 B

15
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -118,17 +118,13 @@ function handleAvatarNametagMode(newAvatarNametagMode) {
nametag.handleAvatarNametagMode(newAvatarNametagMode);
}
function handleEmoteIndicatorVisible(newEmoteIndicatorVisible) {
emote.handleEmoteIndicatorVisible(newEmoteIndicatorVisible);
}
var SETTINGS_APP_MESSAGE_SOURCE = "SettingsApp.qml";
function onMessageFromSettingsApp(message) {
if (message.source !== SETTINGS_APP_MESSAGE_SOURCE) {
return;
}
console.log("\n \n MESSAGE FROM SETTINGS APP: ", JSON.stringify(message));
switch (message.method) {
/*
MILAD NOTE:
@ -136,13 +132,8 @@ function onMessageFromSettingsApp(message) {
nametag.
*/
case "handleAvatarNametagMode":
console.log("Got to handle avatar nametag mode");
handleAvatarNametagMode(message.avatarNametagMode);
break;
case "handleEmoteIndicatorVisible":
console.log("Got to handle emote indicator visible");
handleEmoteIndicatorVisible(message.emoteIndicatorVisible);
break;
default:
console.log("Unrecognized message from " + SETTINGS_APP_MESSAGE_SOURCE + ": " + JSON.stringify(message));
break;
@ -392,7 +383,6 @@ function onMessageFromTopBar(message) {
if (message.source !== TOP_BAR_MESSAGE_SOURCE) {
return;
}
console.log("\n\n MESSAGE FROM TOP BAR! ", JSON.stringify(message));
switch (message.method) {
case "toggleAvatarApp":
toggleAvatarApp();
@ -589,7 +579,6 @@ function modifyLODSettings() {
function restoreLODSettings() {
print("RESTORING LOD SETTINGS");
LODManager.automaticLODAdjust = oldAutomaticLODAdjust;
LODManager.lodAngleDeg = oldLODAngleDeg;
}
@ -650,11 +639,9 @@ function startup() {
function shutdown() {
print("SHUTTING DOWN SIMPLIFIED UI");
restoreLODSettings();
if (!keepExistingUIAndScriptsSetting) {
console.log("The Simplified UI script has been shut down. If you notice any strangeness with user interface, please restart this application.");
if (!HMD.active) {
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);