Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 19:08:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makes simplified namtag a default script, disabled while using inspect.js (alt key)

Browse source
This commit is contained in:
Kasen IO 2020-02-25 01:40:17 -05:00
parent c2b375862c
commit 1636175e4a
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/defaultScripts.js
View file

@ -39,7 +39,8 @@ var DEFAULT_SCRIPTS_COMBINED = [
var DEFAULT_SCRIPTS_SEPARATE = [ var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js", "system/controllers/controllerScripts.js",
"communityModules/notificationCore/notificationCore.js", "communityModules/notificationCore/notificationCore.js",
"communityModules/chat/FloofChat.js" "communityModules/chat/FloofChat.js",
"simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js"
//"system/chat.js" //"system/chat.js"
]; ];

29
scripts/simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js
View file

@ -8,10 +8,11 @@
// //
// Click on someone to get a nametag for them // Click on someone to get a nametag for them
// //
var PickRayController = Script.require('./resources/modules/pickRayController.js'); var PickRayController = Script.require('./resources/modules/pickRayController.js?' + Date.now());
var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js'); var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js');
var pickRayController = new PickRayController(); var pickRayController = new PickRayController();
var nameTagListManager = new NameTagListManager(); var nameTagListManager = new NameTagListManager();
var altKeyPressed = false;
// Handles avatar being solo'd // Handles avatar being solo'd
pickRayController pickRayController
@ -24,7 +25,9 @@ pickRayController
function selectAvatar(uuid, intersection) { function selectAvatar(uuid, intersection) {
nameTagListManager.handleSelect(uuid, intersection); if (!altKeyPressed) {
nameTagListManager.handleSelect(uuid, intersection);
}
} }
@ -46,6 +49,18 @@ function onAvatarAdded(uuid) {
nameTagListManager.maybeAdd(uuid); nameTagListManager.maybeAdd(uuid);
} }
function blockedKeysPressed(event) {
if (event.isAlt) {
altKeyPressed = true;
}
}
function blockedKeysReleased(event) {
if (!event.isAlt) {
altKeyPressed = false;
}
}
// Create a new nametag list manager, connect signals, and return back a new Nametag object. // Create a new nametag list manager, connect signals, and return back a new Nametag object.
var avatarNametagMode; var avatarNametagMode;
@ -57,6 +72,8 @@ function startup() {
Window.domainChanged.connect(onDomainChange); Window.domainChanged.connect(onDomainChange);
AvatarManager.avatarRemovedEvent.connect(onAvatarRemoved); AvatarManager.avatarRemovedEvent.connect(onAvatarRemoved);
AvatarManager.avatarAddedEvent.connect(onAvatarAdded); AvatarManager.avatarAddedEvent.connect(onAvatarAdded);
Controller.keyPressEvent.connect(blockedKeysPressed);
Controller.keyReleaseEvent.connect(blockedKeysReleased);
function NameTag() {} function NameTag() {}
@ -67,7 +84,6 @@ function startup() {
return new NameTag(); return new NameTag();
} }
// Called when the script is closing // Called when the script is closing
function unload() { function unload() {
nameTagListManager.destroy(); nameTagListManager.destroy();
@ -75,6 +91,8 @@ function unload() {
Window.domainChanged.disconnect(onDomainChange); Window.domainChanged.disconnect(onDomainChange);
AvatarManager.avatarRemovedEvent.disconnect(onAvatarRemoved); AvatarManager.avatarRemovedEvent.disconnect(onAvatarRemoved);
AvatarManager.avatarAddedEvent.disconnect(onAvatarAdded); AvatarManager.avatarAddedEvent.disconnect(onAvatarAdded);
Controller.keyPressEvent.disconnect(blockedsKeyPressed);
Controller.keyReleaseEvent.disconnect(blockedKeysReleased);
} }
@ -88,5 +106,6 @@ function handleAvatarNametagMode(newAvatarNameTagMode) {
var nameTag = startup(); var nameTag = startup();
module.exports = nameTag; // if (module) {
// module.exports = nameTag;
// }