Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-06 01:02:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip for getting AvatarInputsBar to switch accordingly

Browse source
This commit is contained in:
Wayne Chen 2019-03-22 15:34:06 -07:00
parent 0edbf12fa3
commit 390ce9bb26
9 changed files with 50 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/resources/qml/AvatarInputsBar.qml
View file

@ -18,20 +18,31 @@ Item {
id: root;
objectName: "AvatarInputsBar"
property int modality: Qt.NonModal
readonly property bool ignoreRadiusEnabled: AvatarInputs.ignoreRadiusEnabled
width: audio.width;
height: audio.height;
readonly property bool ignoreRadiusEnabled: AvatarInputs.ignoreRadiusEnabled;
width: HMD.active ? audio.width : audioApplication.width;
height: HMD.active ? audio.height : audioApplication.height;
x: 10;
y: 5;
readonly property bool shouldReposition: true;
HifiAudio.MicBarApplication {
HifiAudio.MicBar {
id: audio;
visible: AvatarInputs.showAudioTools;
visible: AvatarInputs.showAudioTools && HMD.active;
standalone: true;
dragTarget: parent;
}
HifiAudio.MicBarApplication {
id: audioApplication;
visible: AvatarInputs.showAudioTools && !HMD.active;
onVisibleChanged: {
console.log("visible changed: " + visible);
}
standalone: true;
dragTarget: parent;
}
BubbleIcon {
dragTarget: parent
visible: !HMD.active;
}
}

14
interface/resources/qml/BubbleIcon.qml
View file

@ -19,8 +19,16 @@ Rectangle {
width: bubbleIcon.width + 10
height: bubbleIcon.height + 10
radius: 5;
opacity: AvatarInputs.ignoreRadiusEnabled ? 0.7 : 0.3;
property var dragTarget: null;
property bool ignoreRadiusEnabled: AvatarInputs.ignoreRadiusEnabled;
onIgnoreRadiusEnabledChanged: {
if (ignoreRadiusEnabled) {
bubbleRect.opacity = 0.7;
} else {
bubbleRect.opacity = 0.3;
}
}
color: "#00000000";
border {
@ -58,15 +66,17 @@ Rectangle {
}
drag.target: dragTarget;
onContainsMouseChanged: {
var rectOpacity = ignoreRadiusEnabled ? (containsMouse ? 0.9 : 0.7) : (containsMouse ? 0.5 : 0.3);
if (containsMouse) {
Tablet.playSound(TabletEnums.ButtonHover);
}
bubbleRect.opacity = rectOpacity;
}
}
Image {
id: bubbleIcon
source: "../icons/tablet-icons/bubble-i.svg";
sourceSize: Qt.size(28, 28);
sourceSize: Qt.size(32, 32);
smooth: true;
anchors.top: parent.top
anchors.topMargin: (parent.height - bubbleIcon.height) / 2

15
interface/resources/qml/hifi/audio/MicBar.qml
View file

@ -16,6 +16,7 @@ import stylesUit 1.0
import TabletScriptingInterface 1.0
Rectangle {
id: micBar
HifiConstants { id: hifi; }
readonly property var level: AudioScriptingInterface.inputLevel;
@ -72,7 +73,7 @@ Rectangle {
hoverEnabled: true;
scrollGestureEnabled: false;
onClicked: {
if (AudioScriptingInterface.pushToTalk) {
if (pushToTalk) {
return;
}
muted = !muted;
@ -98,7 +99,7 @@ Rectangle {
readonly property string red: colors.muted;
readonly property string fill: "#55000000";
readonly property string border: standalone ? "#80FFFFFF" : "#55FFFFFF";
readonly property string icon: muted ? muted : unmuted;
readonly property string icon: micBar.muted ? muted : unmuted;
}
Item {
@ -122,7 +123,7 @@ Rectangle {
readonly property string gatedIcon: "../../../icons/tablet-icons/mic-gate-i.svg";
id: image;
source: (pushToTalk && !pushingToTalk) ? pushToTalkIcon : muted ? mutedIcon :
source: (pushToTalk && !pushingToTalk) ? pushToTalkIcon : muted ? mutedIcon :
clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon;
width: 30;
@ -146,9 +147,9 @@ Rectangle {
Item {
id: status;
readonly property string color: muted ? colors.muted : colors.unmuted;
readonly property string color: colors.icon;
visible: (pushToTalk && !pushingToTalk) || (muted && (level >= userSpeakingLevel));
visible: (pushToTalk && !pushingToTalk) || muted;
anchors {
left: parent.left;
@ -177,7 +178,7 @@ Rectangle {
verticalCenter: parent.verticalCenter;
}
width: AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk ? (HMD.active ? 27 : 25) : 50;
width: pushToTalk && !pushingToTalk ? (HMD.active ? 27 : 25) : 50;
height: 4;
color: parent.color;
}
@ -188,7 +189,7 @@ Rectangle {
verticalCenter: parent.verticalCenter;
}
width: AudioScriptingInterface.pushToTalk && !AudioScriptingInterface.pushingToTalk ? (HMD.active ? 27 : 25) : 50;
width: pushToTalk && !pushingToTalk ? (HMD.active ? 27 : 25) : 50;
height: 4;
color: parent.color;
}

15
interface/resources/qml/hifi/audio/MicBarApplication.qml
View file

@ -126,7 +126,7 @@ Rectangle {
Item {
Image {
id: image;
source: (pushToTalk && !pushingToTalk) ? pushToTalkIcon : muted ? mutedIcon :
source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon;
width: 29;
height: 32;
@ -141,8 +141,7 @@ Rectangle {
id: imageOverlay
anchors { fill: image }
source: image;
color: (pushToTalk && !pushingToTalk) ? ((level >= userSpeakingLevel) ? colors.mutedColor :
colors.unmutedColor) : colors.icon;
color: pushToTalk ? (pushingToTalk ? colors.unmutedColor : colors.mutedColor) : colors.icon;
}
}
}
@ -150,12 +149,12 @@ Rectangle {
Item {
id: status;
visible: (pushToTalk && !pushingToTalk) || (muted && (level >= userSpeakingLevel));
visible: pushToTalk || (muted && (level >= userSpeakingLevel));
anchors {
left: parent.left;
top: icon.bottom;
topMargin: 5;
topMargin: 2;
}
width: parent.width;
@ -174,10 +173,10 @@ Rectangle {
verticalCenter: parent.verticalCenter;
}
color: (level >= userSpeakingLevel && muted) ? colors.mutedColor : colors.unmutedColor;
color: pushToTalk ? (pushingToTalk ? colors.unmutedColor : colors.mutedColor) : (level >= userSpeakingLevel && muted) ? colors.mutedColor : colors.unmutedColor;
font.bold: true
text: (pushToTalk && !pushingToTalk) ? (HMD.active ? "PTT" : "PTT-(T)") : (muted ? "MUTED" : "MUTE");
text: pushToTalk ? (HMD.active ? "PTT" : "PTT-(T)") : (muted ? "MUTED" : "MUTE");
size: 12;
}
}
@ -204,6 +203,7 @@ Rectangle {
Rectangle { // mask
id: mask;
visible: (!(pushToTalk && !pushingToTalk))
height: parent.height * level;
width: parent.width;
radius: 5;
@ -217,6 +217,7 @@ Rectangle {
LinearGradient {
anchors { fill: mask }
visible: (!(pushToTalk && !pushingToTalk))
source: mask
start: Qt.point(0, 0);
end: Qt.point(0, bar.height);

2
interface/resources/qml/hifi/tablet/TabletHome.qml
View file

@ -40,7 +40,7 @@ Item {
}
}
HifiAudio.MicBar {
HifiAudio.MicBarApplication {
anchors {
left: parent.left
leftMargin: 30

4
interface/src/Application.cpp
View file

@ -339,7 +339,7 @@ Setting::Handle<int> maxOctreePacketsPerSecond{"maxOctreePPS", DEFAULT_MAX_OCTRE
Setting::Handle<bool> loginDialogPoppedUp{"loginDialogPoppedUp", false};
static const QUrl AVATAR_INPUTS_BAR_QML = PathUtils::qmlUrl("AvatarInputsBar.qml");
static const QUrl MIC_BAR_ENTITY_QML = PathUtils::qmlUrl("hifi/audio/MicBarApplication.qml");
static const QUrl MIC_BAR_APPLICATION_QML = PathUtils::qmlUrl("hifi/audio/MicBarApplication.qml");
static const QUrl BUBBLE_ICON_QML = PathUtils::qmlUrl("BubbleIcon.qml");
static const QString STANDARD_TO_ACTION_MAPPING_NAME = "Standard to Action";
@ -2396,7 +2396,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
});
auto rootItemLoadedFunctor = [webSurface, url, isTablet] {
Application::setupQmlSurface(webSurface->getSurfaceContext(), isTablet || url == LOGIN_DIALOG.toString() || url == AVATAR_INPUTS_BAR_QML.toString() ||
url == BUBBLE_ICON_QML.toString() || url == MIC_BAR_ENTITY_QML.toString() );
url == BUBBLE_ICON_QML.toString());
};
if (webSurface->getRootItem()) {
rootItemLoadedFunctor();

3
scripts/defaultScripts.js
View file

@ -32,8 +32,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/firstPersonHMD.js",
"system/tablet-ui/tabletUI.js",
"system/emote.js",
"system/miniTablet.js",
"system/createAvatarInputsBarEntity.js"
"system/miniTablet.js"
];
var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js",

0
scripts/system/createAvatarInputsBarEntity.js → scripts/developer/createAvatarInputsBarEntity.js
View file

4
scripts/system/away.js
View file

@ -171,7 +171,7 @@ function goAway(fromStartup) {
if (!previousBubbleState) {
Users.toggleIgnoreRadius();
}
UserActivityLogger.bubbleToggled(Users.getIgnoreRadiusEnabled());
UserActivityLogger.privacyShieldToggled(Users.getIgnoreRadiusEnabled());
UserActivityLogger.toggledAway(true);
MyAvatar.isAway = true;
}
@ -186,7 +186,7 @@ function goActive() {
if (Users.getIgnoreRadiusEnabled() !== previousBubbleState) {
Users.toggleIgnoreRadius();
UserActivityLogger.bubbleToggled(Users.getIgnoreRadiusEnabled());
UserActivityLogger.privacyShieldToggled(Users.getIgnoreRadiusEnabled());
}
if (!Window.hasFocus()) {