mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 05:37:17 +02:00
Updated mouse look script to get setting value for enable/disable and tydied up some text formatting in the status notifications.
This commit is contained in:
parent
98282d1255
commit
042e7293b9
1 changed files with 14 additions and 19 deletions
|
@ -8,7 +8,7 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
|
|
||||||
var hmd;
|
var hmd;
|
||||||
|
|
||||||
var mouseLookEnabled = false;
|
var mouseLookEnabled = Camera.getMouseLook;
|
||||||
|
|
||||||
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
|
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
|
||||||
|
|
||||||
|
@ -18,13 +18,19 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
|
|
||||||
hmd = AvatarInputs.isHMD;
|
hmd = AvatarInputs.isHMD;
|
||||||
|
|
||||||
|
Camera.mouseLookChanged.connect(onMouseLookChanged);
|
||||||
|
|
||||||
|
function onMouseLookChanged(newMouseLook) {
|
||||||
|
mouseLookEnabled = newMouseLook;
|
||||||
|
}
|
||||||
|
|
||||||
if (!hmd){
|
if (!hmd){
|
||||||
if (mouseLookEnabled) {
|
if (mouseLookEnabled) {
|
||||||
if (!tablet.tabletShown){
|
if (!tablet.tabletShown){
|
||||||
Window.displayAnnouncement("Mouse look: ON");
|
Window.displayAnnouncement("Mouse look: ON");
|
||||||
mouseLookOn();
|
mouseLookOn();
|
||||||
} else {
|
} else {
|
||||||
Window.displayAnnouncement("Tablet is up – mouse look temporarily off.");
|
Window.displayAnnouncement("Tablet is up – mouse look temporarily OFF.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -41,23 +47,11 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
mouseLookOn();
|
mouseLookOn();
|
||||||
} else {
|
} else {
|
||||||
tempOff = true;
|
tempOff = true;
|
||||||
Window.displayAnnouncement("Mouse look: TEMPORARILY OFF");
|
Window.displayAnnouncement("Mouse look: Temporarily OFF");
|
||||||
mouseLookOff();
|
mouseLookOff();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (event.text === 'M') {
|
|
||||||
if (!mouseLookEnabled){
|
|
||||||
Window.displayAnnouncement("Mouse look: ENABLED")
|
|
||||||
mouseLookEnabled = true;
|
|
||||||
mouseLookOn();
|
|
||||||
} else {
|
|
||||||
Window.displayAnnouncement("Mouse look: DISABLED")
|
|
||||||
mouseLookEnabled = false;
|
|
||||||
tempOff = false;
|
|
||||||
mouseLookOff();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +65,7 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
tabletUp = true;
|
tabletUp = true;
|
||||||
if (!tempOff) {
|
if (!tempOff) {
|
||||||
if (!away) {
|
if (!away) {
|
||||||
Window.displayAnnouncement("Tablet is up – mouse look temporarily off.");
|
Window.displayAnnouncement("Tablet is up – mouse look temporarily OFF.");
|
||||||
mouseLookOff();
|
mouseLookOff();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -79,7 +73,7 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
tabletUp = false;
|
tabletUp = false;
|
||||||
if (!tempOff) {
|
if (!tempOff) {
|
||||||
if (!away) {
|
if (!away) {
|
||||||
Window.displayAnnouncement("Tablet hidden – mouse look on.");
|
Window.displayAnnouncement("Tablet hidden – mouse look ON.");
|
||||||
mouseLookOn();
|
mouseLookOn();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -96,7 +90,7 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
if (mouseLookEnabled) {
|
if (mouseLookEnabled) {
|
||||||
away = true;
|
away = true;
|
||||||
if (!tabletUp){
|
if (!tabletUp){
|
||||||
Window.displayAnnouncement("Away state ON – mouse look temporarily off.")
|
Window.displayAnnouncement("Away state ON – mouse look temporarily OFF.")
|
||||||
tempOff = false;
|
tempOff = false;
|
||||||
mouseLookOff()
|
mouseLookOff()
|
||||||
}
|
}
|
||||||
|
@ -111,7 +105,7 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
if (mouseLookEnabled) {
|
if (mouseLookEnabled) {
|
||||||
away = false;
|
away = false;
|
||||||
if (!tabletUp) {
|
if (!tabletUp) {
|
||||||
Window.displayAnnouncement("Away state OFF – mouse look on.");
|
Window.displayAnnouncement("Away state OFF – mouse look ON.");
|
||||||
mouseLookOn();
|
mouseLookOn();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -150,6 +144,7 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
|
||||||
|
|
||||||
function onScriptEnding() {
|
function onScriptEnding() {
|
||||||
Camera.captureMouse = false;
|
Camera.captureMouse = false;
|
||||||
|
Camera.mouseLookChanged.disconnect(onMouseLookChanged);
|
||||||
Controller.keyPressEvent.disconnect(onKeyPressEvent);
|
Controller.keyPressEvent.disconnect(onKeyPressEvent);
|
||||||
tablet.tabletShownChanged.disconnect(onTabletShownChanged);
|
tablet.tabletShownChanged.disconnect(onTabletShownChanged);
|
||||||
MyAvatar.wentAway.disconnect(onWentAway);
|
MyAvatar.wentAway.disconnect(onWentAway);
|
||||||
|
|
Loading…
Reference in a new issue