Skip to content

Disable fading on UI entities, disable grabbing loading avatar/equip indicator balls #1988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ada-tv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable fading on UI entities, disable grabbing loading avatar/equip indicator balls #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions interface/src/avatar/OtherAvatar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ void OtherAvatar::createOrb() {
properties.getPulse().setMax(1.0f);
properties.getPulse().setColorMode(PulseMode::IN_PHASE);
properties.setIgnorePickIntersection(true);
properties.getGrab().setGrabbable(false);
properties.setFadeInMode(COMPONENT_MODE_DISABLED);
properties.setFadeOutMode(COMPONENT_MODE_DISABLED);

properties.setPosition(getHead()->getPosition());
properties.setRotation(glm::quat(0.0f, 0.0f, 0.0f, 1.0));
Expand Down
2 changes: 2 additions & 0 deletions interface/src/ui/Keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,8 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) {
properties.setParentID(myAvatar->getSelfID());
properties.setParentJointIndex(SENSOR_TO_WORLD_MATRIX_INDEX);
properties.setUnlit(true);
properties.setFadeInMode(COMPONENT_MODE_DISABLED);
properties.setFadeOutMode(COMPONENT_MODE_DISABLED);

Anchor anchor;
anchor.entityID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
Expand Down
6 changes: 6 additions & 0 deletions scripts/communityScripts/chatBubbles/chatBubbles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ function ChatBubbles_SpawnBubble(data, senderID) {
billboardMode: "yaw",
grab: {grabbable: false},
renderLayer: "front",
fadeInMode: "disabled",
fadeOutMode: "disabled",
}, "local");
} else {
height *= scale;
Expand All @@ -188,6 +190,8 @@ function ChatBubbles_SpawnBubble(data, senderID) {
topMargin: -0.004 * scale, // center isn't exactly centered?
grab: {grabbable: false},
renderLayer: "front",
fadeInMode: "disabled",
fadeOutMode: "disabled",
script: (link === undefined && !linkIsImage) ? undefined :
`(function() {
this.mousePressOnEntity = function(entity, event) {
Expand Down Expand Up @@ -290,6 +294,8 @@ function ChatBubbles_ShowTypingIndicator(senderID) {
grab: {grabbable: false},
ignorePickIntersection: true,
renderLayer: "front",
fadeInMode: "disabled",
fadeOutMode: "disabled",
}, "local");

const indicatorInterval = Script.setInterval(() => ChatBubbles_IndicatorTick(senderID), 1000 / BUBBLE_ANIM_FPS);
Expand Down
2 changes: 2 additions & 0 deletions scripts/communityScripts/contextMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,8 @@ function ContextMenu_OpenActions(actionSetName, page = 0) {
a.canCastShadow = false;
a.isVisibleInSecondaryCamera = false;
a.renderLayer = "front";
a.fadeInMode = "disabled";
a.fadeOutMode = "disabled";

if (sensorScaleHack) {
a.dimensions[0] /= MyAvatar.sensorToWorldScale;
Expand Down
4 changes: 3 additions & 1 deletion scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/defaultLocalEntityProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ var localEntityProps = {
billboardMode: "full",
lifetime: 3,
canCastShadow: true,
unlit: true
unlit: true,
fadeInMode: "disabled",
fadeOutMode: "disabled",
};

module.exports = localEntityProps;
3 changes: 2 additions & 1 deletion scripts/system/controllers/controllerModules/equipEntity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ EquipHotspotBuddy.prototype.updateHotspot = function(hotspot, timestamp) {
"w": 1
},
"dimensions": dimensions,
"ignorePickIntersection": true
"ignorePickIntersection": true,
"grab": { "grabbable": false },
}, "local"));
overlayInfoSet.type = "model";
this.map[hotspot.key] = overlayInfoSet;
Expand Down
2 changes: 2 additions & 0 deletions scripts/system/tablet-ui/tabletUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@
"visible": true,
"ignorePickIntersection": true,
"renderLayer": "world",
"fadeInMode": "disabled",
"fadeOutMode": "disabled",
"lifetime": 3
}, "local");
Script.setTimeout(function() {
Expand Down