From a11da43b0d274dabb42854b2d3373faeb445f21b Mon Sep 17 00:00:00 2001 From: milad Date: Tue, 10 Sep 2019 15:40:56 -0700 Subject: [PATCH 1/8] added additional branch in clearDomainAndNonOwnedEntities to handle localEntities parented --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index fd82567a94..95f1f32dfc 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -229,7 +229,11 @@ void EntityTreeRenderer::clearDomainAndNonOwnedEntities() { for (const auto& entry : _entitiesInScene) { const auto& renderer = entry.second; const EntityItemPointer& entityItem = renderer->getEntity(); - if (!(entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) { + auto parentID = entityItem->getParentID(); + auto parent = getTree()->findEntityByEntityItemID(parentID); + if ((!entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) { + fadeOutRenderable(renderer); + } else if (entityItem->isLocalEntity() && parent && parent->getNestableType() == NestableType::Entity) { fadeOutRenderable(renderer); } else { savedEntities[entry.first] = entry.second; From e275fe1da89cb96600cbf2358a3e8df1f4f0657a Mon Sep 17 00:00:00 2001 From: milad Date: Tue, 24 Sep 2019 16:07:04 -0700 Subject: [PATCH 2/8] Merge branch 'master' of github.com:highfidelity/hifi From edb135776af2edf7d5d743dfad97a94315018659 Mon Sep 17 00:00:00 2001 From: milad Date: Tue, 24 Sep 2019 16:44:34 -0700 Subject: [PATCH 3/8] Added selfie view and updated help --- .../helpApp/controls/ControlsTable.qml | 6 ++--- .../settingsApp/general/General.qml | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml index b647d5ca24..ad4ecec707 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml @@ -699,8 +699,8 @@ Item { spacing: controlsTableRoot.rowPadding HifiStylesUit.GraphikRegular { - id: mirrorText - text: "Mirror Mode" + id: selfieText + text: "Selfie" width: paintedWidth height: parent.height horizontalAlignment: Text.AlignLeft @@ -711,7 +711,7 @@ Item { HifiStylesUit.GraphikRegular { text: "See your own avatar" - width: parent.width - mirrorText.width - parent.spacing - controlsTableRoot.rowPadding + width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding height: parent.height horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index 24fff2dae4..3fd64cde49 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -239,6 +239,16 @@ Flickable { Camera.mode = "third person" } } + + SimplifiedControls.RadioButton { + id: selfie + text: "Selfie" + checked: Camera.mode === "mirror" + visible: true + onClicked: { + Camera.mode = "mirror" + } + } Connections { target: Camera @@ -248,6 +258,18 @@ Flickable { firstPerson.checked = true } else if (Camera.mode === "third person") { thirdPerson.checked = true + } else if (Camera.mode === "mirror" && HMD.active) { + selfie.checked = true + } + } + } + + Connections { + target: HMD + + onDisplayModeChanged { + if (isHMDMode) { + selfie.visible = false; } } } From 677dbe59ccd769dc92f1f20396bb4a9ed3e5253f Mon Sep 17 00:00:00 2001 From: milad Date: Tue, 24 Sep 2019 16:47:07 -0700 Subject: [PATCH 4/8] fixed qml typo --- .../qml/hifi/simplifiedUI/settingsApp/general/General.qml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index 3fd64cde49..69543f34e8 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -267,10 +267,8 @@ Flickable { Connections { target: HMD - onDisplayModeChanged { - if (isHMDMode) { - selfie.visible = false; - } + onDisplayModeChanged: { + selfie.visible = isHMDMode ? false : true } } } From af5e01f96b9bf3f5b622022fda04e0873b4ebede Mon Sep 17 00:00:00 2001 From: milad Date: Tue, 24 Sep 2019 16:51:35 -0700 Subject: [PATCH 5/8] restored modified file --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 9c215ff09c..74f8f5793a 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -229,11 +229,7 @@ void EntityTreeRenderer::clearDomainAndNonOwnedEntities() { for (const auto& entry : _entitiesInScene) { const auto& renderer = entry.second; const EntityItemPointer& entityItem = renderer->getEntity(); - auto parentID = entityItem->getParentID(); - auto parent = getTree()->findEntityByEntityItemID(parentID); - if ((!entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) { - fadeOutRenderable(renderer); - } else if (entityItem->isLocalEntity() && parent && parent->getNestableType() == NestableType::Entity) { + if (!(entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == sessionUUID))) { fadeOutRenderable(renderer); } else { savedEntities[entry.first] = entry.second; @@ -1400,4 +1396,4 @@ bool EntityTreeRenderer::removeMaterialFromAvatar(const QUuid& avatarID, graphic return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialName); } return false; -} +} \ No newline at end of file From 103b10e2f913d863380a3a7eaf9b076c02384213 Mon Sep 17 00:00:00 2001 From: milad Date: Tue, 24 Sep 2019 16:52:37 -0700 Subject: [PATCH 6/8] restored modified file --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 74f8f5793a..3837be5c9c 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -1396,4 +1396,4 @@ bool EntityTreeRenderer::removeMaterialFromAvatar(const QUuid& avatarID, graphic return _removeMaterialFromAvatarOperator(avatarID, material, parentMaterialName); } return false; -} \ No newline at end of file +} From 39d96b76a692110858fc621ef0fb07e27fee3a65 Mon Sep 17 00:00:00 2001 From: milad Date: Wed, 25 Sep 2019 08:41:38 -0700 Subject: [PATCH 7/8] fixed help text --- .../qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml index ad4ecec707..84b37db31b 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml @@ -710,7 +710,7 @@ Item { } HifiStylesUit.GraphikRegular { - text: "See your own avatar" + text: "Look at self" width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding height: parent.height horizontalAlignment: Text.AlignLeft From aba6a28d5483ad9420ea180536f92e745be786cf Mon Sep 17 00:00:00 2001 From: milad Date: Wed, 25 Sep 2019 11:05:32 -0700 Subject: [PATCH 8/8] updated camera modes --- .../simplifiedUI/settingsApp/general/General.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index 69543f34e8..7a98849b95 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -234,19 +234,19 @@ Flickable { SimplifiedControls.RadioButton { id: thirdPerson text: "Third Person View" - checked: Camera.mode === "third person" + checked: Camera.mode === "look at" onClicked: { - Camera.mode = "third person" + Camera.mode = "look at" } } SimplifiedControls.RadioButton { id: selfie text: "Selfie" - checked: Camera.mode === "mirror" + checked: Camera.mode === "selfie" visible: true onClicked: { - Camera.mode = "mirror" + Camera.mode = "selfie" } } @@ -256,9 +256,9 @@ Flickable { onModeUpdated: { if (Camera.mode === "first person") { firstPerson.checked = true - } else if (Camera.mode === "third person") { + } else if (Camera.mode === "look at") { thirdPerson.checked = true - } else if (Camera.mode === "mirror" && HMD.active) { + } else if (Camera.mode === "selfie" && HMD.active) { selfie.checked = true } }