Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 13:32:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding Portal Sound and Maximum Spawn protection

Browse source 
Adding Portal Sound and Maximum Spawn protection
This commit is contained in:
Alezia Kurdis 2025-01-16 22:19:10 -05:00 committed by GitHub
parent febb84e0f5
commit ec47320ee2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 72 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
scripts/system/places/places.js
View file

@ -38,8 +38,10 @@
var channel = "com.overte.places"; var channel = "com.overte.places";
var portalChannelName = "com.overte.places.portalRezzer"; var portalChannelName = "com.overte.places.portalRezzer";
var MAX_DISTANCE_TO_CONSIDER_PORTAL = 50.0; //in meters var MAX_DISTANCE_TO_CONSIDER_PORTAL = 100.0; //in meters
var PORTAL_DURATION_MILLISEC = 45000; //45 sec var PORTAL_DURATION_MILLISEC = 45000; //45 sec
var rezzerPortalCount = 0;
var MAX_REZZED_PORTAL = 15;
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@ -587,37 +589,44 @@
} }
function generatePortal(position, url, name, placeID) { function generatePortal(position, url, name, placeID) {
var TOLERANCE_FACTOR = 1.1; if (rezzerPortalCount <= MAX_REZZED_PORTAL) {
if (Vec3.distance(MyAvatar.position, position) < MAX_DISTANCE_TO_CONSIDER_PORTAL) { var TOLERANCE_FACTOR = 1.1;
var height = MyAvatar.userHeight * MyAvatar.scale * TOLERANCE_FACTOR; if (Vec3.distance(MyAvatar.position, position) < MAX_DISTANCE_TO_CONSIDER_PORTAL) {
var height = MyAvatar.userHeight * MyAvatar.scale * TOLERANCE_FACTOR;
var portalPosition = Vec3.sum(position, {"x": 0.0, "y": height/2, "z": 0.0});
var dimensions = {"x": height * 0.618, "y": height, "z": height * 0.618}; var portalPosition = Vec3.sum(position, {"x": 0.0, "y": height/2, "z": 0.0});
var userdata = { var dimensions = {"x": height * 0.618, "y": height, "z": height * 0.618};
"url": url, var userdata = {
"name": name, "url": url,
"placeID": placeID "name": name,
}; "placeID": placeID
};
var portalID = Entities.addEntity({
"position": portalPosition, var portalID = Entities.addEntity({
"dimensions": dimensions, "position": portalPosition,
"type": "Shape", "dimensions": dimensions,
"shape": "Sphere", "type": "Shape",
"name": "Portal to " + name, "shape": "Sphere",
"canCastShadow": false, "name": "Portal to " + name,
"collisionless": true, "canCastShadow": false,
"userData": JSON.stringify(userdata), "collisionless": true,
"script": ROOT + "portal.js", "userData": JSON.stringify(userdata),
"visible": "false", "script": ROOT + "portal.js",
"grab": { "visible": "false",
"grabbable": false "grab": {
} "grabbable": false
}, "local"); }
}, "local");
Script.setTimeout(function () { rezzerPortalCount = rezzerPortalCount + 1;
Entities.deleteEntity(portalID);
}, PORTAL_DURATION_MILLISEC); Script.setTimeout(function () {
Entities.deleteEntity(portalID);
rezzerPortalCount = rezzerPortalCount - 1;
if (rezzerPortalCount < 0) {
rezzerPortalCount = 0;
}
}, PORTAL_DURATION_MILLISEC);
}
} }
} }

33
scripts/system/places/portal.js
View file

@ -15,13 +15,17 @@
var portalURL = ""; var portalURL = "";
var portalName = ""; var portalName = "";
var TP_SOUND = SoundCache.getSound(ROOT + "sounds/teleportSound.mp3"); var TP_SOUND = SoundCache.getSound(ROOT + "sounds/teleportSound.mp3");
var PORTAL_SOUND = SoundCache.getSound(ROOT + "sounds/portalSound.mp3");
var portalInjector = Uuid.NONE;
var portalPosition;
this.preload = function(entityID) { this.preload = function(entityID) {
var properties = Entities.getEntityProperties(entityID, ["userData", "dimensions"]); var properties = Entities.getEntityProperties(entityID, ["userData", "dimensions", "position"]);
var userDataObj = JSON.parse(properties.userData); var userDataObj = JSON.parse(properties.userData);
portalURL = userDataObj.url; portalURL = userDataObj.url;
portalName = userDataObj.name; portalName = userDataObj.name;
portalPosition = properties.position;
var portalColor = getColorFromPlaceID(userDataObj.placeID); var portalColor = getColorFromPlaceID(userDataObj.placeID);
@ -116,6 +120,26 @@
"spinFinish": 0 "spinFinish": 0
},"local"); },"local");
if (PORTAL_SOUND.downloaded) {
playLoopSound();
} else {
PORTAL_SOUND.ready.connect(onSoundReady);
}
}
function onSoundReady() {
PORTAL_SOUND.ready.disconnect(onSoundReady);
playLoopSound();
}
function playLoopSound() {
var injectorOptions = {
"position": portalPosition,
"volume": 0.15,
"loop": true,
"localOnly": true
};
portalInjector = Audio.playSound(PORTAL_SOUND, injectorOptions);
} }
this.enterEntity = function(entityID) { this.enterEntity = function(entityID) {
@ -129,11 +153,16 @@
var timer = Script.setTimeout(function () { var timer = Script.setTimeout(function () {
Window.location = portalURL; Window.location = portalURL;
portalInjector.stop();
Entities.deleteEntity(entityID); Entities.deleteEntity(entityID);
}, 1000); }, 1000);
}; };
this.unload = function(entityID) {
portalInjector.stop();
};
function getColorFromPlaceID(placeID) { function getColorFromPlaceID(placeID) {
var idIntegerConstant = getStringScore(placeID); var idIntegerConstant = getStringScore(placeID);
var hue = (idIntegerConstant%360)/360; var hue = (idIntegerConstant%360)/360;

BIN
scripts/system/places/sounds/portalSound.mp3 Normal file
View file

Binary file not shown.