+ No entities found within a 100 meter radius. Try moving to a different location and refreshing.
+
-
-
-
-
Type ▾
-
Name ▾
-
URL ▾
-
-
-
-
-
Type
-
Type
-
Name
-
URL
-
-
-
-
-
- No entities found within a 100 meter radius. Try moving to a different location and refreshing.
diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index 225a1d7957..bd8abb9a91 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -1,7 +1,17 @@
+
+
Properties
-
+
@@ -36,7 +46,7 @@
function showElements(els, show) {
for (var i = 0; i < els.length; i++) {
- els[i].style.display = (show) ? 'block' : 'none';
+ els[i].style.display = (show) ? 'table' : 'none';
}
}
@@ -277,6 +287,10 @@
);
};
+ function setTextareaScrolling(element) {
+ var isScrolling = element.scrollHeight > element.offsetHeight;
+ element.setAttribute("scrolling", isScrolling ? "true" : "false");
+ }
function loaded() {
openEventBridge(function() {
@@ -347,7 +361,10 @@
var elLifetime = document.getElementById("property-lifetime");
var elScriptURL = document.getElementById("property-script-url");
+ /*
+ FIXME: See FIXME for property-script-url.
var elScriptTimestamp = document.getElementById("property-script-timestamp");
+ */
var elReloadScriptButton = document.getElementById("reload-script-button");
var elUserData = document.getElementById("property-user-data");
@@ -455,8 +472,8 @@
var PARAM_REGEXP = /(?:\?)(\S+)/; // Check if this has any parameters.
var TIMESTAMP_REGEXP = /(&?HFTime=\d+)/;
- var refreshEvent = function(event){
- var urlElement = event.target.parentElement.getElementsByClassName("url")[0];
+ var refreshEvent = function (event) {
+ var urlElement = event.target.parentElement.getElementsByTagName("INPUT")[0];
var content = urlElement.value;
var date = new Date();
var timeStamp = date.getTime();
@@ -479,7 +496,7 @@
for(var index = 0; index < urlUpdaters.length; index++){
var urlUpdater = urlUpdaters[index];
- urlUpdater.addEventListener("click", refreshEvent);
+ urlUpdater.addEventListener("click", refreshEvent, true);
}
if (window.EventBridge !== undefined) {
@@ -490,7 +507,7 @@
if (data.selections.length == 0) {
elType.innerHTML = "No Selection";
elID.innerHTML = "";
- disableChildren(document.getElementById("properties-list"), 'input');
+ disableChildren(document.getElementById("properties-list"), 'input, textarea, checkbox');
} else if (data.selections.length > 1) {
var selections = data.selections;
@@ -513,7 +530,7 @@
}
elType.innerHTML = typeStrs.join(", ");
- disableChildren(document.getElementById("properties-list"), 'input');
+ disableChildren(document.getElementById("properties-list"), 'input, textarea, checkbox');
} else {
var activeElement = document.activeElement;
@@ -534,10 +551,10 @@
elLocked.checked = properties.locked;
if (properties.locked) {
- disableChildren(document.getElementById("properties-list"), 'input');
+ disableChildren(document.getElementById("properties-list"), 'input, textarea, checkbox');
elLocked.removeAttribute('disabled');
} else {
- enableChildren(document.getElementById("properties-list"), 'input');
+ enableChildren(document.getElementById("properties-list"), 'input, textarea, checkbox');
}
@@ -617,8 +634,12 @@
elCollisionSoundURL.value = properties.collisionSoundURL;
elLifetime.value = properties.lifetime;
elScriptURL.value = properties.script;
+ /*
+ FIXME: See FIXME for property-script-url.
elScriptTimestamp.value = properties.scriptTimestamp;
+ */
elUserData.value = properties.userData;
+ setTextareaScrolling(elUserData);
elHyperlinkHref.value = properties.href;
elHyperlinkDescription.value = properties.description;
@@ -630,11 +651,11 @@
}
for (var i = 0; i < elHyperlinkSections.length; i++) {
- elHyperlinkSections[i].style.display = 'block';
+ elHyperlinkSections[i].style.display = 'table';
}
if (properties.type == "Box" || properties.type == "Sphere" || properties.type == "ParticleEffect") {
- elColorSection.style.display = 'block';
+ elColorSection.style.display = 'table';
elColorRed.value = properties.color.red;
elColorGreen.value = properties.color.green;
elColorBlue.value = properties.color.blue;
@@ -645,11 +666,12 @@
if (properties.type == "Model") {
for (var i = 0; i < elModelSections.length; i++) {
- elModelSections[i].style.display = 'block';
+ elModelSections[i].style.display = 'table';
}
elModelURL.value = properties.modelURL;
elShapeType.value = properties.shapeType;
+ setDropdownText(elShapeType);
elCompoundShapeURL.value = properties.compoundShapeURL;
elModelAnimationURL.value = properties.animation.url;
elModelAnimationPlaying.checked = properties.animation.running;
@@ -660,10 +682,12 @@
elModelAnimationLoop.checked = properties.animation.loop;
elModelAnimationHold.checked = properties.animation.hold;
elModelTextures.value = properties.textures;
+ setTextareaScrolling(elModelTextures);
elModelOriginalTextures.value = properties.originalTextures;
+ setTextareaScrolling(elModelOriginalTextures);
} else if (properties.type == "Web") {
for (var i = 0; i < elWebSections.length; i++) {
- elWebSections[i].style.display = 'block';
+ elWebSections[i].style.display = 'table';
}
for (var i = 0; i < elHyperlinkSections.length; i++) {
elHyperlinkSections[i].style.display = 'none';
@@ -672,7 +696,7 @@
elWebSourceURL.value = properties.sourceUrl;
} else if (properties.type == "Text") {
for (var i = 0; i < elTextSections.length; i++) {
- elTextSections[i].style.display = 'block';
+ elTextSections[i].style.display = 'table';
}
elTextText.value = properties.text;
@@ -686,7 +710,7 @@
elTextBackgroundColorBlue.value = properties.backgroundColor.blue;
} else if (properties.type == "Light") {
for (var i = 0; i < elLightSections.length; i++) {
- elLightSections[i].style.display = 'block';
+ elLightSections[i].style.display = 'table';
}
elLightSpotLight.checked = properties.isSpotlight;
@@ -702,7 +726,7 @@
elLightCutoff.value = properties.cutoff.toFixed(2);
} else if (properties.type == "Zone") {
for (var i = 0; i < elZoneSections.length; i++) {
- elZoneSections[i].style.display = 'block';
+ elZoneSections[i].style.display = 'table';
}
elZoneStageSunModelEnabled.checked = properties.stage.sunModelEnabled;
@@ -727,6 +751,7 @@
elCompoundShapeURL.value = properties.compoundShapeURL;
elZoneBackgroundMode.value = properties.backgroundMode;
+ setDropdownText(elZoneBackgroundMode);
elZoneSkyboxColor.style.backgroundColor = "rgb(" + properties.skybox.color.red + "," + properties.skybox.color.green + "," + properties.skybox.color.blue + ")";
elZoneSkyboxColorRed.value = properties.skybox.color.red;
@@ -737,13 +762,14 @@
showElements(document.getElementsByClassName('skybox-section'), elZoneBackgroundMode.value == 'skybox');
} else if (properties.type == "PolyVox") {
for (var i = 0; i < elPolyVoxSections.length; i++) {
- elPolyVoxSections[i].style.display = 'block';
+ elPolyVoxSections[i].style.display = 'table';
}
elVoxelVolumeSizeX.value = properties.voxelVolumeSize.x.toFixed(2);
elVoxelVolumeSizeY.value = properties.voxelVolumeSize.y.toFixed(2);
elVoxelVolumeSizeZ.value = properties.voxelVolumeSize.z.toFixed(2);
elVoxelSurfaceStyle.value = properties.voxelSurfaceStyle;
+ setDropdownText(elVoxelSurfaceStyle);
elXTextureURL.value = properties.xTextureURL;
elYTextureURL.value = properties.yTextureURL;
elZTextureURL.value = properties.zTextureURL;
@@ -856,7 +882,10 @@
elLifetime.addEventListener('change', createEmitNumberPropertyUpdateFunction('lifetime'));
elScriptURL.addEventListener('change', createEmitTextPropertyUpdateFunction('script'));
+ /*
+ FIXME: See FIXME for property-script-url.
elScriptTimestamp.addEventListener('change', createEmitNumberPropertyUpdateFunction('scriptTimestamp'));
+ */
elUserData.addEventListener('change', createEmitTextPropertyUpdateFunction('userData'));
var colorChangeFunction = createEmitColorPropertyUpdateFunction(
@@ -868,7 +897,13 @@
colorScheme:'dark',
layout:'hex',
color:'000000',
- onSubmit: function(hsb, hex, rgb, el) {
+ onShow: function (colpick) {
+ $('#property-color').attr('active', 'true');
+ },
+ onHide: function (colpick) {
+ $('#property-color').attr('active', 'false');
+ },
+ onSubmit: function (hsb, hex, rgb, el) {
$(el).css('background-color', '#'+hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
@@ -886,7 +921,13 @@
colorScheme:'dark',
layout:'hex',
color:'000000',
- onSubmit: function(hsb, hex, rgb, el) {
+ onShow: function (colpick) {
+ $('#property-light-color').attr('active', 'true');
+ },
+ onHide: function (colpick) {
+ $('#property-light-color').attr('active', 'false');
+ },
+ onSubmit: function (hsb, hex, rgb, el) {
$(el).css('background-color', '#'+hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b);
@@ -926,10 +967,17 @@
$('#property-text-text-color').colpick({
colorScheme:'dark',
layout:'hex',
- color:'000000',
- onSubmit: function(hsb, hex, rgb, el) {
+ color: '000000',
+ onShow: function (colpick) {
+ $('#property-text-text-color').attr('active', 'true');
+ },
+ onHide: function (colpick) {
+ $('#property-text-text-color').attr('active', 'false');
+ },
+ onSubmit: function (hsb, hex, rgb, el) {
$(el).css('background-color', '#'+hex);
$(el).colpickHide();
+ $(el).attr('active', 'false');
emitColorPropertyUpdate('textColor', rgb.r, rgb.g, rgb.b);
}
});
@@ -943,7 +991,13 @@
colorScheme:'dark',
layout:'hex',
color:'000000',
- onSubmit: function(hsb, hex, rgb, el) {
+ onShow: function (colpick) {
+ $('#property-text-background-color').attr('active', 'true');
+ },
+ onHide: function (colpick) {
+ $('#property-text-background-color').attr('active', 'false');
+ },
+ onSubmit: function (hsb, hex, rgb, el) {
$(el).css('background-color', '#'+hex);
$(el).colpickHide();
emitColorPropertyUpdate('backgroundColor', rgb.r, rgb.g, rgb.b);
@@ -955,7 +1009,13 @@
colorScheme:'dark',
layout:'hex',
color:'000000',
- onSubmit: function(hsb, hex, rgb, el) {
+ onShow: function (colpick) {
+ $('#property-zone-key-light-color').attr('active', 'true');
+ },
+ onHide: function (colpick) {
+ $('#property-zone-key-light-color').attr('active', 'false');
+ },
+ onSubmit: function (hsb, hex, rgb, el) {
$(el).css('background-color', '#'+hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'keyLight');
@@ -990,7 +1050,13 @@
colorScheme:'dark',
layout:'hex',
color:'000000',
- onSubmit: function(hsb, hex, rgb, el) {
+ onShow: function (colpick) {
+ $('#property-zone-skybox-color').attr('active', 'true');
+ },
+ onHide: function (colpick) {
+ $('#property-zone-skybox-color').attr('active', 'false');
+ },
+ onSubmit: function (hsb, hex, rgb, el) {
$(el).css('background-color', '#'+hex);
$(el).colpickHide();
emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'skybox');
@@ -1034,12 +1100,15 @@
percentage: parseInt(elRescaleDimensionsPct.value),
}));
});
+ /*
+ FIXME: See FIXME for property-script-url.
elReloadScriptButton.addEventListener("click", function() {
EventBridge.emitWebEvent(JSON.stringify({
type: "action",
action: "reloadScript"
}));
});
+ */
elPreviewCameraButton.addEventListener("click", function() {
EventBridge.emitWebEvent(JSON.stringify({
type: "action",
@@ -1080,687 +1149,647 @@
};
}
});
- }
+ // Collapsible sections
+ var elCollapsible = document.getElementsByClassName("section-header");
+
+ var toggleCollapsedEvent = function (event) {
+ var element = event.target;
+ if (element.nodeName !== "DIV") {
+ element = element.parentNode;
+ }
+ var isCollapsed = element.getAttribute("collapsed") !== "true";
+ element.setAttribute("collapsed", isCollapsed ? "true" : "false");
+ element.getElementsByTagName("span")[0].textContent = isCollapsed ? "L" : "M";
+ };
+
+ for (var i = 0, length = elCollapsible.length; i < length; i++) {
+ var element = elCollapsible[i];
+ element.addEventListener("click", toggleCollapsedEvent, true);
+ };
+
+
+ // Textarea scollbars
+ var elTextareas = document.getElementsByTagName("TEXTAREA");
+
+ var textareaOnChangeEvent = function (event) {
+ setTextareaScrolling(event.target);
+ }
+
+ for (var i = 0, length = elTextareas.length; i < length; i++) {
+ var element = elTextareas[i];
+ setTextareaScrolling(element);
+ element.addEventListener("input", textareaOnChangeEvent, false);
+ element.addEventListener("change", textareaOnChangeEvent, false);
+ /* FIXME: Detect and update textarea scrolling attribute on resize. Unfortunately textarea doesn't have a resize
+ event; mouseup is a partial stand-in but doesn't handle resizing if mouse moves outside textarea rectangle. */
+ element.addEventListener("mouseup", textareaOnChangeEvent, false);
+ };
+
+ // Dropdowns
+ // For each dropdown the following replacement is created in place of the oriringal dropdown...
+ // Structure created:
+ //
+ //
display textcarat
+ //
+ //
+ //
0) {
+ var el = elDropdowns[0];
+ el.parentNode.removeChild(el);
+ elDropdowns = document.getElementsByTagName("select");
+ }
+
+ // Disable right-click context menu which is not visible in the HMD and makes it seem like the app has locked
+ document.addEventListener("contextmenu", function (event) {
+ event.preventDefault();
+ }, false);
+ }
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ M
+
+
+
+
+
+
+
+
+
+
+
+
+ M
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Name
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Locked
-
-
-
-
-
- Visible
-
-
-
+
+ M
-
-
-
User Data
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+ M
+
+
+
+
+
+
+
+
-
-
Text Content
-
-
+
+ Collides With
+
+
+
+
+
-
-
-
Line Height
-
-
-
-
-
-
Text Color
-
-
-
R
-
G
-
B
-
-
-
-
Background Color
-
-
-
R
-
G
-
B
-
-
-
-
-
-
-
-
- Stage Sun Model Enabled
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
Light Color
-
-
-
R
-
G
-
B
+
+
+
+
+
+
+
+
-
-
Light Intensity
-
-
-
+
+ Grabbing
-
-
-
Light Direction
-
-
Altitude
-
Azimuth
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
Ambient Intensity
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
Ambient URL
-
-
-
-
+
+
+ M
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
Stage Latitude
-
-
-
-
-
-
Stage Longitude
-
-
-
-
-
-
Stage Altitude
-
-
+
+
+
+
+
-
- Automatically calculate stage hour and day from location and clock.
-
-
-
-