diff --git a/scripts/system/create/assets/images/icon-material.svg b/scripts/system/create/assets/images/icon-material.svg
new file mode 100644
index 0000000000..470fed5dbd
--- /dev/null
+++ b/scripts/system/create/assets/images/icon-material.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/scripts/system/create/assets/images/icon-particles.svg b/scripts/system/create/assets/images/icon-particles.svg
index 5e0105d7cd..2b3f365889 100644
--- a/scripts/system/create/assets/images/icon-particles.svg
+++ b/scripts/system/create/assets/images/icon-particles.svg
@@ -1,29 +1,14 @@
-
-
-
+
\ No newline at end of file
diff --git a/scripts/system/create/assets/images/icon-point-light.svg b/scripts/system/create/assets/images/icon-point-light.svg
index 896c35b63b..0f2e91d55b 100644
--- a/scripts/system/create/assets/images/icon-point-light.svg
+++ b/scripts/system/create/assets/images/icon-point-light.svg
@@ -1,57 +1,48 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/scripts/system/create/assets/images/icon-spot-light.svg b/scripts/system/create/assets/images/icon-spot-light.svg
index ac2f87bb27..d8e196ffd7 100644
--- a/scripts/system/create/assets/images/icon-spot-light.svg
+++ b/scripts/system/create/assets/images/icon-spot-light.svg
@@ -1,37 +1,26 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/scripts/system/create/assets/images/icon-zone.svg b/scripts/system/create/assets/images/icon-zone.svg
index 41aeac4951..bfd8e07160 100644
--- a/scripts/system/create/assets/images/icon-zone.svg
+++ b/scripts/system/create/assets/images/icon-zone.svg
@@ -1,73 +1,5 @@
-
-
-
-
\ No newline at end of file
+Layer 1
\ No newline at end of file
diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index fc3d4fc10f..9e94b68ba1 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -87,21 +87,24 @@ var PARTICLE_SYSTEM_URL = Script.resolvePath("assets/images/icon-particles.svg")
var POINT_LIGHT_URL = Script.resolvePath("assets/images/icon-point-light.svg");
var SPOT_LIGHT_URL = Script.resolvePath("assets/images/icon-spot-light.svg");
var ZONE_URL = Script.resolvePath("assets/images/icon-zone.svg");
+var MATERIAL_URL = Script.resolvePath("assets/images/icon-material.svg");
-var entityIconOverlayManager = new EntityIconOverlayManager(['Light', 'ParticleEffect', 'Zone'], function(entityID) {
- var properties = Entities.getEntityProperties(entityID, ['type', 'isSpotlight']);
- if (properties.type === 'Light') {
- return {
- url: properties.isSpotlight ? SPOT_LIGHT_URL : POINT_LIGHT_URL,
- };
- } else if (properties.type === 'Zone') {
- return {
- url: ZONE_URL,
+var entityIconOverlayManager = new EntityIconOverlayManager(["Light", "ParticleEffect", "Zone", "Material"], function(entityID) {
+ var properties = Entities.getEntityProperties(entityID, ["type", "isSpotlight", "parentID", "name"]);
+ if (properties.type === "Light") {
+ return {
+ imageURL: properties.isSpotlight ? SPOT_LIGHT_URL : POINT_LIGHT_URL
};
+ } else if (properties.type === "Zone") {
+ return { imageURL: ZONE_URL };
+ } else if (properties.type === "Material") {
+ if (properties.parentID !== Uuid.NULL && properties.name !== "MATERIAL_" + entityShapeVisualizerSessionName) {
+ return { imageURL: MATERIAL_URL };
+ } else {
+ return { imageURL: "" };
+ }
} else {
- return {
- url: PARTICLE_SYSTEM_URL,
- };
+ return { imageURL: PARTICLE_SYSTEM_URL };
}
});
@@ -154,8 +157,7 @@ var MENU_CREATE_SEPARATOR = "Create Application";
var SUBMENU_ENTITY_EDITOR_PREFERENCES = "Edit > Preferences";
var MENU_AUTO_FOCUS_ON_SELECT = "Auto Focus on Select";
var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus";
-var MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE = "Show Lights and Particle Systems in Create Mode";
-var MENU_SHOW_ZONES_IN_EDIT_MODE = "Show Zones in Create Mode";
+var MENU_SHOW_ICONS_IN_CREATE_MODE = "Show Icons in Create Mode";
var MENU_CREATE_ENTITIES_GRABBABLE = "Create Entities As Grabbable (except Zones, Particles, and Lights)";
var MENU_ALLOW_SELECTION_LARGE = "Allow Selecting of Large Models";
var MENU_ALLOW_SELECTION_SMALL = "Allow Selecting of Small Models";
@@ -1041,8 +1043,7 @@ var toolBar = (function () {
// everybody else to think that Interface has lost focus overall. fogbugzid:558
// Window.setFocus();
}
- entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
- Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
+ entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_ICONS_IN_CREATE_MODE));
};
initialize();
@@ -1465,22 +1466,15 @@ function setupModelMenus() {
});
Menu.addMenuItem({
menuName: SUBMENU_ENTITY_EDITOR_PREFERENCES,
- menuItemName: MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE,
+ menuItemName: MENU_SHOW_ICONS_IN_CREATE_MODE,
afterItem: MENU_EASE_ON_FOCUS,
isCheckable: true,
isChecked: Settings.getValue(SETTING_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE) !== "false"
});
- Menu.addMenuItem({
- menuName: SUBMENU_ENTITY_EDITOR_PREFERENCES,
- menuItemName: MENU_SHOW_ZONES_IN_EDIT_MODE,
- afterItem: MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE,
- isCheckable: true,
- isChecked: Settings.getValue(SETTING_SHOW_ZONES_IN_EDIT_MODE) !== "false"
- });
Menu.addMenuItem({
menuName: SUBMENU_ENTITY_EDITOR_PREFERENCES,
menuItemName: MENU_ENTITY_LIST_DEFAULT_RADIUS,
- afterItem: MENU_SHOW_ZONES_IN_EDIT_MODE
+ afterItem: MENU_SHOW_ICONS_IN_CREATE_MODE
});
Entities.setLightsArePickable(false);
@@ -1497,8 +1491,7 @@ function cleanupModelMenus() {
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_ALLOW_SELECTION_LIGHTS);
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_AUTO_FOCUS_ON_SELECT);
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_EASE_ON_FOCUS);
- Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE);
- Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_SHOW_ZONES_IN_EDIT_MODE);
+ Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_SHOW_ICONS_IN_CREATE_MODE);
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_CREATE_ENTITIES_GRABBABLE);
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_ENTITY_LIST_DEFAULT_RADIUS);
Menu.removeMenu(SUBMENU_ENTITY_EDITOR_PREFERENCES);
@@ -1511,8 +1504,7 @@ Script.scriptEnding.connect(function () {
toolBar.setActive(false);
Settings.setValue(SETTING_AUTO_FOCUS_ON_SELECT, Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT));
Settings.setValue(SETTING_EASE_ON_FOCUS, Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
- Settings.setValue(SETTING_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
- Settings.setValue(SETTING_SHOW_ZONES_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
+ Settings.setValue(SETTING_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_ICONS_IN_CREATE_MODE));
Settings.setValue(SETTING_EDIT_PREFIX + MENU_ALLOW_SELECTION_LARGE, Menu.isOptionChecked(MENU_ALLOW_SELECTION_LARGE));
Settings.setValue(SETTING_EDIT_PREFIX + MENU_ALLOW_SELECTION_SMALL, Menu.isOptionChecked(MENU_ALLOW_SELECTION_SMALL));
@@ -1869,10 +1861,8 @@ function handleMenuEvent(menuItem) {
undoHistory.undo();
} else if (menuItem === "Redo") {
undoHistory.redo();
- } else if (menuItem === MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE) {
- entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
- } else if (menuItem === MENU_SHOW_ZONES_IN_EDIT_MODE) {
- Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
+ } else if (menuItem === MENU_SHOW_ICONS_IN_CREATE_MODE) {
+ entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_ICONS_IN_CREATE_MODE));
} else if (menuItem === MENU_CREATE_ENTITIES_GRABBABLE) {
Settings.setValue(SETTING_EDIT_PREFIX + menuItem, Menu.isOptionChecked(menuItem));
} else if (menuItem === MENU_ENTITY_LIST_DEFAULT_RADIUS) {
diff --git a/scripts/system/create/modules/entityShapeVisualizer.js b/scripts/system/create/modules/entityShapeVisualizer.js
index 45cf68fdb5..7a1cd74d25 100644
--- a/scripts/system/create/modules/entityShapeVisualizer.js
+++ b/scripts/system/create/modules/entityShapeVisualizer.js
@@ -143,6 +143,7 @@ EntityShape.prototype = {
var PROJECTED_MATERIALS = false;
this.materialEntity = Entities.addEntity({
type: "Material",
+ name: "MATERIAL_" + this.entityShapeVisualizerSessionName,
localPosition: Vec3.ZERO,
localRotation: Quat.IDENTITY,
localDimensions: properties.localDimensions,
diff --git a/scripts/system/libraries/entityIconOverlayManager.js b/scripts/system/libraries/entityIconOverlayManager.js
index 68104ff4bb..f2ca5625ea 100644
--- a/scripts/system/libraries/entityIconOverlayManager.js
+++ b/scripts/system/libraries/entityIconOverlayManager.js
@@ -29,7 +29,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
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) {
visible = isVisible;
for (var id in entityOverlays) {
- Overlays.editOverlay(entityOverlays[id], {
+ Entities.editEntity(entityOverlays[id], {
visible: visible,
ignorePickIntersection: !visible
});
@@ -75,7 +75,11 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
function getOverlay() {
var overlay;
if (unusedOverlays.length === 0) {
- overlay = Overlays.addOverlay("image3d", {});
+ overlay = Entities.addEntity({
+ type: "Image",
+ billboardMode: "full",
+ emissive: true
+ }, "local");
allOverlays.push(overlay);
} else {
overlay = unusedOverlays.pop();
@@ -85,7 +89,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
function releaseOverlay(overlay) {
unusedOverlays.push(overlay);
- Overlays.editOverlay(overlay, {
+ Entities.editEntity(overlay, {
visible: false,
ignorePickIntersection: true
});
@@ -103,9 +107,8 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
visible: visible,
ignorePickIntersection: !visible,
alpha: 0.9,
- scale: 0.5,
- drawInFront: true,
- isFacingAvatar: true,
+ dimensions: { x: 0.5, y: 0.5, z: 0.01 },
+ renderLayer: "front",
color: {
red: 255,
green: 255,
@@ -118,7 +121,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
overlayProperties[key] = customProperties[key];
}
}
- Overlays.editOverlay(overlay, overlayProperties);
+ Entities.editEntity(overlay, overlayProperties);
}
}
@@ -149,7 +152,7 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
Script.scriptEnding.connect(function() {
for (var i = 0; i < allOverlays.length; i++) {
- Overlays.deleteOverlay(allOverlays[i]);
+ Entities.deleteEntity(allOverlays[i]);
}
});
};