Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-10 20:47:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #179 from kasenvr/feature/default-nametag

Browse source 
Makes simplified nametag a default script
This commit is contained in:
Thijs Wenker 2020-02-26 12:43:53 +01:00 committed by GitHub
commit 3fbf6abd29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/defaultScripts.js
View file

@ -39,6 +39,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js",
"communityModules/notificationCore/notificationCore.js",
"simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
{"stable": "communityModules/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"}
//"system/chat.js"
];

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

@ -12,6 +12,7 @@ var PickRayController = Script.require('./resources/modules/pickRayController.js
var NameTagListManager = Script.require('./resources/modules/nameTagListManager.js');
var pickRayController = new PickRayController();
var nameTagListManager = new NameTagListManager();
var altKeyPressed = false;
// Handles avatar being solo'd
pickRayController
@ -24,7 +25,9 @@ pickRayController
function selectAvatar(uuid, intersection) {
nameTagListManager.handleSelect(uuid, intersection);
if (!altKeyPressed) {
nameTagListManager.handleSelect(uuid, intersection);
}
}
@ -46,6 +49,18 @@ function onAvatarAdded(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.
var avatarNametagMode;
@ -57,6 +72,8 @@ function startup() {
Window.domainChanged.connect(onDomainChange);
AvatarManager.avatarRemovedEvent.connect(onAvatarRemoved);
AvatarManager.avatarAddedEvent.connect(onAvatarAdded);
Controller.keyPressEvent.connect(blockedKeysPressed);
Controller.keyReleaseEvent.connect(blockedKeysReleased);
function NameTag() {}
@ -67,7 +84,6 @@ function startup() {
return new NameTag();
}
// Called when the script is closing
function unload() {
nameTagListManager.destroy();
@ -75,6 +91,8 @@ function unload() {
Window.domainChanged.disconnect(onDomainChange);
AvatarManager.avatarRemovedEvent.disconnect(onAvatarRemoved);
AvatarManager.avatarAddedEvent.disconnect(onAvatarAdded);
Controller.keyPressEvent.disconnect(blockedsKeyPressed);
Controller.keyReleaseEvent.disconnect(blockedKeysReleased);
}
@ -88,5 +106,8 @@ function handleAvatarNametagMode(newAvatarNameTagMode) {
var nameTag = startup();
module.exports = nameTag;
try {
module.exports = nameTag;
} catch (e) {
// module doesn't exist when script run outside of simplified UI.
}