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

Migrate from 3dImage Overlay to Local Entities

Browse source 
Migrate from 3dImage Overlay to Local Entities
This commit is contained in:
Alezia Kurdis 2020-12-08 23:54:32 -05:00 committed by GitHub
parent aea3e7936f
commit 28e53c9c86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/system/libraries/entityIconOverlayManager.js
View file

@ -29,7 +29,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
overlayProperties[key] = customProperties[key]; overlayProperties[key] = customProperties[key];
} }
} }
Overlays.editOverlay(entityOverlays[entityID], overlayProperties); Entities.editEntity(entityOverlays[entityID], overlayProperties);
} }
}; };
@ -63,7 +63,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
if (visible !== isVisible) { if (visible !== isVisible) {
visible = isVisible; visible = isVisible;
for (var id in entityOverlays) { for (var id in entityOverlays) {
Overlays.editOverlay(entityOverlays[id], { Entities.editEntity(entityOverlays[id], {
visible: visible, visible: visible,
ignorePickIntersection: !visible ignorePickIntersection: !visible
}); });
@ -75,7 +75,11 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
function getOverlay() { function getOverlay() {
var overlay; var overlay;
if (unusedOverlays.length === 0) { if (unusedOverlays.length === 0) {
overlay = Overlays.addOverlay("image3d", {}); overlay = Entities.addEntity({
"type": "Image",
"billboardMode": "full",
"emissive": true
},"local");
allOverlays.push(overlay); allOverlays.push(overlay);
} else { } else {
overlay = unusedOverlays.pop(); overlay = unusedOverlays.pop();
@ -85,7 +89,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
function releaseOverlay(overlay) { function releaseOverlay(overlay) {
unusedOverlays.push(overlay); unusedOverlays.push(overlay);
Overlays.editOverlay(overlay, { Entities.editEntity(overlay, {
visible: false, visible: false,
ignorePickIntersection: true ignorePickIntersection: true
}); });
@ -103,9 +107,8 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
visible: visible, visible: visible,
ignorePickIntersection: !visible, ignorePickIntersection: !visible,
alpha: 0.9, alpha: 0.9,
scale: 0.5, dimensions: { x: 0.5, y: 0.5, z: 0.01 },
drawInFront: true, renderLayer: "front",
isFacingAvatar: true,
color: { color: {
red: 255, red: 255,
green: 255, green: 255,
@ -118,7 +121,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
overlayProperties[key] = customProperties[key]; overlayProperties[key] = customProperties[key];
} }
} }
Overlays.editOverlay(overlay, overlayProperties); Entities.editEntity(overlay, overlayProperties);
} }
} }
@ -149,7 +152,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
Script.scriptEnding.connect(function() { Script.scriptEnding.connect(function() {
for (var i = 0; i < allOverlays.length; i++) { for (var i = 0; i < allOverlays.length; i++) {
Overlays.deleteOverlay(allOverlays[i]); Entities.deleteEntity(allOverlays[i]);
} }
}); });
}; };