Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:51:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed entity script loading functionality for the jsstreamplayer.

Browse source
This commit is contained in:
Kevini M. Thomas 2016-01-13 14:34:44 -05:00
parent 6f85ee135f
commit 007013254e
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/zones/jsstreamplayerdomain-zone-entity.js
View file

@ -28,6 +28,6 @@
}; };
if (!isScriptRunning(SCRIPT_NAME)) { if (!isScriptRunning(SCRIPT_NAME)) {
Script.load(SCRIPT_NAME); ScriptDiscoveryService.loadOneScript(SCRIPT_NAME);
} }
}) })

30
examples/zones/jsstreamplayerdomain-zone.js
View file

@ -33,7 +33,7 @@ var toggleStreamPlayButton = Overlays.addOverlay("text", {
visible: false, visible: false,
text: " Play" text: " Play"
}); });
// Set up toggleStreamStopButton overlay. // Set up toggleStreamStopButton overlay.
var toggleStreamStopButton = Overlays.addOverlay("text", { var toggleStreamStopButton = Overlays.addOverlay("text", {
x: 166, x: 166,
@ -47,7 +47,7 @@ var toggleStreamStopButton = Overlays.addOverlay("text", {
visible: false, visible: false,
text: " Stop" text: " Stop"
}); });
// Set up increaseVolumeButton overlay. // Set up increaseVolumeButton overlay.
var toggleIncreaseVolumeButton = Overlays.addOverlay("text", { var toggleIncreaseVolumeButton = Overlays.addOverlay("text", {
x: 211, x: 211,
@ -61,7 +61,7 @@ var toggleIncreaseVolumeButton = Overlays.addOverlay("text", {
visible: false, visible: false,
text: " +" text: " +"
}); });
// Set up decreaseVolumeButton overlay. // Set up decreaseVolumeButton overlay.
var toggleDecreaseVolumeButton = Overlays.addOverlay("text", { var toggleDecreaseVolumeButton = Overlays.addOverlay("text", {
x: 234, x: 234,
@ -93,7 +93,7 @@ function changeVolume(volume) {
} }
streamWindow.eventBridge.emitScriptEvent(JSON.stringify(volumeJSON)); streamWindow.eventBridge.emitScriptEvent(JSON.stringify(volumeJSON));
} }
// Function that adds mousePressEvent functionality to connect UI to enter stream URL, play and stop stream. // Function that adds mousePressEvent functionality to connect UI to enter stream URL, play and stop stream.
function mousePressEvent(event) { function mousePressEvent(event) {
if (Overlays.getOverlayAtPoint({x: event.x, y: event.y}) == toggleStreamPlayButton) { if (Overlays.getOverlayAtPoint({x: event.x, y: event.y}) == toggleStreamPlayButton) {
@ -116,7 +116,7 @@ function mousePressEvent(event) {
// Function checking bool if in proper zone. // Function checking bool if in proper zone.
function isOurZone(properties) { function isOurZone(properties) {
return stream != "" && properties.type == "Zone"; return stream != "" && stream != undefined && properties.type == "Zone";
} }
// Function to toggle visibile the overlay. // Function to toggle visibile the overlay.
@ -129,7 +129,21 @@ function toggleVisible(newVisibility) {
Overlays.editOverlay(toggleDecreaseVolumeButton, {visible: visible}); Overlays.editOverlay(toggleDecreaseVolumeButton, {visible: visible});
} }
} }
// Procedure to check to see if you within a zone with a given stream.
var entities = Entities.findEntities(MyAvatar.position, 0.1);
for (var i in entities) {
var properties = Entities.getEntityProperties(entities[i]);
if (properties.type == "Zone") {
print("Entered zone: " + JSON.stringify(entities[i]));
stream = JSON.parse(properties.userData).stream;
if (isOurZone(properties)) {
print("Entered zone " + JSON.stringify(entities[i]) + " with stream: " + stream);
lastZone = properties.name;
toggleVisible(true);
}
}
}
// Function to check if avatar is in proper domain. // Function to check if avatar is in proper domain.
Window.domainChanged.connect(function() { Window.domainChanged.connect(function() {
Script.stop(); Script.stop();
@ -139,7 +153,7 @@ Window.domainChanged.connect(function() {
Entities.enterEntity.connect(function(entityID) { Entities.enterEntity.connect(function(entityID) {
print("Entered..." + JSON.stringify(entityID)); print("Entered..." + JSON.stringify(entityID));
var properties = Entities.getEntityProperties(entityID); var properties = Entities.getEntityProperties(entityID);
stream = properties.userData; stream = JSON.parse(properties.userData).stream;
if(isOurZone(properties)) if(isOurZone(properties))
{ {
lastZone = properties.name; lastZone = properties.name;
@ -173,4 +187,4 @@ Controller.mousePressEvent.connect(mousePressEvent);
streamWindow.setVisible(false); streamWindow.setVisible(false);
// Call function upon ending script. // Call function upon ending script.
Script.scriptEnding.connect(onScriptEnding); Script.scriptEnding.connect(onScriptEnding);