From af789f842dabe3837777ebd85ebadc823d9712c8 Mon Sep 17 00:00:00 2001 From: Stojce Slavkovski Date: Tue, 17 Mar 2015 22:47:18 +0100 Subject: [PATCH 1/9] #20397 initial version of script --- examples/example/entities/makeHouses.js | 146 ++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 examples/example/entities/makeHouses.js diff --git a/examples/example/entities/makeHouses.js b/examples/example/entities/makeHouses.js new file mode 100644 index 0000000000..26224fd58a --- /dev/null +++ b/examples/example/entities/makeHouses.js @@ -0,0 +1,146 @@ +// +// makeHouses.js +// +// +// Created by Stojce Slavkovski on March 14, 2015 +// Copyright 2015 High Fidelity, Inc. +// +// This sample script that creates house entities based on parameters. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +(function () { + + /** options **/ + var numHouses = 100; + var xRange = 300; + var yRange = 300; + + var sizeOfTheHouse = { + x: 10, + y: 10, + z: 10 + }; + /**/ + + var modelUrl = "http://localhost/~stojce/models/3-Buildings-2-SanFranciscoHouse-"; + var modelurlExt = ".fbx"; + var modelVariations = 90; + var houses = []; + + function addHouseAt(position, rotation) { + // get random house model + var modelNumber = 1 + Math.floor(Math.random() * (modelVariations - 1)); + var modUrl = modelUrl + modelNumber + modelurlExt; + print("Model ID:" + modelNumber); + + var properties = { + type: "Model", + position: position, + rotation: rotation, + dimensions: sizeOfTheHouse, + modelURL: modUrl + }; + + return Entities.addEntity(properties); + } + + // calculate initial position + var posX = MyAvatar.position.x - (xRange / 2); + var measures = calculateParcels(numHouses, xRange, yRange); + var dd = 0; + + // avatar facing rotation + var rotEven = Quat.fromPitchYawRollDegrees(0, 270.0 + MyAvatar.bodyYaw, 0.0); + + // avatar opposite rotation + var rotOdd = Quat.fromPitchYawRollDegrees(0, 90.0 + MyAvatar.bodyYaw, 0.0); + var housePos = Vec3.sum(MyAvatar.position, Quat.getFront(Camera.getOrientation())); + + for (var j = 0; j < measures.rows; j++) { + + var posX1 = 0 - (xRange / 2); + dd += measures.parcelLength; + + for (var i = 0; i < measures.cols; i++) { + + // skip reminder of houses + if (houses.length > numHouses) { + break; + } + + var posShift = { + x: posX1, + y: 0, + z: dd + }; + + print("House nr.:" + houses.length + 1); + houses.push( + addHouseAt(Vec3.sum(housePos, posShift), (j % 2 == 0) ? rotEven : rotOdd) + ); + posX1 += measures.parcelWidth; + } + } + + // calculate rows and columns in area, and dimension of single parcel + function calculateParcels(items, areaWidth, areaLength) { + + var idealSize = Math.min(Math.sqrt(areaWidth * areaLength / items), areaWidth, areaLength); + + var baseWidth = Math.min(Math.floor(areaWidth / idealSize), items); + var baseLength = Math.min(Math.floor(areaLength / idealSize), items); + + var sirRows = baseWidth; + var sirCols = Math.ceil(items / sirRows); + var sirW = areaWidth / sirRows; + var sirL = areaLength / sirCols; + + var visCols = baseLength; + var visRows = Math.ceil(items / visCols); + var visW = areaWidth / visRows; + var visL = areaLength / visCols; + + var rows = 0; + var cols = 0; + var parcelWidth = 0; + var parcelLength = 0; + + if (Math.min(sirW, sirL) > Math.min(visW, visL)) { + rows = sirRows; + cols = sirCols; + parcelWidth = sirW; + parcelLength = sirL; + } else { + rows = visRows; + cols = visCols; + parcelWidth = visW; + parcelLength = visL; + } + + print("rows:" + rows); + print("cols:" + cols); + print("parcelWidth:" + parcelWidth); + print("parcelLength:" + parcelLength); + + return { + rows: rows, + cols: cols, + parcelWidth: parcelWidth, + parcelLength: parcelLength + }; + } + + function cleanup() { + while (houses.length > 0) { + if (!houses[0].isKnownID) { + houses[0] = Entities.identifyEntity(houses[0]); + } + Entities.deleteEntity(houses.shift()); + } + } + + Script.scriptEnding.connect(cleanup); +})(); \ No newline at end of file From 00f1d96af5060180a375a8cbf7b9deb35cbeeb79 Mon Sep 17 00:00:00 2001 From: Stojce Slavkovski Date: Wed, 18 Mar 2015 19:30:08 +0100 Subject: [PATCH 2/9] Use existing house models --- examples/example/entities/makeHouses.js | 33 ++++++++++++++++++------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/examples/example/entities/makeHouses.js b/examples/example/entities/makeHouses.js index 26224fd58a..12205db4ce 100644 --- a/examples/example/entities/makeHouses.js +++ b/examples/example/entities/makeHouses.js @@ -25,23 +25,38 @@ }; /**/ - var modelUrl = "http://localhost/~stojce/models/3-Buildings-2-SanFranciscoHouse-"; - var modelurlExt = ".fbx"; - var modelVariations = 90; + // + // var modelUrl = "http://localhost/~stojce/models/3-Buildings-2-SanFranciscoHouse-"; + // var modelurlExt = ".fbx"; + // var modelVariations = 100; + + var houseModels = [ + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseBlue.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseBlue3.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseGreen.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseGreen2.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseRed.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseRose.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseViolet.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseYellow.fbx", + "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseYellow2.fbx" + ]; + var houses = []; function addHouseAt(position, rotation) { // get random house model - var modelNumber = 1 + Math.floor(Math.random() * (modelVariations - 1)); - var modUrl = modelUrl + modelNumber + modelurlExt; - print("Model ID:" + modelNumber); - + //var modelNumber = 1 + Math.floor(Math.random() * (modelVariations - 1)); + //var modelUrl = modelUrl + modelNumber + modelurlExt; + //print("Model ID:" + modelNumber); + var modelUrl = houseModels[Math.floor(Math.random() * houseModels.length)]; + var properties = { type: "Model", position: position, rotation: rotation, dimensions: sizeOfTheHouse, - modelURL: modUrl + modelURL: modelUrl }; return Entities.addEntity(properties); @@ -77,7 +92,7 @@ z: dd }; - print("House nr.:" + houses.length + 1); + print("House nr.:" + (houses.length + 1)); houses.push( addHouseAt(Vec3.sum(housePos, posShift), (j % 2 == 0) ? rotEven : rotOdd) ); From 57011c2d4bd1fc0f423b5069460ac2e003653f42 Mon Sep 17 00:00:00 2001 From: Stojce Slavkovski Date: Thu, 19 Mar 2015 20:55:18 +0100 Subject: [PATCH 3/9] get models from S3 --- examples/example/entities/makeHouses.js | 46 +++++++++++-------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/examples/example/entities/makeHouses.js b/examples/example/entities/makeHouses.js index 12205db4ce..37bc1d5a8e 100644 --- a/examples/example/entities/makeHouses.js +++ b/examples/example/entities/makeHouses.js @@ -20,36 +20,32 @@ var sizeOfTheHouse = { x: 10, - y: 10, + y: 15, z: 10 }; - /**/ - - // - // var modelUrl = "http://localhost/~stojce/models/3-Buildings-2-SanFranciscoHouse-"; - // var modelurlExt = ".fbx"; - // var modelVariations = 100; - var houseModels = [ - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseBlue.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseBlue3.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseGreen.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseGreen2.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseRed.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseRose.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseViolet.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseYellow.fbx", - "http://public.highfidelity.io/models/entities/3-Buildings-2-SanFranciscoHouseYellow2.fbx" - ]; - + var randomizeModels = false; + /**/ + + var modelUrlPrefix = "http://public.highfidelity.io/load_testing/3-Buildings-2-SanFranciscoHouse-"; + var modelurlExt = ".fbx"; + var modelVariations = 100; + var houses = []; function addHouseAt(position, rotation) { - // get random house model - //var modelNumber = 1 + Math.floor(Math.random() * (modelVariations - 1)); - //var modelUrl = modelUrl + modelNumber + modelurlExt; - //print("Model ID:" + modelNumber); - var modelUrl = houseModels[Math.floor(Math.random() * houseModels.length)]; + // get house model + var modelNumber = randomizeModels ? + 1 + Math.floor(Math.random() * (modelVariations - 1)) : + (houses.length + 1) % modelVariations; + + if (modelNumber == 0) { + modelNumber = modelVariations; + } + + var modelUrl = modelUrlPrefix + (modelNumber + "") + modelurlExt; + print("Model ID:" + modelNumber); + print("Model URL:" + modelUrl); var properties = { type: "Model", @@ -158,4 +154,4 @@ } Script.scriptEnding.connect(cleanup); -})(); \ No newline at end of file +})(); From 1a6865b41bfe2600bc8b5e7be777d23fa6d40612 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 24 Mar 2015 12:26:32 -0700 Subject: [PATCH 4/9] send immediate location update when domain changes --- interface/src/Application.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ad6a0d86ce..c21d221303 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -382,6 +382,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : auto discoverabilityManager = DependencyManager::get(); connect(locationUpdateTimer, &QTimer::timeout, discoverabilityManager.data(), &DiscoverabilityManager::updateLocation); locationUpdateTimer->start(DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS); + + // if we get a domain change, immediately attempt update location in metaverse server + connect(&nodeList->getDomainHandler(), &DomainHandler::connectedToDomain, + discoverabilityManager.data(), &DiscoverabilityManager::updateLocation); connect(nodeList.data(), &NodeList::nodeAdded, this, &Application::nodeAdded); connect(nodeList.data(), &NodeList::nodeKilled, this, &Application::nodeKilled); @@ -3295,11 +3299,6 @@ void Application::connectedToDomain(const QString& hostname) { const QUuid& domainID = DependencyManager::get()->getDomainHandler().getUUID(); if (accountManager.isLoggedIn() && !domainID.isNull()) { - // update our data-server with the domain-server we're logged in with - QString domainPutJsonString = "{\"location\":{\"domain_id\":\"" + uuidStringWithoutCurlyBraces(domainID) + "\"}}"; - accountManager.authenticatedRequest("/api/v1/user/location", QNetworkAccessManager::PutOperation, - JSONCallbackParameters(), domainPutJsonString.toUtf8()); - _notifiedPacketVersionMismatchThisDomain = false; } } From 6c941d73d5a503671bc8f600273f7043ec4bb5ff Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 24 Mar 2015 13:34:14 -0700 Subject: [PATCH 5/9] Update edit.js help --- .../html/edit-entities-commands.html | 3832 +++++++++-------- 1 file changed, 1927 insertions(+), 1905 deletions(-) diff --git a/interface/resources/html/edit-entities-commands.html b/interface/resources/html/edit-entities-commands.html index afa662f089..65b985fb6a 100644 --- a/interface/resources/html/edit-entities-commands.html +++ b/interface/resources/html/edit-entities-commands.html @@ -2,2035 +2,2057 @@
- + - Edit Entity Help + - - - - - + - - - - - - - - - + + + + + + - - - - - - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - - - + S213.7,23.8,213.7,25.1z"/> + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + - + c0.2-0.2,0.5-0.2,0.8,0l1.8,1.2l3.1-4.4l-4.4-3.1L58,205c-0.1,0.2-0.3,0.3-0.4,0.3c-0.1,0-0.2,0-0.3,0c-0.3-0.1-0.5-0.3-0.5-0.5 + l-0.9-4.7c-0.1-0.4,0.2-0.7,0.6-0.8l4.7-0.9c0.3-0.1,0.5,0.1,0.7,0.3c0.2,0.2,0.2,0.5,0,0.8l-1.2,1.8l4.4,3.1l3.1-4.4l-1.8-1.2 + c-0.2-0.2-0.3-0.4-0.3-0.7c0.1-0.3,0.3-0.5,0.5-0.5l4.7-0.9c0.4-0.1,0.7,0.2,0.8,0.6l0.9,4.7c0.1,0.3-0.1,0.5-0.3,0.7 + c-0.1,0-0.2,0.1-0.3,0.1c-0.2,0-0.4,0-0.5-0.1l-1.8-1.2L67.1,205.6z"/> - + c-0.1,0-0.2,0.1-0.3,0.1c-0.2,0-0.4,0-0.5-0.1l-1.8-1.2L67.1,269.3z"/> - + c-0.1,0-0.2,0.1-0.3,0.1c-0.2,0-0.4,0-0.5-0.1l-1.8-1.2L67.1,332.3z"/> - - - - + + + + - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + c-0.1,0-0.2,0.1-0.3,0.1c-0.2,0-0.4,0-0.5-0.1l-1.8-1.2L687.1,208.4z"/> - - - - - + + + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - + - + + + + + + + + + + - + + + + + + + + - - - - + + + + + + + + + + + + + c-0.1,0-0.2,0.1-0.3,0.1c-0.2,0-0.4,0-0.5-0.1l-1.8-1.2L631.5,270.6z"/> - + - + - + - + - - - - + + + + - + - + - + - + - - - + + +
From 3f986229d150875275a868ab940a37766a11988b Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 24 Mar 2015 13:43:10 -0700 Subject: [PATCH 6/9] Rename edit-entities-commands.html to edit-commands.html --- .../html/{edit-entities-commands.html => edit-commands.html} | 0 interface/src/Application.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename interface/resources/html/{edit-entities-commands.html => edit-commands.html} (100%) diff --git a/interface/resources/html/edit-entities-commands.html b/interface/resources/html/edit-commands.html similarity index 100% rename from interface/resources/html/edit-entities-commands.html rename to interface/resources/html/edit-commands.html diff --git a/interface/src/Application.h b/interface/src/Application.h index 4038b21739..898db76f07 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -113,7 +113,7 @@ static const float MIRROR_FIELD_OF_VIEW = 30.0f; static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS_PER_SECOND; static const QString INFO_HELP_PATH = "html/interface-welcome.html"; -static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-entities-commands.html"; +static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html"; #ifdef Q_OS_WIN static const UINT UWM_IDENTIFY_INSTANCES = From 045dbb11a369ba3b4e7e0675e41dbc5a12f6f955 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 25 Mar 2015 11:07:19 -0700 Subject: [PATCH 7/9] Putting the GLERRORCHECK only in debug --- libraries/gpu/src/gpu/GLBackendShared.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/gpu/src/gpu/GLBackendShared.h b/libraries/gpu/src/gpu/GLBackendShared.h index 1853573522..f51e455447 100644 --- a/libraries/gpu/src/gpu/GLBackendShared.h +++ b/libraries/gpu/src/gpu/GLBackendShared.h @@ -49,7 +49,10 @@ static const GLenum _elementTypeToGLType[NUM_TYPES]= { GL_UNSIGNED_BYTE }; +#if _DEBUG #define CHECK_GL_ERROR() ::gpu::GLBackend::checkGLError() -//#define CHECK_GL_ERROR() +#else +#define CHECK_GL_ERROR() +#endif #endif From c3c1d4a5ae3d1c4d1d7c1c65ee56657fac0f5b34 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Wed, 25 Mar 2015 12:36:37 -0600 Subject: [PATCH 8/9] Switching to .com --- interface/src/ui/LoginDialog.cpp | 2 +- interface/ui/loginDialog.ui | 4 ++-- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/script-engine/src/XMLHttpRequestClass.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 004f863901..4e7a4a7dc9 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -23,7 +23,7 @@ #include "LoginDialog.h" #include "UIUtil.h" -const QString FORGOT_PASSWORD_URL = "https://metaverse.highfidelity.io/users/password/new"; +const QString FORGOT_PASSWORD_URL = "https://metaverse.highfidelity.com/users/password/new"; LoginDialog::LoginDialog(QWidget* parent) : FramelessDialog(parent, 0, FramelessDialog::POSITION_TOP), diff --git a/interface/ui/loginDialog.ui b/interface/ui/loginDialog.ui index c986db7f50..58ff353a16 100644 --- a/interface/ui/loginDialog.ui +++ b/interface/ui/loginDialog.ui @@ -136,7 +136,7 @@ <style type="text/css"> a { text-decoration: none; color: #267077;} </style> -Invalid username or password. <a href="https://metaverse.highfidelity.io/password/new">Recover?</a> +Invalid username or password. <a href="https://metaverse.highfidelity.com/password/new">Recover?</a> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -458,7 +458,7 @@ border-radius: 4px; padding-top: 1px; <style type="text/css"> a { text-decoration: none; color: #267077;} </style> -<a href="https://metaverse.highfidelity.io/password/new">Recover password?</a> +<a href="https://metaverse.highfidelity.com/password/new">Recover password?</a> true diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 98e1ed0572..ebd10b67a6 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -36,7 +36,7 @@ const char SOLO_NODE_TYPES[2] = { NodeType::AudioMixer }; -const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://metaverse.highfidelity.io"); +const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://metaverse.highfidelity.com"); LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short dtlsListenPort) : linkedDataCreateCallback(NULL), diff --git a/libraries/script-engine/src/XMLHttpRequestClass.cpp b/libraries/script-engine/src/XMLHttpRequestClass.cpp index 116548db61..8755527860 100644 --- a/libraries/script-engine/src/XMLHttpRequestClass.cpp +++ b/libraries/script-engine/src/XMLHttpRequestClass.cpp @@ -207,7 +207,7 @@ void XMLHttpRequestClass::open(const QString& method, const QString& url, bool a notImplemented(); } } else { - if (url.toLower().left(33) == "https://metaverse.highfidelity.io/api/") { + if (url.toLower().left(33) == "https://metaverse.highfidelity.com/api/") { AccountManager& accountManager = AccountManager::getInstance(); if (accountManager.hasValidAccessToken()) { From d1d183e190b58205d811a507bf0c10ecd06d9df6 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Wed, 25 Mar 2015 13:05:10 -0600 Subject: [PATCH 9/9] More .com changes --- domain-server/resources/describe-settings.json | 4 ++-- domain-server/resources/web/js/settings.js | 6 +++--- examples/edit.js | 2 +- examples/libraries/modelUploader.js | 6 +++--- examples/lobby.js | 2 +- examples/users.js | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 4636c61367..0082bd84ae 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -6,7 +6,7 @@ { "name": "access_token", "label": "Access Token", - "help": "This is an access token generated on the My Security page of your High Fidelity account.
Generate a token with the 'domains' scope and paste it here.
This is required to associate this domain-server with a domain in your account." + "help": "This is an access token generated on the My Security page of your High Fidelity account.
Generate a token with the 'domains' scope and paste it here.
This is required to associate this domain-server with a domain in your account." }, { "name": "id", @@ -30,7 +30,7 @@ }, { "value": "disabled", - "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.io" + "label": "None: use the network information I have entered for this domain at metaverse.highfidelity.com" } ] }, diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js index f62515c863..4fac753959 100644 --- a/domain-server/resources/web/js/settings.js +++ b/domain-server/resources/web/js/settings.js @@ -652,7 +652,7 @@ function chooseFromHighFidelityDomains(clickedButton) { clickedButton.attr('disabled', 'disabled') // get a list of user domains from data-web - data_web_domains_url = "https://metaverse.highfidelity.io/api/v1/domains?access_token=" + data_web_domains_url = "https://metaverse.highfidelity.com/api/v1/domains?access_token=" $.getJSON(data_web_domains_url + Settings.initialValues.metaverse.access_token, function(data){ modal_buttons = { @@ -682,7 +682,7 @@ function chooseFromHighFidelityDomains(clickedButton) { modal_buttons["success"] = { label: 'Create new domain', callback: function() { - window.open("https://metaverse.highfidelity.io/user/domains", '_blank'); + window.open("https://metaverse.highfidelity.com/user/domains", '_blank'); } } modal_body = "

You do not have any domains in your High Fidelity account." + @@ -708,4 +708,4 @@ function chooseFromHighFidelityDomains(clickedButton) { title: "Access token required" }) } -} \ No newline at end of file +} diff --git a/examples/edit.js b/examples/edit.js index 72938e5ed4..70e51823b2 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -130,7 +130,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", { visible: false, }); -var MARKETPLACE_URL = "https://metaverse.highfidelity.io/marketplace"; +var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; var marketplaceWindow = new WebWindow('Marketplace', MARKETPLACE_URL, 900, 700, false); marketplaceWindow.setVisible(false); diff --git a/examples/libraries/modelUploader.js b/examples/libraries/modelUploader.js index fcc96854ab..64a9e91203 100644 --- a/examples/libraries/modelUploader.js +++ b/examples/libraries/modelUploader.js @@ -21,8 +21,8 @@ modelUploader = (function () { //svoBuffer, mapping, geometry, - API_URL = "https://metaverse.highfidelity.io/api/v1/models", - MODEL_URL = "http://public.highfidelity.io/models/content", + API_URL = "https://metaverse.highfidelity.com/api/v1/models", + MODEL_URL = "http://public.highfidelity.com/models/content", NAME_FIELD = "name", SCALE_FIELD = "scale", FILENAME_FIELD = "filename", @@ -690,4 +690,4 @@ modelUploader = (function () { }; return that; -}()); \ No newline at end of file +}()); diff --git a/examples/lobby.js b/examples/lobby.js index 5d687dc07a..381107d65a 100644 --- a/examples/lobby.js +++ b/examples/lobby.js @@ -158,7 +158,7 @@ var places = {}; function changeLobbyTextures() { var req = new XMLHttpRequest(); - req.open("GET", "https://metaverse.highfidelity.io/api/v1/places?limit=21", false); + req.open("GET", "https://metaverse.highfidelity.com/api/v1/places?limit=21", false); req.send(); places = JSON.parse(req.responseText).data.places; diff --git a/examples/users.js b/examples/users.js index dec141127e..22fe89389f 100644 --- a/examples/users.js +++ b/examples/users.js @@ -34,7 +34,7 @@ var usersWindow = (function () { usersOnline, // Raw users data linesOfUsers = [], // Array of indexes pointing into usersOnline - API_URL = "https://metaverse.highfidelity.io/api/v1/users?status=online", + API_URL = "https://metaverse.highfidelity.com/api/v1/users?status=online", HTTP_GET_TIMEOUT = 60000, // ms = 1 minute usersRequest, processUsers,