diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebf830e354..32e79c8443 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,8 +92,17 @@ else ()
if (NOT QT_CMAKE_PREFIX_PATH)
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
endif ()
+ if (NOT QT_CMAKE_PREFIX_PATH)
+ get_filename_component(QT_CMAKE_PREFIX_PATH "${Qt5_DIR}/.." REALPATH)
+ endif ()
endif ()
+if (WIN32)
+ if (NOT EXISTS ${QT_CMAKE_PREFIX_PATH})
+ message(FATAL_ERROR "Could not determine QT_CMAKE_PREFIX_PATH.")
+ endif ()
+endif()
+
# figure out where the qt dir is
get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)
diff --git a/examples/edit.js b/examples/edit.js
index 2b32769337..59dcbaad19 100644
--- a/examples/edit.js
+++ b/examples/edit.js
@@ -28,6 +28,7 @@ Script.include([
"libraries/gridTool.js",
"libraries/entityList.js",
"libraries/lightOverlayManager.js",
+ "libraries/zoneOverlayManager.js",
]);
var selectionDisplay = SelectionDisplay;
@@ -35,6 +36,7 @@ var selectionManager = SelectionManager;
var entityPropertyDialogBox = EntityPropertyDialogBox;
var lightOverlayManager = new LightOverlayManager();
+var zoneOverlayManager = new ZoneOverlayManager();
var cameraManager = new CameraManager();
@@ -47,6 +49,7 @@ var entityListTool = EntityListTool();
selectionManager.addEventListener(function() {
selectionDisplay.updateHandles();
lightOverlayManager.updatePositions();
+ zoneOverlayManager.updatePositions();
});
var windowDimensions = Controller.getViewportDimensions();
@@ -77,11 +80,13 @@ var DEFAULT_LIGHT_DIMENSIONS = Vec3.multiply(20, DEFAULT_DIMENSIONS);
var MENU_AUTO_FOCUS_ON_SELECT = "Auto Focus on Select";
var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus";
var MENU_SHOW_LIGHTS_IN_EDIT_MODE = "Show Lights in Edit Mode";
+var MENU_SHOW_ZONES_IN_EDIT_MODE = "Show Zones in Edit Mode";
var SETTING_INSPECT_TOOL_ENABLED = "inspectToolEnabled";
var SETTING_AUTO_FOCUS_ON_SELECT = "autoFocusOnSelect";
var SETTING_EASE_ON_FOCUS = "cameraEaseOnFocus";
var SETTING_SHOW_LIGHTS_IN_EDIT_MODE = "showLightsInEditMode";
+var SETTING_SHOW_ZONES_IN_EDIT_MODE = "showZonesInEditMode";
var INSUFFICIENT_PERMISSIONS_ERROR_MSG = "You do not have the necessary permissions to edit on this domain."
var INSUFFICIENT_PERMISSIONS_IMPORT_ERROR_MSG = "You do not have the necessary permissions to place items on this domain."
@@ -135,6 +140,7 @@ var toolBar = (function () {
newSphereButton,
newLightButton,
newTextButton,
+ newZoneButton,
browseMarketplaceButton;
function initialize() {
@@ -201,6 +207,14 @@ var toolBar = (function () {
alpha: 0.9,
visible: false
});
+ newZoneButton = toolBar.addTool({
+ imageURL: toolIconUrl + "zonecube3.svg",
+ subImage: { x: 0, y: Tool.IMAGE_WIDTH + 208, width: 256, height: 256 },
+ width: toolWidth,
+ height: toolHeight,
+ alpha: 0.9,
+ visible: false
+ });
that.setActive(false);
}
@@ -232,6 +246,7 @@ var toolBar = (function () {
}
toolBar.selectTool(activeButton, isActive);
lightOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE));
+ zoneOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
};
// Sets visibility of tool buttons, excluding the power button
@@ -241,6 +256,7 @@ var toolBar = (function () {
toolBar.showTool(newSphereButton, doShow);
toolBar.showTool(newLightButton, doShow);
toolBar.showTool(newTextButton, doShow);
+ toolBar.showTool(newZoneButton, doShow);
};
var RESIZE_INTERVAL = 50;
@@ -412,6 +428,21 @@ var toolBar = (function () {
return true;
}
+ if (newZoneButton === toolBar.clicked(clickedOverlay)) {
+ var position = getPositionToCreateEntity();
+
+ if (position.x > 0 && position.y > 0 && position.z > 0) {
+ placingEntityID = Entities.addEntity({
+ type: "Zone",
+ position: grid.snapToSurface(grid.snapToGrid(position, false, DEFAULT_DIMENSIONS), DEFAULT_DIMENSIONS),
+ dimensions: { x: 10, y: 10, z: 10 },
+ });
+ } else {
+ print("Can't create box: Text would be out of bounds.");
+ }
+ return true;
+ }
+
return false;
};
@@ -486,12 +517,22 @@ function rayPlaneIntersection(pickRay, point, normal) {
}
function findClickedEntity(event) {
+ var pickZones = event.isControl;
+
+ if (pickZones) {
+ Entities.setZonesArePickable(true);
+ }
+
var pickRay = Camera.computePickRay(event.x, event.y);
var entityResult = Entities.findRayIntersection(pickRay, true); // want precision picking
var lightResult = lightOverlayManager.findRayIntersection(pickRay);
lightResult.accurate = true;
+ if (pickZones) {
+ Entities.setZonesArePickable(false);
+ }
+
var result;
if (!entityResult.intersects && !lightResult.intersects) {
@@ -776,6 +817,8 @@ function setupModelMenus() {
isCheckable: true, isChecked: Settings.getValue(SETTING_EASE_ON_FOCUS) == "true" });
Menu.addMenuItem({ menuName: "View", menuItemName: MENU_SHOW_LIGHTS_IN_EDIT_MODE, afterItem: MENU_EASE_ON_FOCUS,
isCheckable: true, isChecked: Settings.getValue(SETTING_SHOW_LIGHTS_IN_EDIT_MODE) == "true" });
+ Menu.addMenuItem({ menuName: "View", menuItemName: MENU_SHOW_ZONES_IN_EDIT_MODE, afterItem: MENU_SHOW_LIGHTS_IN_EDIT_MODE,
+ isCheckable: true, isChecked: Settings.getValue(SETTING_SHOW_ZONES_IN_EDIT_MODE) == "true" });
Entities.setLightsArePickable(false);
}
@@ -804,12 +847,14 @@ function cleanupModelMenus() {
Menu.removeMenuItem("View", MENU_AUTO_FOCUS_ON_SELECT);
Menu.removeMenuItem("View", MENU_EASE_ON_FOCUS);
Menu.removeMenuItem("View", MENU_SHOW_LIGHTS_IN_EDIT_MODE);
+ Menu.removeMenuItem("View", MENU_SHOW_ZONES_IN_EDIT_MODE);
}
Script.scriptEnding.connect(function() {
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_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE));
+ Settings.setValue(SETTING_SHOW_ZONES_IN_EDIT_MODE, Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
progressDialog.cleanup();
toolBar.cleanup();
@@ -942,6 +987,8 @@ function handeMenuEvent(menuItem) {
selectAllEtitiesInCurrentSelectionBox(true);
} else if (menuItem == MENU_SHOW_LIGHTS_IN_EDIT_MODE) {
lightOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE));
+ } else if (menuItem == MENU_SHOW_ZONES_IN_EDIT_MODE) {
+ zoneOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
}
tooltip.show(false);
}
diff --git a/examples/example/entities/zoneEntityExample.js b/examples/example/entities/zoneEntityExample.js
new file mode 100644
index 0000000000..b5831a2bb5
--- /dev/null
+++ b/examples/example/entities/zoneEntityExample.js
@@ -0,0 +1,72 @@
+//
+// zoneEntityExample.js
+// examples
+//
+// Created by Brad Hefta-Gaub on 4/16/15.
+// Copyright 2015 High Fidelity, Inc.
+//
+// This is an example script that demonstrates creating and editing a entity
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+
+var count = 0;
+var stopAfter = 1000;
+
+var zoneEntityA = Entities.addEntity({
+ type: "Zone",
+ position: { x: 5, y: 5, z: 5 },
+ dimensions: { x: 10, y: 10, z: 10 },
+ keyLightColor: { red: 255, green: 0, blue: 0 },
+ stageSunModelEnabled: false,
+ keyLightDirection: { x: 0, y: -1.0, z: 0 },
+ shapeType: "sphere"
+});
+
+print("zoneEntityA:" + zoneEntityA);
+
+var zoneEntityB = Entities.addEntity({
+ type: "Zone",
+ position: { x: 5, y: 5, z: 5 },
+ dimensions: { x: 2, y: 2, z: 2 },
+ keyLightColor: { red: 0, green: 255, blue: 0 },
+ keyLightIntensity: 0.9,
+ stageLatitude: 37.777,
+ stageLongitude: 122.407,
+ stageAltitude: 0.03,
+ stageDay: 60,
+ stageHour: 12,
+ stageSunModelEnabled: true
+});
+
+print("zoneEntityB:" + zoneEntityB);
+
+
+var zoneEntityC = Entities.addEntity({
+ type: "Zone",
+ position: { x: 5, y: 10, z: 5 },
+ dimensions: { x: 10, y: 10, z: 10 },
+ keyLightColor: { red: 0, green: 0, blue: 255 },
+ keyLightIntensity: 0.75,
+ keyLightDirection: { x: 0, y: 0, z: -1 },
+ stageSunModelEnabled: false,
+ shapeType: "compound",
+ compoundShapeURL: "http://headache.hungry.com/~seth/hifi/cube.fbx"
+});
+
+print("zoneEntityC:" + zoneEntityC);
+
+
+// register the call back so it fires before each data send
+Script.update.connect(function(deltaTime) {
+ // stop it...
+ if (count >= stopAfter) {
+ print("calling Script.stop()");
+ Script.stop();
+ }
+ count++;
+});
+
diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index dd5bced393..a8290dc3fa 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -162,7 +162,7 @@
var elModelSections = document.querySelectorAll(".model-section");
var elModelURL = document.getElementById("property-model-url");
- var elCollisionModelURL = document.getElementById("property-collision-model-url");
+ var elCompoundShapeURL = document.getElementById("property-compound-shape-url");
var elModelAnimationURL = document.getElementById("property-model-animation-url");
var elModelAnimationPlaying = document.getElementById("property-model-animation-playing");
var elModelAnimationFPS = document.getElementById("property-model-animation-fps");
@@ -182,6 +182,23 @@
var elTextBackgroundColorGreen = document.getElementById("property-text-background-color-green");
var elTextBackgroundColorBlue = document.getElementById("property-text-background-color-blue");
+ var elZoneSections = document.querySelectorAll(".zone-section");
+ var elZoneStageSunModelEnabled = document.getElementById("property-zone-stage-sun-model-enabled");
+ var elZoneKeyLightColorRed = document.getElementById("property-zone-key-light-color-red");
+ var elZoneKeyLightColorGreen = document.getElementById("property-zone-key-light-color-green");
+ var elZoneKeyLightColorBlue = document.getElementById("property-zone-key-light-color-blue");
+ var elZoneKeyLightIntensity = document.getElementById("property-zone-key-intensity");
+ var elZoneKeyLightAmbientIntensity = document.getElementById("property-zone-key-ambient-intensity");
+ var elZoneKeyLightDirectionX = document.getElementById("property-zone-key-light-direction-x");
+ var elZoneKeyLightDirectionY = document.getElementById("property-zone-key-light-direction-y");
+ var elZoneKeyLightDirectionZ = document.getElementById("property-zone-key-light-direction-z");
+
+ var elZoneStageLatitude = document.getElementById("property-zone-stage-latitude");
+ var elZoneStageLongitude = document.getElementById("property-zone-stage-longitude");
+ var elZoneStageAltitude = document.getElementById("property-zone-stage-altitude");
+ var elZoneStageDay = document.getElementById("property-zone-stage-day");
+ var elZoneStageHour = document.getElementById("property-zone-stage-hour");
+
if (window.EventBridge !== undefined) {
EventBridge.scriptEventReceived.connect(function(data) {
data = JSON.parse(data);
@@ -306,7 +323,7 @@
}
elModelURL.value = properties.modelURL;
- elCollisionModelURL.value = properties.collisionModelURL;
+ elCompoundShapeURL.value = properties.compoundShapeURL;
elModelAnimationURL.value = properties.animationURL;
elModelAnimationPlaying.checked = properties.animationIsPlaying;
elModelAnimationFPS.value = properties.animationFPS;
@@ -356,6 +373,32 @@
elLightCutoff.value = properties.cutoff;
}
+ if (properties.type != "Zone") {
+ for (var i = 0; i < elZoneSections.length; i++) {
+ elZoneSections[i].style.display = 'none';
+ }
+ } else {
+ for (var i = 0; i < elZoneSections.length; i++) {
+ elZoneSections[i].style.display = 'block';
+ }
+
+ elZoneStageSunModelEnabled.checked = properties.stageSunModelEnabled;
+ elZoneKeyLightColorRed.value = properties.keyLightColor.red;
+ elZoneKeyLightColorGreen.value = properties.keyLightColor.green;
+ elZoneKeyLightColorBlue.value = properties.keyLightColor.blue;
+ elZoneKeyLightIntensity.value = properties.keyLightIntensity.toFixed(2);
+ elZoneKeyLightAmbientIntensity.value = properties.keyLightAmbientIntensity.toFixed(2);
+ elZoneKeyLightDirectionX.value = properties.keyLightDirection.x.toFixed(2);
+ elZoneKeyLightDirectionY.value = properties.keyLightDirection.y.toFixed(2);
+ elZoneKeyLightDirectionZ.value = properties.keyLightDirection.z.toFixed(2);
+
+ elZoneStageLatitude.value = properties.stageLatitude.toFixed(2);
+ elZoneStageLongitude.value = properties.stageLongitude.toFixed(2);
+ elZoneStageAltitude.value = properties.stageAltitude.toFixed(2);
+ elZoneStageDay.value = properties.stageDay;
+ elZoneStageHour.value = properties.stageHour;
+ }
+
if (selected) {
activeElement.focus();
activeElement.select();
@@ -444,7 +487,7 @@
elLightCutoff.addEventListener('change', createEmitNumberPropertyUpdateFunction('cutoff'));
elModelURL.addEventListener('change', createEmitTextPropertyUpdateFunction('modelURL'));
- elCollisionModelURL.addEventListener('change', createEmitTextPropertyUpdateFunction('collisionModelURL'));
+ elCompoundShapeURL.addEventListener('change', createEmitTextPropertyUpdateFunction('compoundShapeURL'));
elModelAnimationURL.addEventListener('change', createEmitTextPropertyUpdateFunction('animationURL'));
elModelAnimationPlaying.addEventListener('change', createEmitCheckedPropertyUpdateFunction('animationIsPlaying'));
elModelAnimationFPS.addEventListener('change', createEmitNumberPropertyUpdateFunction('animationFPS'));
@@ -468,6 +511,26 @@
elTextBackgroundColorGreen.addEventListener('change', textBackgroundColorChangeFunction);
elTextBackgroundColorBlue.addEventListener('change', textBackgroundColorChangeFunction);
+ elZoneStageSunModelEnabled.addEventListener('change', createEmitCheckedPropertyUpdateFunction('stageSunModelEnabled'));
+ var zoneKeyLightColorChangeFunction = createEmitColorPropertyUpdateFunction(
+ 'keyLightColor', elZoneKeyLightColorRed, elZoneKeyLightColorGreen, elZoneKeyLightColorBlue);
+ elZoneKeyLightColorRed.addEventListener('change', zoneKeyLightColorChangeFunction);
+ elZoneKeyLightColorGreen.addEventListener('change', zoneKeyLightColorChangeFunction);
+ elZoneKeyLightColorBlue.addEventListener('change', zoneKeyLightColorChangeFunction);
+ elZoneKeyLightIntensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('keyLightIntensity'));
+ elZoneKeyLightAmbientIntensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('keyLightAmbientIntensity'));
+ var zoneKeyLightDirectionChangeFunction = createEmitVec3PropertyUpdateFunction(
+ 'keyLightDirection', elZoneKeyLightDirectionX, elZoneKeyLightDirectionY, elZoneKeyLightDirectionZ);
+ elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
+ elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
+ elZoneKeyLightDirectionZ.addEventListener('change', zoneKeyLightDirectionChangeFunction);
+
+ elZoneStageLatitude.addEventListener('change', createEmitNumberPropertyUpdateFunction('stageLatitude'));
+ elZoneStageLongitude.addEventListener('change', createEmitNumberPropertyUpdateFunction('stageLongitude'));
+ elZoneStageAltitude.addEventListener('change', createEmitNumberPropertyUpdateFunction('stageAltitude'));
+ elZoneStageDay.addEventListener('change', createEmitNumberPropertyUpdateFunction('stageDay'));
+ elZoneStageHour.addEventListener('change', createEmitNumberPropertyUpdateFunction('stageHour'));
+
elMoveSelectionToGrid.addEventListener("click", function() {
EventBridge.emitWebEvent(JSON.stringify({
type: "action",
@@ -712,9 +775,9 @@
@@ -833,6 +896,73 @@
+
+
+ Stage Sun Model Enabled
+
+
+
+
+
+
+
+
Key Light Intensity
+
+
+
+
+
Key Light Ambient Intensity
+
+
+
+
+
Key Light Direction
+
+
+
Stage Longitude
+
+
+
+
diff --git a/examples/libraries/ToolTip.js b/examples/libraries/ToolTip.js
index 680f617436..2b0e125d4b 100644
--- a/examples/libraries/ToolTip.js
+++ b/examples/libraries/ToolTip.js
@@ -53,7 +53,7 @@ function Tooltip() {
text += "ID: " + properties.id + "\n"
if (properties.type == "Model") {
text += "Model URL: " + properties.modelURL + "\n"
- text += "Collision Model URL: " + properties.collisionModelURL + "\n"
+ text += "Compound Shape URL: " + properties.compoundShapeURL + "\n"
text += "Animation URL: " + properties.animationURL + "\n"
text += "Animation is playing: " + properties.animationIsPlaying + "\n"
if (properties.sittingPoints && properties.sittingPoints.length > 0) {
diff --git a/examples/libraries/entityPropertyDialogBox.js b/examples/libraries/entityPropertyDialogBox.js
index d8a91da8f9..255cec4265 100644
--- a/examples/libraries/entityPropertyDialogBox.js
+++ b/examples/libraries/entityPropertyDialogBox.js
@@ -52,7 +52,7 @@ EntityPropertyDialogBox = (function () {
if (properties.type == "Model") {
array.push({ label: "Model URL:", value: properties.modelURL });
index++;
- array.push({ label: "Collision Model URL:", value: properties.collisionModelURL });
+ array.push({ label: "Compound Shape URL:", value: properties.compoundShapeURL });
index++;
array.push({ label: "Animation URL:", value: properties.animationURL });
index++;
@@ -284,7 +284,7 @@ EntityPropertyDialogBox = (function () {
properties.locked = array[index++].value;
if (properties.type == "Model") {
properties.modelURL = array[index++].value;
- properties.collisionModelURL = array[index++].value;
+ properties.compoundShapeURL = array[index++].value;
properties.animationURL = array[index++].value;
var newAnimationIsPlaying = array[index++].value;
diff --git a/examples/libraries/lightOverlayManager.js b/examples/libraries/lightOverlayManager.js
index 8032d77c49..a140461a27 100644
--- a/examples/libraries/lightOverlayManager.js
+++ b/examples/libraries/lightOverlayManager.js
@@ -122,7 +122,7 @@ LightOverlayManager = function() {
Entities.clearingEntities.connect(clearEntities);
// Add existing entities
- var ids = Entities.findEntities(MyAvatar.position, 100);
+ var ids = Entities.findEntities(MyAvatar.position, 64000);
for (var i = 0; i < ids.length; i++) {
addEntity(ids[i]);
}
diff --git a/examples/libraries/zoneOverlayManager.js b/examples/libraries/zoneOverlayManager.js
new file mode 100644
index 0000000000..9898b888fa
--- /dev/null
+++ b/examples/libraries/zoneOverlayManager.js
@@ -0,0 +1,145 @@
+ZoneOverlayManager = function(isEntityFunc, entityAddedFunc, entityRemovedFunc, entityMovedFunc) {
+ var self = this;
+
+ var visible = false;
+
+ // List of all created overlays
+ var allOverlays = [];
+
+ // List of overlays not currently being used
+ var unusedOverlays = [];
+
+ // Map from EntityItemID.id to overlay id
+ var entityOverlays = {};
+
+ // Map from EntityItemID.id to EntityItemID object
+ var entityIDs = {};
+
+ this.updatePositions = function(ids) {
+ for (var id in entityIDs) {
+ var entityID = entityIDs[id];
+ var properties = Entities.getEntityProperties(entityID);
+ Overlays.editOverlay(entityOverlays[entityID.id].solid, {
+ position: properties.position,
+ rotation: properties.rotation,
+ dimensions: properties.dimensions,
+ });
+ Overlays.editOverlay(entityOverlays[entityID.id].outline, {
+ position: properties.position,
+ rotation: properties.rotation,
+ dimensions: properties.dimensions,
+ });
+ }
+ };
+
+ this.setVisible = function(isVisible) {
+ if (visible != isVisible) {
+ visible = isVisible;
+ for (var id in entityOverlays) {
+ Overlays.editOverlay(entityOverlays[id].solid, { visible: visible });
+ Overlays.editOverlay(entityOverlays[id].outline, { visible: visible });
+ }
+ }
+ };
+
+ // Allocate or get an unused overlay
+ function getOverlay() {
+ if (unusedOverlays.length == 0) {
+ var overlay = Overlays.addOverlay("cube", {
+ });
+ allOverlays.push(overlay);
+ } else {
+ var overlay = unusedOverlays.pop();
+ };
+ return overlay;
+ }
+
+ function releaseOverlay(overlay) {
+ unusedOverlays.push(overlay);
+ Overlays.editOverlay(overlay, { visible: false });
+ }
+
+ function addEntity(entityID) {
+ var properties = Entities.getEntityProperties(entityID);
+ if (properties.type == "Zone" && !(entityID.id in entityOverlays)) {
+ var overlaySolid = getOverlay();
+ var overlayOutline = getOverlay();
+
+ entityOverlays[entityID.id] = {
+ solid: overlaySolid,
+ outline: overlayOutline,
+ }
+ entityIDs[entityID.id] = entityID;
+
+ var color = {
+ red: Math.round(Math.random() * 255),
+ green: Math.round(Math.random() * 255),
+ blue: Math.round(Math.random() * 255)
+ };
+ Overlays.editOverlay(overlaySolid, {
+ position: properties.position,
+ rotation: properties.rotation,
+ dimensions: properties.dimensions,
+ visible: visible,
+ solid: true,
+ alpha: 0.1,
+ color: color,
+ ignoreRayIntersection: true,
+ });
+ Overlays.editOverlay(overlayOutline, {
+ position: properties.position,
+ rotation: properties.rotation,
+ dimensions: properties.dimensions,
+ visible: visible,
+ solid: false,
+ dashed: false,
+ lineWidth: 2.0,
+ alpha: 1.0,
+ color: color,
+ ignoreRayIntersection: true,
+ });
+ }
+ }
+
+ function deleteEntity(entityID) {
+ if (entityID.id in entityOverlays) {
+ releaseOverlay(entityOverlays[entityID.id].outline);
+ releaseOverlay(entityOverlays[entityID.id].solid);
+ delete entityOverlays[entityID.id];
+ }
+ }
+
+ function changeEntityID(oldEntityID, newEntityID) {
+ entityOverlays[newEntityID.id] = entityOverlays[oldEntityID.id];
+ entityIDs[newEntityID.id] = newEntityID;
+
+ delete entityOverlays[oldEntityID.id];
+ delete entityIDs[oldEntityID.id];
+ }
+
+ function clearEntities() {
+ for (var id in entityOverlays) {
+ releaseOverlay(entityOverlays[id].outline);
+ releaseOverlay(entityOverlays[id].solid);
+ }
+ entityOverlays = {};
+ entityIDs = {};
+ }
+
+ Entities.addingEntity.connect(addEntity);
+ Entities.changingEntityID.connect(changeEntityID);
+ Entities.deletingEntity.connect(deleteEntity);
+ Entities.clearingEntities.connect(clearEntities);
+
+ // Add existing entities
+ var ids = Entities.findEntities(MyAvatar.position, 64000);
+ for (var i = 0; i < ids.length; i++) {
+ addEntity(ids[i]);
+ }
+
+ Script.scriptEnding.connect(function() {
+ for (var i = 0; i < allOverlays.length; i++) {
+ Overlays.deleteOverlay(allOverlays[i]);
+ }
+ });
+};
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 885e4ed4b5..7688036c94 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -54,7 +54,7 @@ else ()
list(REMOVE_ITEM INTERFACE_SRCS ${SPEECHRECOGNIZER_CPP})
endif ()
-find_package(Qt5 COMPONENTS Gui Multimedia Network OpenGL Script Svg WebKitWidgets)
+find_package(Qt5 COMPONENTS Gui Multimedia Network OpenGL Qml Quick Script Svg WebKitWidgets)
# grab the ui files in resources/ui
file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml
new file mode 100644
index 0000000000..ec1480928a
--- /dev/null
+++ b/interface/resources/qml/AddressBarDialog.qml
@@ -0,0 +1,76 @@
+import Hifi 1.0
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Controls.Styles 1.3
+
+CustomDialog {
+ title: "Go to..."
+ objectName: "AddressBarDialog"
+ height: 128
+ width: 512
+ destroyOnCloseButton: false
+
+ onVisibleChanged: {
+ if (!visible) {
+ reset();
+ }
+ }
+
+ onEnabledChanged: {
+ if (enabled) {
+ addressLine.forceActiveFocus();
+ }
+ }
+
+ function reset() {
+ addressLine.text = ""
+ goButton.source = "../images/address-bar-submit.svg"
+ }
+
+ AddressBarDialog {
+ id: addressBarDialog
+
+ // The client area
+ anchors.fill: parent
+ anchors.margins: parent.margins
+ anchors.topMargin: parent.topMargin
+
+ CustomBorder {
+ height: 64
+ anchors.left: parent.left
+ anchors.leftMargin: 0
+ anchors.right: goButton.left
+ anchors.rightMargin: 8
+ anchors.verticalCenter: parent.verticalCenter
+ CustomTextInput {
+ id: addressLine
+ anchors.fill: parent
+ helperText: "domain, location, @user, /x,y,z"
+ anchors.margins: 8
+ onAccepted: {
+ addressBarDialog.loadAddress(addressLine.text)
+ }
+ }
+ }
+
+ Image {
+ id: goButton
+ width: 32
+ height: 32
+ anchors.right: parent.right
+ anchors.rightMargin: 8
+ source: "../images/address-bar-submit.svg"
+ anchors.verticalCenter: parent.verticalCenter
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ parent.source = "../images/address-bar-submit-active.svg"
+ addressBarDialog.loadAddress(addressLine.text)
+ }
+ }
+ }
+ }
+}
+
diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
new file mode 100644
index 0000000000..d7e08fbd97
--- /dev/null
+++ b/interface/resources/qml/Browser.qml
@@ -0,0 +1,45 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Dialogs 1.2
+import QtQuick.Controls.Styles 1.3
+import QtWebKit 3.0
+
+CustomDialog {
+ title: "Test Dlg"
+ id: testDialog
+ objectName: "Browser"
+ width: 1280
+ height: 720
+
+ Item {
+ id: clientArea
+ // The client area
+ anchors.fill: parent
+ anchors.margins: parent.margins
+ anchors.topMargin: parent.topMargin
+
+
+ ScrollView {
+ anchors.fill: parent
+ WebView {
+ id: webview
+ url: "http://slashdot.org"
+ anchors.fill: parent
+ }
+ }
+
+ }
+
+
+}
+
+
+/*
+
+// This is the behavior, and it applies a NumberAnimation to any attempt to set the x property
+
+MouseArea {
+ anchors.fill: parent
+}
+*/
diff --git a/interface/resources/qml/CustomBorder.qml b/interface/resources/qml/CustomBorder.qml
new file mode 100644
index 0000000000..1bb30d1ebc
--- /dev/null
+++ b/interface/resources/qml/CustomBorder.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.3
+
+
+Rectangle {
+ SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+ property int margin: 5
+ color: myPalette.window
+ border.color: myPalette.dark
+ border.width: 5
+ radius: border.width * 2
+}
+
diff --git a/interface/resources/qml/CustomButton.qml b/interface/resources/qml/CustomButton.qml
new file mode 100644
index 0000000000..ce57d7ce5e
--- /dev/null
+++ b/interface/resources/qml/CustomButton.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.3
+import QtQuick.Window 2.2
+import QtQuick.Controls.Styles 1.3
+
+Button {
+ SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+ text: "Text"
+ width: 128
+ height: 64
+ style: ButtonStyle {
+ background: CustomBorder {
+ anchors.fill: parent
+ }
+ label: CustomText {
+ renderType: Text.NativeRendering
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignHCenter
+ text: control.text
+ color: control.enabled ? myPalette.text : myPalette.dark
+ }
+ }
+}
diff --git a/interface/resources/qml/CustomDialog.qml b/interface/resources/qml/CustomDialog.qml
new file mode 100644
index 0000000000..1e0351af4f
--- /dev/null
+++ b/interface/resources/qml/CustomDialog.qml
@@ -0,0 +1,162 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Dialogs 1.2
+import QtQuick.Controls.Styles 1.3
+import "hifiConstants.js" as HifiConstants
+
+Item {
+ SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+ id: dialog
+ width: 256
+ height: 256
+ scale: 0.0
+ enabled: false
+ property int animationDuration: 400
+ property bool destroyOnInvisible: false
+ property bool destroyOnCloseButton: true
+ property bool resizable: false
+ property int minX: 256
+ property int minY: 256
+ clip: true
+
+ onEnabledChanged: {
+ scale = enabled ? 1.0 : 0.0
+ }
+
+ onScaleChanged: {
+ visible = (scale != 0.0);
+ }
+
+ onVisibleChanged: {
+ if (!visible && destroyOnInvisible) {
+ console.log("Destroying closed component");
+ destroy();
+ }
+ }
+
+ function close() {
+ if (destroyOnCloseButton) {
+ destroyOnInvisible = true
+ }
+ enabled = false;
+ }
+
+ function deltaSize(dx, dy) {
+ width = Math.max(width + dx, minX)
+ height = Math.max(height + dy, minY)
+ }
+
+ Behavior on scale {
+ NumberAnimation {
+ //This specifies how long the animation takes
+ duration: dialog.animationDuration
+ //This selects an easing curve to interpolate with, the default is Easing.Linear
+ easing.type: Easing.InOutBounce
+ }
+ }
+
+ property int topMargin: dialog.height - clientBorder.height + 8
+ property int margins: 8
+ property string title
+ property int titleSize: titleBorder.height + 12
+ property string frameColor: HifiConstants.color
+ property string backgroundColor: myPalette.window
+ property string headerBackgroundColor: myPalette.dark
+
+ CustomBorder {
+ id: windowBorder
+ anchors.fill: parent
+ border.color: dialog.frameColor
+ color: dialog.backgroundColor
+
+ CustomBorder {
+ id: titleBorder
+ height: 48
+ anchors.right: parent.right
+ anchors.rightMargin: 0
+ anchors.left: parent.left
+ anchors.leftMargin: 0
+ border.color: dialog.frameColor
+ color: dialog.headerBackgroundColor
+
+ CustomText {
+ id: titleText
+ color: "white"
+ text: dialog.title
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ anchors.fill: parent
+ }
+
+ MouseArea {
+ id: titleDrag
+ anchors.right: closeButton.left
+ anchors.bottom: parent.bottom
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.rightMargin: 4
+ drag {
+ target: dialog
+ minimumX: 0
+ minimumY: 0
+ maximumX: dialog.parent ? dialog.parent.width - dialog.width : 0
+ maximumY: dialog.parent ? dialog.parent.height - dialog.height : 0
+ }
+ }
+ Image {
+ id: closeButton
+ x: 360
+ height: 16
+ anchors.verticalCenter: parent.verticalCenter
+ width: 16
+ anchors.right: parent.right
+ anchors.rightMargin: 12
+ source: "../styles/close.svg"
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ dialog.close();
+ }
+ }
+ }
+ } // header border
+
+ CustomBorder {
+ id: clientBorder
+ border.color: dialog.frameColor
+ color: "#00000000"
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 0
+ anchors.top: titleBorder.bottom
+ anchors.topMargin: -titleBorder.border.width
+ anchors.right: parent.right
+ anchors.rightMargin: 0
+ anchors.left: parent.left
+ anchors.leftMargin: 0
+ clip: true
+ } // client border
+ } // window border
+
+ MouseArea {
+ id: sizeDrag
+ property int startX
+ property int startY
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+ width: 16
+ height: 16
+ hoverEnabled: true
+ onPressed: {
+ startX = mouseX
+ startY = mouseY
+ }
+ onPositionChanged: {
+ if (pressed && dialog.resizable) {
+ dialog.deltaSize((mouseX - startX), (mouseY - startY))
+ startX = mouseX
+ startY = mouseY
+ }
+ }
+ }
+}
diff --git a/interface/resources/qml/CustomText.qml b/interface/resources/qml/CustomText.qml
new file mode 100644
index 0000000000..83229b783e
--- /dev/null
+++ b/interface/resources/qml/CustomText.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.3
+
+Text {
+ font.family: "Helvetica"
+ font.pointSize: 18
+}
+
diff --git a/interface/resources/qml/CustomTextArea.qml b/interface/resources/qml/CustomTextArea.qml
new file mode 100644
index 0000000000..cf3308e2b7
--- /dev/null
+++ b/interface/resources/qml/CustomTextArea.qml
@@ -0,0 +1,10 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+
+TextArea {
+ font.family: "Helvetica"
+ font.pointSize: 18
+ backgroundVisible: false
+ readOnly: true
+}
+
diff --git a/interface/resources/qml/CustomTextEdit.qml b/interface/resources/qml/CustomTextEdit.qml
new file mode 100644
index 0000000000..0602bbc150
--- /dev/null
+++ b/interface/resources/qml/CustomTextEdit.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.3
+
+TextEdit {
+ font.family: "Helvetica"
+ font.pointSize: 18
+}
+
diff --git a/interface/resources/qml/CustomTextInput.qml b/interface/resources/qml/CustomTextInput.qml
new file mode 100644
index 0000000000..a706187376
--- /dev/null
+++ b/interface/resources/qml/CustomTextInput.qml
@@ -0,0 +1,34 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+
+TextInput {
+ SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+ property string helperText: ""
+ font.family: "Helvetica"
+ font.pointSize: 18
+ width: 256
+ height: 64
+ color: myPalette.text
+ clip: true
+ verticalAlignment: TextInput.AlignVCenter
+
+ onTextChanged: {
+ if (text == "") {
+ helperText.visible = true;
+ } else {
+ helperText.visible = false;
+ }
+ }
+
+ Text {
+ id: helperText
+ anchors.fill: parent
+ font.pointSize: parent.font.pointSize
+ font.family: "Helvetica"
+ verticalAlignment: TextInput.AlignVCenter
+ text: parent.helperText
+ color: myPalette.dark
+ clip: true
+ }
+}
+
diff --git a/interface/resources/qml/Icon.qml b/interface/resources/qml/Icon.qml
new file mode 100644
index 0000000000..0d60afb2b7
--- /dev/null
+++ b/interface/resources/qml/Icon.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+Image {
+id: icon
+width: 64
+height: 64
+source: "file.svg"
+}
\ No newline at end of file
diff --git a/interface/resources/qml/IconControl.qml b/interface/resources/qml/IconControl.qml
new file mode 100644
index 0000000000..346865aacb
--- /dev/null
+++ b/interface/resources/qml/IconControl.qml
@@ -0,0 +1,24 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.3
+import QtQuick.Window 2.2
+import QtQuick.Controls.Styles 1.3
+
+Button {
+ text: "Text"
+ style: ButtonStyle {
+ background: Item { anchors.fill: parent }
+ label: Text {
+ id: icon
+ width: height
+ verticalAlignment: Text.AlignVCenter
+ renderType: Text.NativeRendering
+ font.family: iconFont.name
+ font.pointSize: 18
+ property alias unicode: icon.text
+ FontLoader { id: iconFont; source: "/fonts/fontawesome-webfont.ttf"; }
+ text: control.text
+ color: control.enabled ? "white" : "dimgray"
+ }
+ }
+}
+
diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
new file mode 100644
index 0000000000..be69b65ef7
--- /dev/null
+++ b/interface/resources/qml/LoginDialog.qml
@@ -0,0 +1,191 @@
+import Hifi 1.0
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Controls.Styles 1.3
+import "hifiConstants.js" as HifiConstants
+
+CustomDialog {
+ title: "Login"
+ SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+ objectName: "LoginDialog"
+ height: 512
+ width: 384
+
+ onVisibleChanged: {
+ if (!visible) {
+ reset()
+ }
+ }
+
+ onEnabledChanged: {
+ if (enabled) {
+ username.forceActiveFocus();
+ }
+ }
+
+ function reset() {
+ username.text = ""
+ password.text = ""
+ loginDialog.statusText = ""
+ }
+
+ LoginDialog {
+ id: loginDialog
+ anchors.fill: parent
+ anchors.margins: parent.margins
+ anchors.topMargin: parent.topMargin
+ Column {
+ anchors.topMargin: 8
+ anchors.right: parent.right
+ anchors.rightMargin: 0
+ anchors.left: parent.left
+ anchors.top: parent.top
+ spacing: 8
+
+ Image {
+ height: 64
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: 64
+ source: "../images/hifi-logo.svg"
+ }
+
+ CustomBorder {
+ width: 304
+ height: 64
+ anchors.horizontalCenter: parent.horizontalCenter
+ CustomTextInput {
+ id: username
+ anchors.fill: parent
+ helperText: "Username or Email"
+ anchors.margins: 8
+ KeyNavigation.tab: password
+ KeyNavigation.backtab: password
+ onAccepted: {
+ password.forceActiveFocus()
+ }
+ }
+ }
+
+ CustomBorder {
+ width: 304
+ height: 64
+ anchors.horizontalCenter: parent.horizontalCenter
+ CustomTextInput {
+ id: password
+ anchors.fill: parent
+ echoMode: TextInput.Password
+ helperText: "Password"
+ anchors.margins: 8
+ KeyNavigation.tab: username
+ KeyNavigation.backtab: username
+ onAccepted: {
+ if (username.text == "") {
+ username.forceActiveFocus()
+ } else {
+ loginDialog.login(username.text, password.text)
+ }
+ }
+ onFocusChanged: {
+ if (password.focus) {
+ password.selectAll()
+ }
+ }
+ }
+ }
+
+ CustomText {
+ anchors.horizontalCenter: parent.horizontalCenter
+ textFormat: Text.StyledText
+ width: parent.width
+ height: 96
+ wrapMode: Text.WordWrap
+ verticalAlignment: Text.AlignVCenter
+ horizontalAlignment: Text.AlignHCenter
+ text: loginDialog.statusText
+ }
+ }
+
+ Column {
+ anchors.bottomMargin: 5
+ anchors.right: parent.right
+ anchors.rightMargin: 0
+ anchors.left: parent.left
+ anchors.bottom: parent.bottom
+
+ Rectangle {
+ width: 192
+ height: 64
+ anchors.horizontalCenter: parent.horizontalCenter
+ color: HifiConstants.color
+ border.width: 0
+ radius: 10
+
+ MouseArea {
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 0
+ anchors.top: parent.top
+ anchors.right: parent.right
+ anchors.left: parent.left
+ onClicked: {
+ loginDialog.login(username.text, password.text)
+ }
+ }
+
+ Row {
+ anchors.centerIn: parent
+ anchors.verticalCenter: parent.verticalCenter
+ spacing: 8
+ Image {
+ id: loginIcon
+ height: 32
+ width: 32
+ source: "../images/login.svg"
+ }
+ CustomText {
+ text: "Login"
+ color: "white"
+ width: 64
+ height: parent.height
+ }
+ }
+
+ }
+
+ CustomText {
+ width: parent.width
+ height: 24
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ text:"Create Account"
+ font.pointSize: 12
+ font.bold: true
+ color: HifiConstants.color
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ loginDialog.openUrl(loginDialog.rootUrl + "/signup")
+ }
+ }
+ }
+
+ CustomText {
+ width: parent.width
+ height: 24
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ font.pointSize: 12
+ text: "Recover Password"
+ color: HifiConstants.color
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ loginDialog.openUrl(loginDialog.rootUrl + "/users/password/new")
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/interface/resources/qml/Palettes.qml b/interface/resources/qml/Palettes.qml
new file mode 100644
index 0000000000..c4b0953df7
--- /dev/null
+++ b/interface/resources/qml/Palettes.qml
@@ -0,0 +1,236 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Dialogs 1.2
+import QtQuick.Controls.Styles 1.3
+
+Rectangle {
+ color: "teal"
+ height: 512
+ width: 192
+ SystemPalette { id: sp; colorGroup: SystemPalette.Active }
+ SystemPalette { id: spi; colorGroup: SystemPalette.Inactive }
+ SystemPalette { id: spd; colorGroup: SystemPalette.Disabled }
+
+ Column {
+ anchors.margins: 8
+ anchors.fill: parent
+ spacing: 8
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "base" }
+ Rectangle { height: parent.height; width: 16; color: sp.base }
+ Rectangle { height: parent.height; width: 16; color: spi.base }
+ Rectangle { height: parent.height; width: 16; color: spd.base }
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "alternateBase" }
+ Rectangle { height: parent.height; width: 16; color: sp.alternateBase }
+ Rectangle { height: parent.height; width: 16; color: spi.alternateBase }
+ Rectangle { height: parent.height; width: 16; color: spd.alternateBase }
+ }
+ Item {
+ height: 16
+ width:parent.width
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "dark" }
+ Rectangle { height: parent.height; width: 16; color: sp.dark }
+ Rectangle { height: parent.height; width: 16; color: spi.dark }
+ Rectangle { height: parent.height; width: 16; color: spd.dark }
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "mid" }
+ Rectangle { height: parent.height; width: 16; color: sp.mid }
+ Rectangle { height: parent.height; width: 16; color: spi.mid }
+ Rectangle { height: parent.height; width: 16; color: spd.mid }
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "mid light" }
+ Rectangle { height: parent.height; width: 16; color: sp.midlight }
+ Rectangle { height: parent.height; width: 16; color: spi.midlight }
+ Rectangle { height: parent.height; width: 16; color: spd.midlight }
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "light" }
+ Rectangle { height: parent.height; width: 16; color: sp.light}
+ Rectangle { height: parent.height; width: 16; color: spi.light}
+ Rectangle { height: parent.height; width: 16; color: spd.light}
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "shadow" }
+ Rectangle { height: parent.height; width: 16; color: sp.shadow}
+ Rectangle { height: parent.height; width: 16; color: spi.shadow}
+ Rectangle { height: parent.height; width: 16; color: spd.shadow}
+ }
+ Item {
+ height: 16
+ width:parent.width
+ }
+
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "text" }
+ Rectangle { height: parent.height; width: 16; color: sp.text }
+ Rectangle { height: parent.height; width: 16; color: spi.text }
+ Rectangle { height: parent.height; width: 16; color: spd.text }
+ }
+ Item {
+ height: 16
+ width:parent.width
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "window" }
+ Rectangle { height: parent.height; width: 16; color: sp.window }
+ Rectangle { height: parent.height; width: 16; color: spi.window }
+ Rectangle { height: parent.height; width: 16; color: spd.window }
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "window text" }
+ Rectangle { height: parent.height; width: 16; color: sp.windowText }
+ Rectangle { height: parent.height; width: 16; color: spi.windowText }
+ Rectangle { height: parent.height; width: 16; color: spd.windowText }
+ }
+ Item {
+ height: 16
+ width:parent.width
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "button" }
+ Rectangle { height: parent.height; width: 16; color: sp.button }
+ Rectangle { height: parent.height; width: 16; color: spi.button }
+ Rectangle { height: parent.height; width: 16; color: spd.button }
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "buttonText" }
+ Rectangle { height: parent.height; width: 16; color: sp.buttonText }
+ Rectangle { height: parent.height; width: 16; color: spi.buttonText }
+ Rectangle { height: parent.height; width: 16; color: spd.buttonText }
+ }
+ Item {
+ height: 16
+ width:parent.width
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "highlight" }
+ Rectangle { height: parent.height; width: 16; color: sp.highlight }
+ Rectangle { height: parent.height; width: 16; color: spi.highlight }
+ Rectangle { height: parent.height; width: 16; color: spd.highlight }
+ }
+ Row {
+ width: parent.width
+ height: 16
+ Text { height: parent.height; width: 128; text: "highlighted text" }
+ Rectangle { height: parent.height; width: 16; color: sp.highlightedText}
+ Rectangle { height: parent.height; width: 16; color: spi.highlightedText}
+ Rectangle { height: parent.height; width: 16; color: spd.highlightedText}
+ }
+ }
+
+
+/*
+ CustomDialog {
+ title: "Test Dlg"
+ anchors.fill: parent
+
+ Rectangle {
+ property int d: 100
+ id: square
+ objectName: "testRect"
+ width: d
+ height: d
+ anchors.centerIn: parent
+ color: "red"
+ NumberAnimation on rotation { from: 0; to: 360; duration: 2000; loops: Animation.Infinite; }
+ }
+
+
+ CustomTextEdit {
+ anchors.left: parent.left
+ anchors.leftMargin: 12
+ anchors.right: parent.right
+ anchors.rightMargin: 12
+ clip: true
+ text: "test edit"
+ anchors.top: parent.top
+ anchors.topMargin: parent.titleSize + 12
+ }
+
+ CustomButton {
+ x: 128
+ y: 192
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 12
+ anchors.right: parent.right
+ anchors.rightMargin: 12
+ onClicked: {
+ console.log("Click");
+ if (square.visible) {
+ square.visible = false
+ } else {
+ square.visible = true
+ }
+ }
+ }
+
+ CustomButton {
+ id: customButton2
+ y: 192
+ text: "Close"
+ anchors.left: parent.left
+ anchors.leftMargin: 12
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 12
+ onClicked: {
+ onClicked: testDialog.x == 0 ? testDialog.x = 200 : testDialog.x = 0
+ }
+ }
+
+ Keys.onPressed: {
+ console.log("Key " + event.key);
+ switch (event.key) {
+ case Qt.Key_Q:
+ if (Qt.ControlModifier == event.modifiers) {
+ event.accepted = true;
+ break;
+ }
+ }
+ }
+ }
+*/
+
+}
+
+
+/*
+
+// This is the behavior, and it applies a NumberAnimation to any attempt to set the x property
+
+MouseArea {
+ anchors.fill: parent
+}
+*/
diff --git a/interface/resources/qml/Root.qml b/interface/resources/qml/Root.qml
new file mode 100644
index 0000000000..9422ef123d
--- /dev/null
+++ b/interface/resources/qml/Root.qml
@@ -0,0 +1,9 @@
+import Hifi 1.0
+import QtQuick 2.3
+
+Root {
+ id: root
+ width: 1280
+ height: 720
+}
+
diff --git a/interface/resources/qml/TestDialog.qml b/interface/resources/qml/TestDialog.qml
new file mode 100644
index 0000000000..1fe8676bc6
--- /dev/null
+++ b/interface/resources/qml/TestDialog.qml
@@ -0,0 +1,106 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Dialogs 1.2
+import QtQuick.Controls.Styles 1.3
+
+CustomDialog {
+ title: "Test Dialog"
+ id: testDialog
+ objectName: "TestDialog"
+ width: 512
+ height: 512
+ animationDuration: 200
+
+ onEnabledChanged: {
+ if (enabled) {
+ edit.forceActiveFocus();
+ }
+ }
+
+ Item {
+ id: clientArea
+ // The client area
+ anchors.fill: parent
+ anchors.margins: parent.margins
+ anchors.topMargin: parent.topMargin
+
+ Rectangle {
+ property int d: 100
+ id: square
+ objectName: "testRect"
+ width: d
+ height: d
+ anchors.centerIn: parent
+ color: "red"
+ NumberAnimation on rotation { from: 0; to: 360; duration: 2000; loops: Animation.Infinite; }
+ }
+
+
+ CustomTextEdit {
+ id: edit
+ anchors.left: parent.left
+ anchors.leftMargin: 12
+ anchors.right: parent.right
+ anchors.rightMargin: 12
+ clip: true
+ text: "test edit"
+ anchors.top: parent.top
+ anchors.topMargin: 12
+ }
+
+ CustomButton {
+ x: 128
+ y: 192
+ text: "Test"
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 12
+ anchors.right: parent.right
+ anchors.rightMargin: 12
+ onClicked: {
+ console.log("Click");
+
+ if (square.visible) {
+ square.visible = false
+ } else {
+ square.visible = true
+ }
+ }
+ }
+
+ CustomButton {
+ id: customButton2
+ y: 192
+ text: "Move"
+ anchors.left: parent.left
+ anchors.leftMargin: 12
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 12
+ onClicked: {
+ onClicked: testDialog.x == 0 ? testDialog.x = 200 : testDialog.x = 0
+ }
+ }
+
+ Keys.onPressed: {
+ console.log("Key " + event.key);
+ switch (event.key) {
+ case Qt.Key_Q:
+ if (Qt.ControlModifier == event.modifiers) {
+ event.accepted = true;
+ break;
+ }
+ }
+ }
+ }
+
+}
+
+
+/*
+
+// This is the behavior, and it applies a NumberAnimation to any attempt to set the x property
+
+MouseArea {
+ anchors.fill: parent
+}
+*/
diff --git a/interface/resources/qml/TestRoot.qml b/interface/resources/qml/TestRoot.qml
new file mode 100644
index 0000000000..158c0b7a54
--- /dev/null
+++ b/interface/resources/qml/TestRoot.qml
@@ -0,0 +1,35 @@
+import Hifi 1.0
+import QtQuick 2.3
+
+Root {
+ id: root
+ width: 1280
+ height: 720
+
+ CustomButton {
+ id: messageBox
+ anchors.right: createDialog.left
+ anchors.rightMargin: 24
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 24
+ text: "Message"
+ onClicked: {
+ console.log("Foo")
+ root.information("a")
+ console.log("Bar")
+ }
+ }
+
+ CustomButton {
+ id: createDialog
+ anchors.right: parent.right
+ anchors.rightMargin: 24
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 24
+ text: "Create"
+ onClicked: {
+ root.loadChild("TestDialog.qml");
+ }
+ }
+}
+
diff --git a/interface/resources/qml/componentCreation.js b/interface/resources/qml/componentCreation.js
new file mode 100644
index 0000000000..15a828d6f8
--- /dev/null
+++ b/interface/resources/qml/componentCreation.js
@@ -0,0 +1,29 @@
+var component;
+var instance;
+var parent;
+
+function createObject(parentObject, url) {
+ parent = parentObject;
+ component = Qt.createComponent(url);
+ if (component.status == Component.Ready)
+ finishCreation();
+ else
+ component.statusChanged.connect(finishCreation);
+}
+
+function finishCreation() {
+ if (component.status == Component.Ready) {
+ instance = component.createObject(parent, {"x": 100, "y": 100});
+ if (instance == null) {
+ // Error Handling
+ console.log("Error creating object");
+ } else {
+ instance.enabled = true
+ }
+ } else if (component.status == Component.Error) {
+ // Error Handling
+ console.log("Error loading component:", component.errorString());
+ } else {
+ console.log("Unknown component status: " + component.status);
+ }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/hifiConstants.js b/interface/resources/qml/hifiConstants.js
new file mode 100644
index 0000000000..860226c963
--- /dev/null
+++ b/interface/resources/qml/hifiConstants.js
@@ -0,0 +1,4 @@
+var color = "#0e7077"
+var Colors = {
+ hifiBlue: "#0e7077"
+}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 34825ee725..1df771f127 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -135,6 +135,7 @@
#include "ui/Snapshot.h"
#include "ui/StandAloneJSConsole.h"
#include "ui/Stats.h"
+#include "ui/AddressBarDialog.h"
// ON WIndows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
#if defined(Q_OS_WIN)
@@ -207,8 +208,12 @@ public:
void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
QString logMessage = LogHandler::getInstance().printMessage((LogMsgType) type, context, message);
-
+
if (!logMessage.isEmpty()) {
+#ifdef Q_OS_WIN
+ OutputDebugStringA(logMessage.toLocal8Bit().constData());
+ OutputDebugStringA("\n");
+#endif
Application::getInstance()->getLogger()->addMessage(qPrintable(logMessage + "\n"));
}
}
@@ -257,6 +262,7 @@ bool setupEssentials(int& argc, char** argv) {
#endif
auto discoverabilityManager = DependencyManager::set