"
if (_.has(values, groupName) && _.has(values[groupName], setting.name)) {
setting_value = values[groupName][setting.name]
@@ -21,14 +31,18 @@ var viewHelpers = {
label_class += ' locked'
}
+ common_attrs = " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
+ + " " + Settings.TRIGGER_CHANGE_CLASS + "' data-short-name='" + setting.name + "' name='" + setting_name + "' "
+
if (setting.type === 'checkbox') {
form_group += "
"
form_group += "
"
form_group += "";
form_group += "
"
+ } else if (setting.type === 'table') {
+ form_group += makeTable(setting, setting_name, setting_value);
} else {
input_type = _.has(setting, 'type') ? setting.type : "text"
@@ -39,15 +53,20 @@ var viewHelpers = {
_.each(setting.options, function(option) {
form_group += "
"
+ (option.value == setting_value ? 'selected' : '') + ">" + option.label + ""
})
form_group += ""
- form_group += "
"
+ form_group += "
"
} else {
- form_group += "
"
}
@@ -69,18 +88,44 @@ $(document).ready(function(){
*/
$('[data-clampedwidth]').each(function () {
- var elem = $(this);
- var parentPanel = elem.data('clampedwidth');
- var resizeFn = function () {
- var sideBarNavWidth = $(parentPanel).width() - parseInt(elem.css('paddingLeft')) - parseInt(elem.css('paddingRight')) - parseInt(elem.css('marginLeft')) - parseInt(elem.css('marginRight')) - parseInt(elem.css('borderLeftWidth')) - parseInt(elem.css('borderRightWidth'));
- elem.css('width', sideBarNavWidth);
- };
+ var elem = $(this);
+ var parentPanel = elem.data('clampedwidth');
+ var resizeFn = function () {
+ var sideBarNavWidth = $(parentPanel).width() - parseInt(elem.css('paddingLeft')) - parseInt(elem.css('paddingRight')) - parseInt(elem.css('marginLeft')) - parseInt(elem.css('marginRight')) - parseInt(elem.css('borderLeftWidth')) - parseInt(elem.css('borderRightWidth'));
+ elem.css('width', sideBarNavWidth);
+ };
- resizeFn();
- $(window).resize(resizeFn);
+ resizeFn();
+ $(window).resize(resizeFn);
+ })
+
+ $('#settings-form').on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
+ addTableRow(this);
+ })
+
+ $('#settings-form').on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
+ deleteTableRow(this);
})
- $('#settings-form').on('change', 'input', function(){
+ $('#settings-form').on('keypress', 'table input', function(e){
+ if (e.keyCode == 13) {
+ // capture enter in table input
+ // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
+ sibling = $(this).parent('td').next();
+
+ if (sibling.hasClass(Settings.DATA_COL_CLASS)) {
+ // set focus to next input
+ sibling.find('input').focus()
+ } else if (sibling.hasClass(Settings.TABLE_BUTTONS_CLASS)) {
+ sibling.find('.' + Settings.ADD_ROW_BUTTON_CLASS).click()
+
+ // set focus to the first input in the new row
+ $(this).closest('table').find('tr.inputs input:first').focus()
+ }
+ }
+ });
+
+ $('#settings-form').on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
// this input was changed, add the changed data attribute to it
$(this).attr('data-changed', true)
@@ -89,7 +134,7 @@ $(document).ready(function(){
$('#advanced-toggle-button').click(function(){
Settings.showAdvanced = !Settings.showAdvanced
- var advancedSelector = $('.advanced-setting')
+ var advancedSelector = $('.' + Settings.ADVANCED_CLASS)
if (Settings.showAdvanced) {
advancedSelector.show()
@@ -107,7 +152,6 @@ $(document).ready(function(){
})
$('#settings-form').on('change', 'select', function(){
- console.log("Changed" + $(this))
$("input[name='" + $(this).attr('data-hidden-input') + "']").val($(this).val()).change()
})
@@ -177,29 +221,126 @@ $('body').on('click', '.save-button', function(e){
if (data.status == "success") {
showRestartModal();
} else {
- showAlertMessage(SETTINGS_ERROR_MESSAGE, false);
+ showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
reloadSettings();
}
}).fail(function(){
- showAlertMessage(SETTINGS_ERROR_MESSAGE, false);
+ showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
reloadSettings();
});
return false;
});
-function badgeSidebarForDifferences(changedInput) {
+function makeTable(setting, setting_name, setting_value) {
+ var isArray = !_.has(setting, 'key')
+
+ var html = "
"
+ html += "
" + setting.help + ""
+ html += "
"
+
+ // Column names
+ html += ""
+
+ // populate rows in the table from existing values
+ var row_num = 1
+
+ _.each(setting_value, function(row, indexOrName) {
+ html += ""
+
+ if (setting.numbered === true) {
+ html += "| " + row_num + " | "
+ }
+
+ if (setting.key) {
+ html += "" + indexOrName + " | "
+ }
+
+ _.each(setting.columns, function(col) {
+ html += ""
+
+ if (isArray) {
+ colIsArray = _.isArray(row)
+ colValue = colIsArray ? row : row[col.name]
+ html += colValue
+
+ // for arrays we add a hidden input to this td so that values can be posted appropriately
+ html += ""
+ } else if (row.hasOwnProperty(col.name)) {
+ html += row[col.name]
+ }
+
+ html += " | "
+ })
+
+ html += " | "
+ html += "
"
+
+ row_num++
+ })
+
+ // populate inputs in the table for new values
+ html += makeTableInputs(setting)
+ html += "
"
+
+ return html;
+}
+
+function makeTableInputs(setting) {
+ var html = "
"
+
+ if (setting.numbered === true) {
+ html += " | "
+ }
+
+ if (setting.key) {
+ html += "\
+ \
+ | "
+ }
+
+ _.each(setting.columns, function(col) {
+ html += "\
+ \
+ | "
+ })
+
+ html += " | "
+ html += "
"
+
+ return html
+}
+
+function badgeSidebarForDifferences(changedElement) {
// figure out which group this input is in
- var panelParentID = changedInput.closest('.panel').attr('id')
+ var panelParentID = changedElement.closest('.panel').attr('id')
// get a JSON representation of that section
- var rootJSON = form2js(panelParentID, ".", false, cleanupFormValues, true);
- var panelJSON = rootJSON[panelParentID]
+ var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID]
+ var initialPanelJSON = Settings.initialValues[panelParentID]
var badgeValue = 0
+ // badge for any settings we have that are not the same or are not present in initialValues
for (var setting in panelJSON) {
- if (panelJSON[setting] != Settings.initialValues[panelParentID][setting]) {
+ if (!_.isEqual(panelJSON[setting], initialPanelJSON[setting])
+ && (panelJSON[setting] !== "" || _.has(initialPanelJSON, setting))) {
badgeValue += 1
}
}
@@ -212,6 +353,180 @@ function badgeSidebarForDifferences(changedInput) {
$("a[href='#" + panelParentID + "'] .badge").html(badgeValue);
}
+function addTableRow(add_glyphicon) {
+ var row = $(add_glyphicon).closest('tr')
+
+ var table = row.parents('table')
+ var isArray = table.data('setting-type') === 'array'
+
+ var columns = row.parent().children('.' + Settings.DATA_ROW_CLASS)
+
+ if (!isArray) {
+ // Check key spaces
+ var key = row.children(".key").children("input").val()
+ if (key.indexOf(' ') !== -1) {
+ showErrorMessage("Error", "Key contains spaces")
+ return
+ }
+ // Check keys with the same name
+ var equals = false;
+ _.each(columns.children(".key"), function(element) {
+ if ($(element).text() === key) {
+ equals = true
+ return
+ }
+ })
+ if (equals) {
+ showErrorMessage("Error", "Two keys cannot be identical")
+ return
+ }
+ }
+
+ // Check empty fields
+ var empty = false;
+ _.each(row.children('.' + Settings.DATA_COL_CLASS + ' input'), function(element) {
+ if ($(element).val().length === 0) {
+ empty = true
+ return
+ }
+ })
+
+ if (empty) {
+ showErrorMessage("Error", "Empty field(s)")
+ return
+ }
+
+ var input_clone = row.clone()
+
+ // Change input row to data row
+ var table = row.parents("table")
+ var setting_name = table.attr("name")
+ var full_name = setting_name + "." + key
+ row.addClass(Settings.DATA_ROW_CLASS + " " + Settings.NEW_ROW_CLASS)
+ row.removeClass("inputs")
+
+ _.each(row.children(), function(element) {
+ if ($(element).hasClass("numbered")) {
+ // Index row
+ var numbers = columns.children(".numbered")
+ if (numbers.length > 0) {
+ $(element).html(parseInt(numbers.last().text()) + 1)
+ } else {
+ $(element).html(1)
+ }
+ } else if ($(element).hasClass("buttons")) {
+ // Change buttons
+ var span = $(element).children("span")
+ span.removeClass(Settings.ADD_ROW_SPAN_CLASSES)
+ span.addClass(Settings.DEL_ROW_SPAN_CLASSES)
+ } else if ($(element).hasClass("key")) {
+ var input = $(element).children("input")
+ $(element).html(input.val())
+ input.remove()
+ } else if ($(element).hasClass(Settings.DATA_COL_CLASS)) {
+ // Hide inputs
+ var input = $(element).children("input")
+ input.attr("type", "hidden")
+
+ if (isArray) {
+ var row_index = row.siblings('.' + Settings.DATA_ROW_CLASS).length
+ var key = $(element).attr('name')
+
+ // are there multiple columns or just one?
+ // with multiple we have an array of Objects, with one we have an array of whatever the value type is
+ var num_columns = row.children('.' + Settings.DATA_COL_CLASS).length
+ input.attr("name", setting_name + "[" + row_index + "]" + (num_columns > 1 ? "." + key : ""))
+ } else {
+ input.attr("name", full_name + "." + $(element).attr("name"))
+ }
+
+ input.attr("data-changed", "true")
+
+ $(element).append(input.val())
+ } else {
+ console.log("Unknown table element")
+ }
+ })
+
+ input_clone.find('input').each(function(){
+ $(this).val('')
+ });
+
+ if (isArray) {
+ updateDataChangedForSiblingRows(row, true)
+
+ // the addition of any table row should remove the empty-array-row
+ row.siblings('.empty-array-row').remove()
+ }
+
+ badgeSidebarForDifferences($(table))
+
+ row.parent().append(input_clone)
+}
+
+function deleteTableRow(delete_glyphicon) {
+ var row = $(delete_glyphicon).closest('tr')
+
+ var table = $(row).closest('table')
+ var isArray = table.data('setting-type') === 'array'
+
+ if (!isArray) {
+ // this is a hash row, so we empty it but leave the hidden input blank so it is cleared when we save
+ row.empty()
+ row.html("
");
+ } else {
+ if (table.find('.' + Settings.DATA_ROW_CLASS).length) {
+ updateDataChangedForSiblingRows(row)
+
+ // this isn't the last row - we can just remove it
+ row.remove()
+ } else {
+ // this is the last row, we can't remove it completely since we need to post an empty array
+ row.empty()
+
+ row.removeClass(Settings.DATA_ROW_CLASS).removeClass(Settings.NEW_ROW_CLASS)
+ row.addClass('empty-array-row')
+
+ row.html("
");
+ }
+ }
+
+ // we need to fire a change event on one of the remaining inputs so that the sidebar badge is updated
+ badgeSidebarForDifferences($(table))
+}
+
+function updateDataChangedForSiblingRows(row, forceTrue) {
+ // anytime a new row is added to an array we need to set data-changed for all sibling row inputs to true
+ // unless it matches the inital set of values
+
+ if (!forceTrue) {
+ // figure out which group this row is in
+ var panelParentID = row.closest('.panel').attr('id')
+ // get the short name for the setting from the table
+ var tableShortName = row.closest('table').data('short-name')
+
+ // get a JSON representation of that section
+ var panelSettingJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID][tableShortName]
+ var initialPanelSettingJSON = Settings.initialValues[panelParentID][tableShortName]
+
+ // if they are equal, we don't need data-changed
+ isTrue = _.isEqual(panelSettingJSON, initialPanelSettingJSON)
+ } else {
+ isTrue = true
+ }
+
+ row.siblings('.' + Settings.DATA_ROW_CLASS).each(function(){
+ var hiddenInput = $(this).find('td.' + Settings.DATA_COL_CLASS + ' input')
+ if (isTrue) {
+ hiddenInput.attr('data-changed', isTrue)
+ } else {
+ hiddenInput.removeAttr('data-changed')
+ }
+ })
+}
+
function showRestartModal() {
$('#restart-modal').modal({
backdrop: 'static',
@@ -237,7 +552,7 @@ function showRestartModal() {
}, 1000);
}
-function cleanupFormValues(node) {
+function cleanupFormValues(node) {
if (node.type && node.type === 'checkbox') {
return { name: node.name, value: node.checked ? true : false };
} else {
@@ -245,12 +560,8 @@ function cleanupFormValues(node) {
}
}
-function showAlertMessage(message, isSuccess) {
- var alertBox = $('.alert');
- alertBox.attr('class', 'alert');
- alertBox.addClass(isSuccess ? 'alert-success' : 'alert-danger');
- alertBox.html(message);
- alertBox.fadeIn();
+function showErrorMessage(title, message) {
+ swal(title, message)
}
function chooseFromHighFidelityDomains(clickedButton) {
@@ -292,7 +603,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
modal_buttons["success"] = {
label: 'Create new domain',
callback: function() {
- window.open("https://data.highfidelity.io/domains", '_blank');
+ window.open("https://data.highfidelity.io/user/domains", '_blank');
}
}
modal_body = "
You do not have any domains in your High Fidelity account." +
diff --git a/domain-server/resources/web/js/sweet-alert.min.js b/domain-server/resources/web/js/sweet-alert.min.js
new file mode 100755
index 0000000000..6775a82da8
--- /dev/null
+++ b/domain-server/resources/web/js/sweet-alert.min.js
@@ -0,0 +1 @@
+!function(e,t){function n(){var e='
',n=t.createElement("div");n.innerHTML=e,t.body.appendChild(n)}function o(t){var n=y(),o=n.querySelector("h2"),r=n.querySelector("p"),a=n.querySelector("button.cancel"),c=n.querySelector("button.confirm");if(o.innerHTML=b(t.title).split("\n").join("
"),r.innerHTML=b(t.text||"").split("\n").join("
"),t.text&&w(r),x(n.querySelectorAll(".icon")),t.type){for(var l=!1,s=0;s
r;r++)o=parseInt(e.substr(2*r,2),16),o=Math.round(Math.min(Math.max(0,o+o*t),255)).toString(16),n+=("00"+o).substr(o.length);return n}function a(e){var t=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return t?parseInt(t[1],16)+", "+parseInt(t[2],16)+", "+parseInt(t[3],16):null}function i(e,t){var n=a(t);e.style.boxShadow="0 0 2px rgba("+n+", 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)"}function c(){var e=y();B(p(),10),w(e),g(e,"showSweetAlert"),v(e,"hideSweetAlert"),I=t.activeElement;var n=e.querySelector("button.confirm");n.focus(),setTimeout(function(){g(e,"visible")},500)}function l(){var n=y();T(p(),5),T(n,5),v(n,"showSweetAlert"),g(n,"hideSweetAlert"),v(n,"visible");var o=n.querySelector(".icon.success");v(o,"animate"),v(o.querySelector(".tip"),"animateSuccessTip"),v(o.querySelector(".long"),"animateSuccessLong");var r=n.querySelector(".icon.error");v(r,"animateErrorIcon"),v(r.querySelector(".x-mark"),"animateXMark");var a=n.querySelector(".icon.warning");v(a,"pulseWarning"),v(a.querySelector(".body"),"pulseWarningIns"),v(a.querySelector(".dot"),"pulseWarningIns"),e.onkeydown=M,t.onclick=A,I&&I.focus(),L=void 0}function s(){var e=y();e.style.marginTop=C(y())}var u=".sweet-alert",d=".sweet-overlay",f=["error","warning","info","success"],y=function(){return t.querySelector(u)},p=function(){return t.querySelector(d)},m=function(e,t){return new RegExp(" "+t+" ").test(" "+e.className+" ")},g=function(e,t){m(e,t)||(e.className+=" "+t)},v=function(e,t){var n=" "+e.className.replace(/[\t\r\n]/g," ")+" ";if(m(e,t)){for(;n.indexOf(" "+t+" ")>=0;)n=n.replace(" "+t+" "," ");e.className=n.replace(/^\s+|\s+$/g,"")}},b=function(e){var n=t.createElement("div");return n.appendChild(t.createTextNode(e)),n.innerHTML},h=function(e){e.style.opacity="",e.style.display="block"},w=function(e){if(e&&!e.length)return h(e);for(var t=0;t0?setTimeout(o,t):e.style.display="none"};o()},E=function(n){if(MouseEvent){var o=new MouseEvent("click",{view:e,bubbles:!1,cancelable:!0});n.dispatchEvent(o)}else if(t.createEvent){var r=t.createEvent("MouseEvents");r.initEvent("click",!1,!1),n.dispatchEvent(r)}else t.createEventObject?n.fireEvent("onclick"):"function"==typeof n.onclick&&n.onclick()},q=function(t){"function"==typeof t.stopPropagation?(t.stopPropagation(),t.preventDefault()):e.event&&e.event.hasOwnProperty("cancelBubble")&&(e.event.cancelBubble=!0)},I,A,M,L;e.sweetAlert=e.swal=function(){function n(e){var t=e.keyCode||e.which;if(-1!==[9,13,32,27].indexOf(t)){for(var n=e.target||e.srcElement,o=-1,r=0;r
+
@@ -76,6 +77,7 @@
+
\ No newline at end of file
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index c950d2f8b6..fa7a0fe012 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -57,6 +57,10 @@ DomainServer::DomainServer(int argc, char* argv[]) :
setApplicationName("domain-server");
QSettings::setDefaultFormat(QSettings::IniFormat);
+ // make sure we have a fresh AccountManager instance
+ // (need this since domain-server can restart itself and maintain static variables)
+ AccountManager::getInstance(true);
+
_settingsManager.setupConfigMap(arguments());
installNativeEventFilter(&_shutdownEventListener);
@@ -82,10 +86,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
void DomainServer::restart() {
qDebug() << "domain-server is restarting.";
- // make sure all static instances are reset
- LimitedNodeList::getInstance()->reset();
- AccountManager::getInstance(true);
-
exit(DomainServer::EXIT_CODE_REBOOT);
}
@@ -189,17 +189,20 @@ bool DomainServer::optionallySetupOAuth() {
const QString DOMAIN_CONFIG_ID_KEY = "id";
+const QString METAVERSE_AUTOMATIC_NETWORKING_KEY_PATH = "metaverse.automatic_networking";
+const QString FULL_AUTOMATIC_NETWORKING_VALUE = "full";
+const QString IP_ONLY_AUTOMATIC_NETWORKING_VALUE = "ip";
+const QString DISABLED_AUTOMATIC_NETWORKING_VALUE = "disabled";
+
void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
- const QString CUSTOM_PORT_OPTION = "port";
- unsigned short domainServerPort = DEFAULT_DOMAIN_SERVER_PORT;
+ const QString CUSTOM_LOCAL_PORT_OPTION = "metaverse.local_port";
+
+ QVariant localPortValue = _settingsManager.valueOrDefaultValueForKeyPath(CUSTOM_LOCAL_PORT_OPTION);
+ unsigned short domainServerPort = (unsigned short) localPortValue.toUInt();
QVariantMap& settingsMap = _settingsManager.getSettingsMap();
- if (settingsMap.contains(CUSTOM_PORT_OPTION)) {
- domainServerPort = (unsigned short) settingsMap.value(CUSTOM_PORT_OPTION).toUInt();
- }
-
unsigned short domainServerDTLSPort = 0;
if (_isUsingDTLS) {
@@ -310,12 +313,7 @@ bool DomainServer::optionallySetupAssignmentPayment() {
return true;
}
-const QString FULL_AUTOMATIC_NETWORKING_VALUE = "full";
-const QString IP_ONLY_AUTOMATIC_NETWORKING_VALUE = "ip";
-const QString DISABLED_AUTOMATIC_NETWORKING_VALUE = "disabled";
-
void DomainServer::setupAutomaticNetworking() {
- const QString METAVERSE_AUTOMATIC_NETWORKING_KEY_PATH = "metaverse.automatic_networking";
if (!didSetupAccountManagerWithAccessToken()) {
qDebug() << "Cannot setup domain-server automatic networking without an access token.";
@@ -357,8 +355,12 @@ void DomainServer::setupAutomaticNetworking() {
connect(iceHeartbeatTimer, &QTimer::timeout, this, &DomainServer::performICEUpdates);
iceHeartbeatTimer->start(ICE_HEARBEAT_INTERVAL_MSECS);
- // call our sendHeartbeaToIceServer immediately anytime a public address changes
+ // call our sendHeartbeaToIceServer immediately anytime a local or public socket changes
+ connect(nodeList, &LimitedNodeList::localSockAddrChanged, this, &DomainServer::sendHearbeatToIceServer);
connect(nodeList, &LimitedNodeList::publicSockAddrChanged, this, &DomainServer::sendHearbeatToIceServer);
+
+ // tell the data server which type of automatic networking we are using
+ updateNetworkingInfoWithDataServer(automaticNetworkValue);
}
// attempt to update our sockets now
@@ -999,7 +1001,6 @@ void DomainServer::updateNetworkingInfoWithDataServer(const QString& newSetting,
}
// todo: have data-web respond with ice-server hostname to use
-const HifiSockAddr ICE_SERVER_SOCK_ADDR = HifiSockAddr("ice.highfidelity.io", ICE_SERVER_DEFAULT_PORT);
void DomainServer::performICEUpdates() {
sendHearbeatToIceServer();
@@ -1007,6 +1008,7 @@ void DomainServer::performICEUpdates() {
}
void DomainServer::sendHearbeatToIceServer() {
+ const HifiSockAddr ICE_SERVER_SOCK_ADDR = HifiSockAddr("ice.highfidelity.io", ICE_SERVER_DEFAULT_PORT);
LimitedNodeList::getInstance()->sendHeartbeatToIceServer(ICE_SERVER_SOCK_ADDR);
}
@@ -1024,7 +1026,7 @@ void DomainServer::sendICEPingPackets() {
} else {
// send ping packets to this peer's interfaces
qDebug() << "Sending ping packets to establish connectivity with ICE peer with ID"
- << peer->getUUID();
+ << peer->getUUID();
// send the ping packet to the local and public sockets for this node
QByteArray localPingPacket = nodeList->constructPingPacket(PingType::Local, false);
@@ -1052,11 +1054,13 @@ void DomainServer::processICEHeartbeatResponse(const QByteArray& packet) {
while (!iceResponseStream.atEnd()) {
iceResponseStream >> receivedPeer;
- if (!_connectingICEPeers.contains(receivedPeer.getUUID()) && !_connectedICEPeers.contains(receivedPeer.getUUID())) {
- qDebug() << "New peer requesting connection being added to hash -" << receivedPeer;
+ if (!_connectedICEPeers.contains(receivedPeer.getUUID())) {
+ if (!_connectingICEPeers.contains(receivedPeer.getUUID())) {
+ qDebug() << "New peer requesting connection being added to hash -" << receivedPeer;
+ }
+
+ _connectingICEPeers[receivedPeer.getUUID()] = receivedPeer;
}
-
- _connectingICEPeers[receivedPeer.getUUID()] = receivedPeer;
}
}
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 28b1151f2d..e7a9eef1ee 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -29,6 +29,7 @@ const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/describe-settings
const QString DESCRIPTION_SETTINGS_KEY = "settings";
const QString SETTING_DEFAULT_KEY = "default";
const QString DESCRIPTION_NAME_KEY = "name";
+const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
DomainServerSettingsManager::DomainServerSettingsManager() :
_descriptionArray(),
@@ -232,63 +233,95 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
return responseObject;
}
+bool DomainServerSettingsManager::settingExists(const QString& groupName, const QString& settingName,
+ const QJsonArray& descriptionArray, QJsonValue& settingDescription) {
+ foreach(const QJsonValue& groupValue, descriptionArray) {
+ QJsonObject groupObject = groupValue.toObject();
+ if (groupObject[DESCRIPTION_NAME_KEY].toString() == groupName) {
+
+ foreach(const QJsonValue& settingValue, groupObject[DESCRIPTION_SETTINGS_KEY].toArray()) {
+ QJsonObject settingObject = settingValue.toObject();
+ if (settingObject[DESCRIPTION_NAME_KEY].toString() == settingName) {
+ settingDescription = settingObject[SETTING_DEFAULT_KEY];
+ return true;
+ }
+ }
+ }
+ }
+ settingDescription = QJsonValue::Undefined;
+ return false;
+}
-const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
+void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
+ const QJsonValue& settingDescription) {
+ if (newValue.isString()) {
+ if (newValue.toString().isEmpty()) {
+ // this is an empty value, clear it in settings variant so the default is sent
+ settingMap.remove(key);
+ } else {
+ // make sure the resulting json value has the right type
+ const QString settingType = settingDescription.toObject()[SETTING_DESCRIPTION_TYPE_KEY].toString();
+ const QString INPUT_DOUBLE_TYPE = "double";
+ const QString INPUT_INTEGER_TYPE = "int";
+
+ if (settingType == INPUT_DOUBLE_TYPE) {
+ settingMap[key] = newValue.toString().toDouble();
+ } else if (settingType == INPUT_INTEGER_TYPE) {
+ settingMap[key] = newValue.toString().toInt();
+ } else {
+ settingMap[key] = newValue.toString();
+ }
+ }
+ } else if (newValue.isBool()) {
+ settingMap[key] = newValue.toBool();
+ } else if (newValue.isObject()) {
+ if (!settingMap.contains(key)) {
+ // we don't have a map below this key yet, so set it up now
+ settingMap[key] = QVariantMap();
+ }
+
+ QVariantMap& thisMap = *reinterpret_cast
(settingMap[key].data());
+ foreach(const QString childKey, newValue.toObject().keys()) {
+ updateSetting(childKey, newValue.toObject()[childKey], thisMap, settingDescription.toObject()[key]);
+ }
+
+ if (settingMap[key].toMap().isEmpty()) {
+ // we've cleared all of the settings below this value, so remove this one too
+ settingMap.remove(key);
+ }
+ } else if (newValue.isArray()) {
+ // we just assume array is replacement
+ settingMap[key] = newValue.toArray().toVariantList();
+ }
+}
void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
QVariantMap& settingsVariant,
- QJsonArray descriptionArray) {
- foreach(const QString& key, postedObject.keys()) {
+ const QJsonArray& descriptionArray) {
+ // Iterate on the setting groups
+ foreach(const QString& groupKey, postedObject.keys()) {
+ QJsonValue groupValue = postedObject[groupKey];
- QJsonValue rootValue = postedObject[key];
+ if (!settingsVariant.contains(groupKey)) {
+ // we don't have a map below this key yet, so set it up now
+ settingsVariant[groupKey] = QVariantMap();
+ }
- // we don't continue if this key is not present in our descriptionObject
- foreach(const QJsonValue& groupValue, descriptionArray) {
- if (groupValue.toObject()[DESCRIPTION_NAME_KEY].toString() == key) {
- QJsonObject groupObject = groupValue.toObject();
- if (rootValue.isString()) {
- if (rootValue.toString().isEmpty()) {
- // this is an empty value, clear it in settings variant so the default is sent
- settingsVariant.remove(key);
- } else {
- QString settingType = groupObject[SETTING_DESCRIPTION_TYPE_KEY].toString();
-
- const QString INPUT_DOUBLE_TYPE = "double";
-
- // make sure the resulting json value has the right type
-
- if (settingType == INPUT_DOUBLE_TYPE) {
- settingsVariant[key] = rootValue.toString().toDouble();
- } else {
- settingsVariant[key] = rootValue.toString();
- }
- }
- } else if (rootValue.isBool()) {
- settingsVariant[key] = rootValue.toBool();
- } else if (rootValue.isObject()) {
- // there's a JSON Object to explore, so attempt to recurse into it
- QJsonObject nextDescriptionObject = groupObject;
-
- if (nextDescriptionObject.contains(DESCRIPTION_SETTINGS_KEY)) {
- if (!settingsVariant.contains(key)) {
- // we don't have a map below this key yet, so set it up now
- settingsVariant[key] = QVariantMap();
- }
-
- QVariantMap& thisMap = *reinterpret_cast(settingsVariant[key].data());
-
- recurseJSONObjectAndOverwriteSettings(rootValue.toObject(),
- thisMap,
- nextDescriptionObject[DESCRIPTION_SETTINGS_KEY].toArray());
-
- if (thisMap.isEmpty()) {
- // we've cleared all of the settings below this value, so remove this one too
- settingsVariant.remove(key);
- }
- }
- }
+ // Iterate on the settings
+ foreach(const QString& settingKey, groupValue.toObject().keys()) {
+ QJsonValue settingValue = groupValue.toObject()[settingKey];
+
+ QJsonValue thisDescription;
+ if (settingExists(groupKey, settingKey, descriptionArray, thisDescription)) {
+ QVariantMap& thisMap = *reinterpret_cast(settingsVariant[groupKey].data());
+ updateSetting(settingKey, settingValue, thisMap, thisDescription);
}
}
+
+ if (settingsVariant[groupKey].toMap().empty()) {
+ // we've cleared all of the settings below this value, so remove this one too
+ settingsVariant.remove(groupKey);
+ }
}
}
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index c2e8a7d90d..a21e0dc93a 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -32,7 +32,11 @@ public:
private:
QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false);
void recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, QVariantMap& settingsVariant,
- QJsonArray descriptionArray);
+ const QJsonArray& descriptionArray);
+ bool settingExists(const QString& groupName, const QString& settingName,
+ const QJsonArray& descriptionArray, QJsonValue& settingDescription);
+ void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
+ const QJsonValue& settingDescription);
void persistToFile();
QJsonArray _descriptionArray;
diff --git a/examples/ControlACs.js b/examples/ControlACs.js
index 4ccf5cff59..bbdb1cc4ef 100644
--- a/examples/ControlACs.js
+++ b/examples/ControlACs.js
@@ -9,6 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
// Set the following variables to the right value
var NUM_AC = 3; // This is the number of AC. Their ID need to be unique and between 0 (included) and NUM_AC (excluded)
var NAMES = new Array("Craig", "Clement", "Jeff"); // ACs names ordered by IDs (Default name is "ACx", x = ID + 1))
@@ -37,7 +39,7 @@ COLORS[HIDE] = { red: HIDE, green: 0, blue: 0 };
var windowDimensions = Controller.getViewportDimensions();
-var TOOL_ICON_URL = "http://s3-us-west-1.amazonaws.com/highfidelity-public/images/tools/";
+var TOOL_ICON_URL = HIFI_PUBLIC_BUCKET + "images/tools/";
var ALPHA_ON = 1.0;
var ALPHA_OFF = 0.7;
var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 };
diff --git a/examples/ControlledAC.js b/examples/ControlledAC.js
index 33fa629ff8..b19d27946a 100644
--- a/examples/ControlledAC.js
+++ b/examples/ControlledAC.js
@@ -9,8 +9,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
// Set the following variables to the values needed
-var filename = "http://s3-us-west-1.amazonaws.com/highfidelity-public/ozan/bartender.rec";
+var filename = HIFI_PUBLIC_BUCKET + "ozan/bartender.rec";
var playFromCurrentLocation = true;
var useDisplayName = true;
var useAttachments = true;
diff --git a/examples/Recorder.js b/examples/Recorder.js
index 533f9f7fab..8c784bcea2 100644
--- a/examples/Recorder.js
+++ b/examples/Recorder.js
@@ -9,6 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
Script.include("libraries/toolBars.js");
var recordingFile = "recording.rec";
@@ -22,7 +23,7 @@ function setPlayerOptions() {
}
var windowDimensions = Controller.getViewportDimensions();
-var TOOL_ICON_URL = "http://s3-us-west-1.amazonaws.com/highfidelity-public/images/tools/";
+var TOOL_ICON_URL = HIFI_PUBLIC_BUCKET + "images/tools/";
var ALPHA_ON = 1.0;
var ALPHA_OFF = 0.7;
var COLOR_ON = { red: 128, green: 0, blue: 0 };
diff --git a/examples/airGuitar.js b/examples/airGuitar.js
index 78c16be7bc..c0e06add30 100644
--- a/examples/airGuitar.js
+++ b/examples/airGuitar.js
@@ -10,6 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
function length(v) {
return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
}
@@ -26,28 +28,28 @@ function vMinus(a, b) {
}
// The model file to be used for the guitar
-var guitarModel = "https://s3-us-west-1.amazonaws.com/highfidelity-public/models/attachments/guitar.fst";
+var guitarModel = HIFI_PUBLIC_BUCKET + "models/attachments/guitar.fst";
// Load sounds that will be played
var chords = new Array();
// Nylon string guitar
-chords[1] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Nylon+A.raw");
-chords[2] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Nylon+B.raw");
-chords[3] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Nylon+E.raw");
-chords[4] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Nylon+G.raw");
+chords[1] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+A.raw");
+chords[2] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+B.raw");
+chords[3] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+E.raw");
+chords[4] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+G.raw");
// Electric guitar
-chords[5] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Metal+A+short.raw");
-chords[6] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Metal+B+short.raw");
-chords[7] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Metal+E+short.raw");
-chords[8] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Metal+G+short.raw");
+chords[5] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+A+short.raw");
+chords[6] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+B+short.raw");
+chords[7] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+E+short.raw");
+chords[8] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+G+short.raw");
// Steel Guitar
-chords[9] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Steel+A.raw");
-chords[10] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Steel+B.raw");
-chords[11] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Steel+E.raw");
-chords[12] = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Steel+G.raw");
+chords[9] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+A.raw");
+chords[10] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+B.raw");
+chords[11] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+E.raw");
+chords[12] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+G.raw");
var NUM_CHORDS = 4;
var NUM_GUITARS = 3;
diff --git a/examples/audioBall.js b/examples/audioBall.js
index 2a77a0999f..76f9aabec8 100644
--- a/examples/audioBall.js
+++ b/examples/audioBall.js
@@ -13,7 +13,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-var sound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/mexicanWhipoorwill.raw");
+Script.include("libraries/globals.js");
+
+var sound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/mexicanWhipoorwill.raw");
var CHANCE_OF_PLAYING_SOUND = 0.01;
var FACTOR = 0.75;
diff --git a/examples/audioReflectorTools.js b/examples/audioReflectorTools.js
index f299407e54..c5a88edd57 100644
--- a/examples/audioReflectorTools.js
+++ b/examples/audioReflectorTools.js
@@ -11,6 +11,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
var delayScale = 100.0;
var fanoutScale = 10.0;
@@ -94,7 +95,7 @@ var delaySlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: delayY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -108,7 +109,7 @@ var delayThumb = Overlays.addOverlay("image", {
y: delayY + 9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 255, green: 0, blue: 0},
alpha: 1
});
@@ -132,7 +133,7 @@ var fanoutSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: fanoutY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -146,7 +147,7 @@ var fanoutThumb = Overlays.addOverlay("image", {
y: fanoutY + 9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 255, green: 255, blue: 0},
alpha: 1
});
@@ -171,7 +172,7 @@ var speedSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: speedY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -185,7 +186,7 @@ var speedThumb = Overlays.addOverlay("image", {
y: speedY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 0, green: 255, blue: 0},
alpha: 1
});
@@ -210,7 +211,7 @@ var factorSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: factorY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -224,7 +225,7 @@ var factorThumb = Overlays.addOverlay("image", {
y: factorY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 0, green: 0, blue: 255},
alpha: 1
});
@@ -249,7 +250,7 @@ var localFactorSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: localFactorY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -263,7 +264,7 @@ var localFactorThumb = Overlays.addOverlay("image", {
y: localFactorY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 0, green: 128, blue: 128},
alpha: 1
});
@@ -288,7 +289,7 @@ var combFilterSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: combFilterY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -302,7 +303,7 @@ var combFilterThumb = Overlays.addOverlay("image", {
y: combFilterY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 128, green: 128, blue: 0},
alpha: 1
});
@@ -328,7 +329,7 @@ var reflectiveSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: reflectiveY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -342,7 +343,7 @@ var reflectiveThumb = Overlays.addOverlay("image", {
y: reflectiveY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -367,7 +368,7 @@ var diffusionSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: diffusionY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -381,7 +382,7 @@ var diffusionThumb = Overlays.addOverlay("image", {
y: diffusionY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 0, green: 255, blue: 255},
alpha: 1
});
@@ -406,7 +407,7 @@ var absorptionSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: absorptionY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -420,7 +421,7 @@ var absorptionThumb = Overlays.addOverlay("image", {
y: absorptionY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 255, green: 0, blue: 255},
alpha: 1
});
@@ -445,7 +446,7 @@ var originalSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: originalY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -459,7 +460,7 @@ var originalThumb = Overlays.addOverlay("image", {
y: originalY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 128, green: 128, blue: 0},
alpha: 1
});
@@ -484,7 +485,7 @@ var echoesSlider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: echoesY, width: 150, height: sliderHeight},
subImage: { x: 46, y: 0, width: 200, height: 71 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -498,7 +499,7 @@ var echoesThumb = Overlays.addOverlay("image", {
y: echoesY+9,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 128, green: 128, blue: 0},
alpha: 1
});
diff --git a/examples/avatarCollision.js b/examples/avatarCollision.js
index 5ade894365..6c0886464c 100644
--- a/examples/avatarCollision.js
+++ b/examples/avatarCollision.js
@@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var SOUND_TRIGGER_CLEAR = 1000; // milliseconds
var SOUND_TRIGGER_DELAY = 200; // milliseconds
var soundExpiry = 0;
@@ -20,28 +22,28 @@ audioOptions.volume = 0.5;
audioOptions.position = { x: 0, y: 0, z: 0 };
var hitSounds = new Array();
-hitSounds[0] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit1.raw");
-hitSounds[1] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit2.raw");
-hitSounds[2] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit3.raw");
-hitSounds[3] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit4.raw");
-hitSounds[4] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit5.raw");
-hitSounds[5] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit6.raw");
-hitSounds[6] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit7.raw");
-hitSounds[7] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit8.raw");
-hitSounds[8] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit9.raw");
-hitSounds[9] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit10.raw");
-hitSounds[10] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit11.raw");
-hitSounds[11] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit12.raw");
-hitSounds[12] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit13.raw");
-hitSounds[13] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit14.raw");
-hitSounds[14] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit15.raw");
-hitSounds[15] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit16.raw");
-hitSounds[16] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit17.raw");
-hitSounds[17] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit18.raw");
-hitSounds[18] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit19.raw");
-hitSounds[19] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit20.raw");
-hitSounds[20] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit21.raw");
-hitSounds[21] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Collisions-hitsandslaps/Hit22.raw");
+hitSounds[0] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit1.raw");
+hitSounds[1] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit2.raw");
+hitSounds[2] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit3.raw");
+hitSounds[3] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit4.raw");
+hitSounds[4] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit5.raw");
+hitSounds[5] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit6.raw");
+hitSounds[6] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit7.raw");
+hitSounds[7] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit8.raw");
+hitSounds[8] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit9.raw");
+hitSounds[9] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit10.raw");
+hitSounds[10] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit11.raw");
+hitSounds[11] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit12.raw");
+hitSounds[12] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit13.raw");
+hitSounds[13] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit14.raw");
+hitSounds[14] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit15.raw");
+hitSounds[15] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit16.raw");
+hitSounds[16] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit17.raw");
+hitSounds[17] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit18.raw");
+hitSounds[18] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit19.raw");
+hitSounds[19] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit20.raw");
+hitSounds[20] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit21.raw");
+hitSounds[21] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Collisions-hitsandslaps/Hit22.raw");
function playHitSound(mySessionID, theirSessionID, collision) {
var now = new Date();
diff --git a/examples/bot.js b/examples/bot.js
index e42d234abf..09c9a51cdd 100644
--- a/examples/bot.js
+++ b/examples/bot.js
@@ -12,6 +12,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
function getRandomFloat(min, max) {
return Math.random() * (max - min) + min;
}
@@ -110,9 +112,9 @@ if (botNumber <= 20) {
// set the face model fst using the bot number
// there is no need to change the body model - we're using the default
-Avatar.faceModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newFaceFilePrefix + ".fst";
-Avatar.skeletonModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newBodyFilePrefix + ".fst";
-Avatar.billboardURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/billboards/bot" + botNumber + ".png";
+Avatar.faceModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newFaceFilePrefix + ".fst";
+Avatar.skeletonModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newBodyFilePrefix + ".fst";
+Avatar.billboardURL = HIFI_PUBLIC_BUCKET + "meshes/billboards/bot" + botNumber + ".png";
Agent.isAvatar = true;
Agent.isListeningToAudioStream = true;
@@ -223,7 +225,7 @@ function loadSounds() {
"Walken1.raw", "Walken2.raw", "Z1.raw", "Z2.raw"
];
- var SOUND_BASE_URL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail+Party+Snippets/Raws/";
+ var SOUND_BASE_URL = HIFI_PUBLIC_BUCKET + "sounds/Cocktail+Party+Snippets/Raws/";
for (var i = 0; i < sound_filenames.length; i++) {
sounds.push(new Sound(SOUND_BASE_URL + sound_filenames[i]));
diff --git a/examples/botProceduralWayPoints.js b/examples/botProceduralWayPoints.js
index 9f46177587..fc9c0dda74 100644
--- a/examples/botProceduralWayPoints.js
+++ b/examples/botProceduralWayPoints.js
@@ -20,7 +20,8 @@
//
//For procedural walk animation
-Script.include("http://s3-us-west-1.amazonaws.com/highfidelity-public/scripts/proceduralAnimationAPI.js");
+Script.include("libraries/globals.js");
+Script.include(HIFI_PUBLIC_BUCKET + "scripts/proceduralAnimationAPI.js");
var procAnimAPI = new ProcAnimAPI();
@@ -120,9 +121,9 @@ var newBodyFilePrefix = "bot" + botNumber;
// set the face model fst using the bot number
// there is no need to change the body model - we're using the default
-Avatar.faceModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newFaceFilePrefix + ".fst";
-Avatar.skeletonModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newBodyFilePrefix + "_a.fst";
-Avatar.billboardURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/billboards/bot" + botNumber + ".png";
+Avatar.faceModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newFaceFilePrefix + ".fst";
+Avatar.skeletonModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newBodyFilePrefix + "_a.fst";
+Avatar.billboardURL = HIFI_PUBLIC_BUCKET + "meshes/billboards/bot" + botNumber + ".png";
Agent.isAvatar = true;
Agent.isListeningToAudioStream = true;
@@ -145,9 +146,9 @@ function loadSounds() {
var footstep_filenames = ["FootstepW2Left-12db.wav", "FootstepW2Right-12db.wav", "FootstepW3Left-12db.wav", "FootstepW3Right-12db.wav",
"FootstepW5Left-12db.wav", "FootstepW5Right-12db.wav"];
- var SOUND_BASE_URL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail+Party+Snippets/Raws/";
+ var SOUND_BASE_URL = HIFI_PUBLIC_BUCKET + "sounds/Cocktail+Party+Snippets/Raws/";
- var FOOTSTEP_BASE_URL = "http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Footsteps/";
+ var FOOTSTEP_BASE_URL = HIFI_PUBLIC_BUCKET + "sounds/Footsteps/";
for (var i = 0; i < sound_filenames.length; i++) {
sounds.push(new Sound(SOUND_BASE_URL + sound_filenames[i]));
diff --git a/examples/bot_procedural.js b/examples/bot_procedural.js
index 265b887e0a..f445162038 100644
--- a/examples/bot_procedural.js
+++ b/examples/bot_procedural.js
@@ -11,7 +11,8 @@
//
//For procedural walk animation
-Script.include("http://s3-us-west-1.amazonaws.com/highfidelity-public/scripts/proceduralAnimationAPI.js");
+Script.include("libraries/globals.js");
+Script.include(HIFI_PUBLIC_BUCKET + "scripts/proceduralAnimationAPI.js");
var procAnimAPI = new ProcAnimAPI();
@@ -82,9 +83,9 @@ var newBodyFilePrefix = "bot" + botNumber;
// set the face model fst using the bot number
// there is no need to change the body model - we're using the default
-Avatar.faceModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newFaceFilePrefix + ".fst";
-Avatar.skeletonModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newBodyFilePrefix + "_a.fst";
-Avatar.billboardURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/billboards/bot" + botNumber + ".png";
+Avatar.faceModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newFaceFilePrefix + ".fst";
+Avatar.skeletonModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newBodyFilePrefix + "_a.fst";
+Avatar.billboardURL = HIFI_PUBLIC_BUCKET + "meshes/billboards/bot" + botNumber + ".png";
Agent.isAvatar = true;
Agent.isListeningToAudioStream = true;
@@ -107,9 +108,9 @@ function loadSounds() {
var footstep_filenames = ["FootstepW2Left-12db.wav", "FootstepW2Right-12db.wav", "FootstepW3Left-12db.wav", "FootstepW3Right-12db.wav",
"FootstepW5Left-12db.wav", "FootstepW5Right-12db.wav"];
- var SOUND_BASE_URL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail+Party+Snippets/Raws/";
+ var SOUND_BASE_URL = HIFI_PUBLIC_BUCKET + "sounds/Cocktail+Party+Snippets/Raws/";
- var FOOTSTEP_BASE_URL = "http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Footsteps/";
+ var FOOTSTEP_BASE_URL = HIFI_PUBLIC_BUCKET + "sounds/Footsteps/";
for (var i = 0; i < sound_filenames.length; i++) {
sounds.push(new Sound(SOUND_BASE_URL + sound_filenames[i]));
diff --git a/examples/bot_randomExpression.js b/examples/bot_randomExpression.js
index 2d2653e6d5..44d546e763 100644
--- a/examples/bot_randomExpression.js
+++ b/examples/bot_randomExpression.js
@@ -12,6 +12,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
function getRandomFloat(min, max) {
return Math.random() * (max - min) + min;
}
@@ -42,9 +44,9 @@ newBodyFilePrefix = "bot" + botNumber;
// set the face model fst using the bot number
// there is no need to change the body model - we're using the default
-Avatar.faceModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newFaceFilePrefix + ".fst";
-Avatar.skeletonModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newBodyFilePrefix + ".fst";
-Avatar.billboardURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/billboards/bot" + botNumber + ".png";
+Avatar.faceModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newFaceFilePrefix + ".fst";
+Avatar.skeletonModelURL = HIFI_PUBLIC_BUCKET + "meshes/" + newBodyFilePrefix + ".fst";
+Avatar.billboardURL = HIFI_PUBLIC_BUCKET + "meshes/billboards/bot" + botNumber + ".png";
Agent.isAvatar = true;
Agent.isListeningToAudioStream = true;
diff --git a/examples/clap.js b/examples/clap.js
index 6e70979c2e..9cc79a1c92 100644
--- a/examples/clap.js
+++ b/examples/clap.js
@@ -12,7 +12,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-var clapAnimation = "https://s3-us-west-1.amazonaws.com/highfidelity-public/animations/ClapAnimations/ClapHands_Standing.fbx";
+Script.include("libraries/globals.js");
+
+var clapAnimation = HIFI_PUBLIC_BUCKET + "animations/ClapAnimations/ClapHands_Standing.fbx";
var ANIMATION_FRAMES_PER_CLAP = 10.0;
var startEndFrames = [];
startEndFrames.push({ start: 0, end: 10});
@@ -26,16 +28,16 @@ var lastClapFrame = 0;
var lastAnimFrame = 0;
var claps = [];
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap1Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap2Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap3Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap4Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap5Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap6Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap7Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap8Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap9Rvb.wav"));
-claps.push(new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/claps/BClap10Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap1Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap2Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap3Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap4Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap5Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap6Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap7Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap8Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap9Rvb.wav"));
+claps.push(new Sound(HIFI_PUBLIC_BUCKET + "sounds/claps/BClap10Rvb.wav"));
var numberOfSounds = claps.length;
var clappingNow = false;
diff --git a/examples/drumStick.js b/examples/drumStick.js
index 188661b000..d0560057c0 100644
--- a/examples/drumStick.js
+++ b/examples/drumStick.js
@@ -10,6 +10,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
function length(v) {
return Math.sqrt(v.x * v.x + v.y * v.y + v.z * v.z);
}
@@ -26,8 +28,8 @@ function vMinus(a, b) {
// First, load two percussion sounds to be used on the sticks
-var drum1 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Drums/RackTomHi.raw");
-var drum2 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Drums/RackTomLo.raw");
+var drum1 = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Drums/RackTomHi.raw");
+var drum2 = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Drums/RackTomLo.raw");
// State Machine:
// 0 = not triggered
diff --git a/examples/editModelExample.js b/examples/editModelExample.js
index 1a17697db3..5a4efc0746 100644
--- a/examples/editModelExample.js
+++ b/examples/editModelExample.js
@@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var count = 0;
var moveUntil = 2000;
var stopAfter = moveUntil + 100;
@@ -31,12 +33,12 @@ var originalProperties = {
green: 255,
blue: 0 },
- modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Feisar_Ship.FBX",
- //modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/birarda/birarda_head.fbx",
- //modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/pug.fbx",
- //modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/newInvader16x16-large-purple.svo",
- //modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/minotaur/mino_full.fbx",
- //modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Combat_tank_V01.FBX",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
+ //modelURL: HIFI_PUBLIC_BUCKET + "meshes/birarda/birarda_head.fbx",
+ //modelURL: HIFI_PUBLIC_BUCKET + "meshes/pug.fbx",
+ //modelURL: HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-large-purple.svo",
+ //modelURL: HIFI_PUBLIC_BUCKET + "meshes/minotaur/mino_full.fbx",
+ //modelURL: HIFI_PUBLIC_BUCKET + "meshes/Combat_tank_V01.FBX",
rotation: rotation
};
diff --git a/examples/editModels.js b/examples/editModels.js
index 1aa12529ce..2741bdccdd 100644
--- a/examples/editModels.js
+++ b/examples/editModels.js
@@ -22,9 +22,11 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
Script.include("libraries/toolBars.js");
+
var windowDimensions = Controller.getViewportDimensions();
-var toolIconUrl = "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/";
+var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var toolHeight = 50;
var toolWidth = 50;
@@ -45,14 +47,14 @@ var SPAWN_DISTANCE = 1;
var DEFAULT_DIMENSION = 0.20;
var modelURLs = [
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Feisar_Ship.FBX",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/birarda/birarda_head.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/pug.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/newInvader16x16-large-purple.svo",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/minotaur/mino_full.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Combat_tank_V01.FBX",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/orc.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/slimer.fbx"
+ HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
+ HIFI_PUBLIC_BUCKET + "meshes/birarda/birarda_head.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/pug.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-large-purple.svo",
+ HIFI_PUBLIC_BUCKET + "meshes/minotaur/mino_full.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/Combat_tank_V01.FBX",
+ HIFI_PUBLIC_BUCKET + "meshes/orc.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/slimer.fbx"
];
var jointList = MyAvatar.getJointNames();
@@ -1213,19 +1215,44 @@ var toolBar = (function () {
Overlays.editOverlay(loadFileMenuItem, { visible: active });
}
+ var RESIZE_INTERVAL = 50;
+ var RESIZE_TIMEOUT = 20000;
+ var RESIZE_MAX_CHECKS = RESIZE_TIMEOUT / RESIZE_INTERVAL;
function addModel(url) {
var position;
position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), SPAWN_DISTANCE));
if (position.x > 0 && position.y > 0 && position.z > 0) {
- Entities.addEntity({
+ var entityId = Entities.addEntity({
type: "Model",
position: position,
dimensions: { x: DEFAULT_DIMENSION, y: DEFAULT_DIMENSION, z: DEFAULT_DIMENSION },
modelURL: url
});
print("Model added: " + url);
+
+ var checkCount = 0;
+ function resize() {
+ var entityProperties = Entities.getEntityProperties(entityId);
+ var naturalDimensions = entityProperties.naturalDimensions;
+
+ checkCount++;
+
+ if (naturalDimensions.x == 0 && naturalDimensions.y == 0 && naturalDimensions.z == 0) {
+ if (checkCount < RESIZE_MAX_CHECKS) {
+ Script.setTimeout(resize, RESIZE_INTERVAL);
+ } else {
+ print("Resize failed: timed out waiting for model (" + url + ") to load");
+ }
+ } else {
+ entityProperties.dimensions = naturalDimensions;
+ Entities.editEntity(entityId, entityProperties);
+ }
+ }
+
+ Script.setTimeout(resize, RESIZE_INTERVAL);
+
} else {
print("Can't add model: Model would be out of bounds.");
}
@@ -1766,7 +1793,7 @@ var modelImporter = new ModelImporter();
function isLocked(properties) {
// special case to lock the ground plane model in hq.
if (location.hostname == "hq.highfidelity.io" &&
- properties.modelURL == "https://s3-us-west-1.amazonaws.com/highfidelity-public/ozan/Terrain_Reduce_forAlpha.fbx") {
+ properties.modelURL == HIFI_PUBLIC_BUCKET + "ozan/Terrain_Reduce_forAlpha.fbx") {
return true;
}
return false;
diff --git a/examples/editVoxels.js b/examples/editVoxels.js
index 3543f062e7..e450f2d1d4 100644
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
@@ -19,6 +19,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var editToolsOn = true; // starts out off
var windowDimensions = Controller.getViewportDimensions();
@@ -94,61 +96,61 @@ function SoundArray() {
}
var addVoxelSound = new SoundArray();
-addVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Add/VA+1.raw");
-addVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Add/VA+2.raw");
-addVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Add/VA+3.raw");
-addVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Add/VA+4.raw");
-addVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Add/VA+5.raw");
-addVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Add/VA+6.raw");
+addVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Add/VA+1.raw");
+addVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Add/VA+2.raw");
+addVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Add/VA+3.raw");
+addVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Add/VA+4.raw");
+addVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Add/VA+5.raw");
+addVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Add/VA+6.raw");
var delVoxelSound = new SoundArray();
-delVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Del/VD+A1.raw");
-delVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Del/VD+A2.raw");
-delVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Del/VD+A3.raw");
-delVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Del/VD+B1.raw");
-delVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Del/VD+B2.raw");
-delVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Del/VD+B3.raw");
+delVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Del/VD+A1.raw");
+delVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Del/VD+A2.raw");
+delVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Del/VD+A3.raw");
+delVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Del/VD+B1.raw");
+delVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Del/VD+B2.raw");
+delVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Del/VD+B3.raw");
var resizeVoxelSound = new SoundArray();
-resizeVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Size/V+Size+Minus.raw");
-resizeVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Voxel+Size/V+Size+Plus.raw");
+resizeVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Size/V+Size+Minus.raw");
+resizeVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Voxel+Size/V+Size+Plus.raw");
var voxelSizeMinus = 0;
var voxelSizePlus = 1;
var swatchesSound = new SoundArray();
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+1.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+2.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+3.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+4.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+5.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+6.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+7.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+8.raw");
-swatchesSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Swatches/Swatch+9.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+1.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+2.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+3.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+4.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+5.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+6.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+7.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+8.raw");
+swatchesSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Swatches/Swatch+9.raw");
var undoSound = new SoundArray();
-undoSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Undo/Undo+1.raw");
-undoSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Undo/Undo+2.raw");
-undoSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Undo/Undo+3.raw");
+undoSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Undo/Undo+1.raw");
+undoSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Undo/Undo+2.raw");
+undoSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Undo/Undo+3.raw");
var scriptInitSound = new SoundArray();
-scriptInitSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Script+Init/Script+Init+A.raw");
-scriptInitSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Script+Init/Script+Init+B.raw");
-scriptInitSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Script+Init/Script+Init+C.raw");
-scriptInitSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Script+Init/Script+Init+D.raw");
+scriptInitSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Script+Init/Script+Init+A.raw");
+scriptInitSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Script+Init/Script+Init+B.raw");
+scriptInitSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Script+Init/Script+Init+C.raw");
+scriptInitSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Script+Init/Script+Init+D.raw");
var modeSwitchSound = new SoundArray();
-modeSwitchSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Mode+Switch/Mode+1.raw");
-modeSwitchSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Mode+Switch/Mode+2.raw");
-modeSwitchSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Mode+Switch/Mode+3.raw");
+modeSwitchSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Mode+Switch/Mode+1.raw");
+modeSwitchSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Mode+Switch/Mode+2.raw");
+modeSwitchSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Mode+Switch/Mode+3.raw");
var initialVoxelSound = new SoundArray();
-initialVoxelSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Initial+Voxel/Initial+V.raw");
+initialVoxelSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Initial+Voxel/Initial+V.raw");
var colorInheritSound = new SoundArray();
-colorInheritSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Color+Inherit/Inherit+A.raw");
-colorInheritSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Color+Inherit/Inherit+B.raw");
-colorInheritSound.addSound("https://highfidelity-public.s3.amazonaws.com/sounds/Voxel+Editing/Color+Inherit/Inherit+C.raw");
+colorInheritSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Color+Inherit/Inherit+A.raw");
+colorInheritSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Color+Inherit/Inherit+B.raw");
+colorInheritSound.addSound(HIFI_PUBLIC_BUCKET + "sounds/Voxel+Editing/Color+Inherit/Inherit+C.raw");
// previewAsVoxel - by default, we will preview adds/deletes/recolors as just 4 lines on the intersecting face. But if you
// the preview to show a full voxel then set this to true and the voxel will be displayed for voxel editing
@@ -213,7 +215,7 @@ var swatchesWidth = swatchWidth * numColors + numColors + swatchExtraPadding * 2
var swatchesX = (windowDimensions.x - (swatchesWidth + scaleSelectorWidth)) / 2;
var swatchesY = windowDimensions.y - swatchHeight + 1;
-var toolIconUrl = "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/";
+var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
// create the overlays, position them in a row, set their colors, and for the selected one, use a different source image
// location so that it displays the "selected" marker
diff --git a/examples/fallingSand.js b/examples/fallingSand.js
index 4eccccdc5a..5018aeb9ca 100644
--- a/examples/fallingSand.js
+++ b/examples/fallingSand.js
@@ -12,12 +12,14 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var zFightingSizeAdjust = 0.002; // used to adjust preview voxels to prevent z fighting
var previewLineWidth = 2.0;
var voxelSize = 1;
var windowDimensions = Controller.getViewportDimensions();
-var toolIconUrl = "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/";
+var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var MAX_VOXEL_SCALE_POWER = 5;
var MIN_VOXEL_SCALE_POWER = -8;
diff --git a/examples/frisbee.js b/examples/frisbee.js
index c069d03275..653a1d4b57 100644
--- a/examples/frisbee.js
+++ b/examples/frisbee.js
@@ -14,6 +14,8 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+
+Script.include("libraries/globals.js");
Script.include("libraries/toolBars.js");
const LEFT_PALM = 0;
@@ -160,7 +162,7 @@ var currentMouseControl = false;
var newSound = new Sound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw");
var catchSound = new Sound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw");
-var throwSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
+var throwSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
var simulatedFrisbees = [];
diff --git a/examples/gamepad.js b/examples/gamepad.js
new file mode 100644
index 0000000000..4ec0309511
--- /dev/null
+++ b/examples/gamepad.js
@@ -0,0 +1,280 @@
+//
+// controller.js
+// examples
+//
+// Created by Ryan Huffman on 10/9/14.
+// Copyright 2014 High Fidelity, Inc.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// TODO Update to work with any controller that is plugged in.
+var CONTROLLER_NAMES = [
+ "Wireless 360 Controller",
+ "Controller (XBOX 360 For Windows)",
+ "Controller", // Wired 360 controller
+]
+
+for (var i = 0; i < CONTROLLER_NAMES.length; i++) {
+ gamepad = Joysticks.joystickWithName(CONTROLLER_NAMES[i]);
+ if (gamepad) {
+ print("Found controller: " + CONTROLLER_NAMES[i]);
+ break;
+ }
+}
+
+if (!gamepad) {
+ print("No gamepad found.");
+}
+
+// Controller axis/button mappings
+var GAMEPAD = {
+ AXES: {
+ LEFT_JOYSTICK_X: 0,
+ LEFT_JOYSTICK_Y: 1,
+
+ RIGHT_JOYSTICK_X: 2,
+ RIGHT_JOYSTICK_Y: 3,
+
+ LEFT_TRIGGER: 4,
+ RIGHT_TRIGGER: 5,
+ },
+ BUTTONS: {
+ DPAD_UP: 0,
+ DPAD_DOWN: 1,
+ DPAD_LEFT: 2,
+ DPAD_RIGHT: 3,
+
+ LEFT_JOYSTICK: 6,
+ RIGHT_JOYSTICK: 7,
+
+ LEFT_BUMPER: 8,
+ RIGHT_BUMPER: 9,
+
+ // Face buttons, ABXY on an XBOX controller
+ FACE_BOTTOM: 11,
+ FACE_RIGHT: 12,
+ FACE_LEFT: 13,
+ FACE_TOP: 14,
+ }
+}
+
+// Button/axis mappings
+var AXIS_STRAFE = GAMEPAD.AXES.LEFT_JOYSTICK_X;
+var AXIS_FORWARD = GAMEPAD.AXES.LEFT_JOYSTICK_Y;
+var AXIS_ROTATE = GAMEPAD.AXES.RIGHT_JOYSTICK_X;
+
+var BUTTON_TURN_AROUND = GAMEPAD.BUTTONS.RIGHT_JOYSTICK;
+
+var BUTTON_FLY_UP = GAMEPAD.BUTTONS.RIGHT_BUMPER;
+var BUTTON_FLY_DOWN = GAMEPAD.BUTTONS.LEFT_BUMPER
+var BUTTON_WARP = GAMEPAD.BUTTONS.FACE_BOTTOM;
+
+var BUTTON_WARP_FORWARD = GAMEPAD.BUTTONS.DPAD_UP;
+var BUTTON_WARP_BACKWARD = GAMEPAD.BUTTONS.DPAD_DOWN;
+var BUTTON_WARP_LEFT = GAMEPAD.BUTTONS.DPAD_LEFT;
+var BUTTON_WARP_RIGHT = GAMEPAD.BUTTONS.DPAD_RIGHT;
+
+// Distance in meters to warp via BUTTON_WARP_*
+var WARP_DISTANCE = 1;
+
+// Walk speed in m/s
+var MOVE_SPEED = 2;
+
+// Amount to rotate in radians
+var ROTATE_INCREMENT = Math.PI / 8;
+
+// Pick from above where we want to warp
+var WARP_PICK_OFFSET = { x: 0, y: 10, z: 0 };
+
+// When warping, the warp position will snap to a target below the current warp position.
+// This is the max distance it will snap to.
+var WARP_PICK_MAX_DISTANCE = 100;
+
+var flyDownButtonState = false;
+var flyUpButtonState = false;
+
+// Current move direction, axis aligned - that is, looking down and moving forward
+// will not move you into the ground, but instead will keep you on the horizontal plane.
+var moveDirection = { x: 0, y: 0, z: 0 };
+
+var warpActive = false;
+var warpPosition = { x: 0, y: 0, z: 0 };
+
+var WARP_SPHERE_SIZE = 1;
+var warpSphere = Overlays.addOverlay("sphere", {
+ position: { x: 0, y: 0, z: 0 },
+ size: WARP_SPHERE_SIZE,
+ color: { red: 0, green: 255, blue: 0 },
+ alpha: 1.0,
+ solid: true,
+ visible: false,
+});
+
+var WARP_LINE_HEIGHT = 10;
+var warpLine = Overlays.addOverlay("line3d", {
+ position: { x: 0, y: 0, z:0 },
+ end: { x: 0, y: 0, z: 0 },
+ color: { red: 0, green: 255, blue: 255},
+ alpha: 1,
+ lineWidth: 5,
+ visible: false,
+});
+
+function copyVec3(vec) {
+ return { x: vec.x, y: vec.y, z: vec.z };
+}
+
+function activateWarp() {
+ if (warpActive) return;
+ warpActive = true;
+
+ updateWarp();
+}
+
+function updateWarp() {
+ if (!warpActive) return;
+
+ var look = Quat.getFront(Camera.getOrientation());
+ var pitch = Math.asin(look.y);
+
+ // Get relative to looking straight down
+ pitch += Math.PI / 2;
+
+ // Scale up
+ pitch *= 2;
+ var distance = pitch * pitch * pitch;
+
+ var warpDirection = Vec3.normalize({ x: look.x, y: 0, z: look.z });
+ warpPosition = Vec3.multiply(warpDirection, distance);
+ warpPosition = Vec3.sum(MyAvatar.position, warpPosition);
+
+ var pickRay = {
+ origin: Vec3.sum(warpPosition, WARP_PICK_OFFSET),
+ direction: { x: 0, y: -1, z: 0 }
+ };
+
+ var intersection = Voxels.findRayIntersection(pickRay);
+
+ if (intersection.intersects && intersection.distance < WARP_PICK_MAX_DISTANCE) {
+ // Warp 1 meter above the object - this is an approximation
+ // TODO Get the actual offset to the Avatar's feet and plant them to
+ // the object.
+ warpPosition = Vec3.sum(intersection.intersection, { x: 0, y: 1, z:0 });
+ }
+
+ // Adjust overlays to match warp position
+ Overlays.editOverlay(warpSphere, {
+ position: warpPosition,
+ visible: true,
+ });
+ Overlays.editOverlay(warpLine, {
+ position: warpPosition,
+ end: Vec3.sum(warpPosition, { x: 0, y: WARP_LINE_HEIGHT, z: 0 }),
+ visible: true,
+ });
+}
+
+function finishWarp() {
+ if (!warpActive) return;
+ warpActive = false;
+ Overlays.editOverlay(warpSphere, {
+ visible: false,
+ });
+ Overlays.editOverlay(warpLine, {
+ visible: false,
+ });
+ MyAvatar.position = warpPosition;
+}
+
+function reportAxisValue(axis, newValue, oldValue) {
+ if (Math.abs(oldValue) < 0.2) oldValue = 0;
+ if (Math.abs(newValue) < 0.2) newValue = 0;
+
+ if (axis == AXIS_FORWARD) {
+ moveDirection.z = newValue;
+ } else if (axis == AXIS_STRAFE) {
+ moveDirection.x = newValue;
+ } else if (axis == AXIS_ROTATE) {
+ if (oldValue == 0 && newValue != 0) {
+ var rotateRadians = newValue > 0 ? -ROTATE_INCREMENT : ROTATE_INCREMENT;
+ var orientation = MyAvatar.orientation;
+ orientation = Quat.multiply(Quat.fromPitchYawRollRadians(0, rotateRadians, 0), orientation) ;
+ MyAvatar.orientation = orientation;
+ }
+ }
+}
+
+function reportButtonValue(button, newValue, oldValue) {
+ if (button == BUTTON_FLY_DOWN) {
+ flyDownButtonState = newValue;
+ } else if (button == BUTTON_FLY_UP) {
+ flyUpButtonState = newValue;
+ } else if (button == BUTTON_WARP) {
+ if (newValue) {
+ activateWarp();
+ } else {
+ finishWarp();
+ }
+ } else if (button == BUTTON_TURN_AROUND) {
+ if (newValue) {
+ MyAvatar.orientation = Quat.multiply(
+ Quat.fromPitchYawRollRadians(0, Math.PI, 0), MyAvatar.orientation);
+ }
+ } else if (newValue) {
+ var direction = null;
+
+ if (button == BUTTON_WARP_FORWARD) {
+ direction = Quat.getFront(Camera.getOrientation());
+ } else if (button == BUTTON_WARP_BACKWARD) {
+ direction = Quat.getFront(Camera.getOrientation());
+ direction = Vec3.multiply(-1, direction);
+ } else if (button == BUTTON_WARP_LEFT) {
+ direction = Quat.getRight(Camera.getOrientation());
+ direction = Vec3.multiply(-1, direction);
+ } else if (button == BUTTON_WARP_RIGHT) {
+ direction = Quat.getRight(Camera.getOrientation());
+ }
+
+ if (direction) {
+ direction.y = 0;
+ direction = Vec3.multiply(Vec3.normalize(direction), WARP_DISTANCE);
+ MyAvatar.position = Vec3.sum(MyAvatar.position, direction);
+ }
+ }
+
+ if (flyUpButtonState && !flyDownButtonState) {
+ moveDirection.y = 1;
+ } else if (!flyUpButtonState && flyDownButtonState) {
+ moveDirection.y = -1;
+ } else {
+ moveDirection.y = 0;
+ }
+}
+
+function update(dt) {
+ var velocity = { x: 0, y: 0, z: 0 };
+ var move = copyVec3(moveDirection);
+ move.y = 0;
+ if (Vec3.length(move) > 0) {
+ velocity = Vec3.multiplyQbyV(Camera.getOrientation(), move);
+ velocity.y = 0;
+ velocity = Vec3.multiply(Vec3.normalize(velocity), MOVE_SPEED);
+ }
+
+ if (moveDirection.y != 0) {
+ velocity.y = moveDirection.y * MOVE_SPEED;
+ }
+
+ MyAvatar.setVelocity(velocity);
+
+ updateWarp();
+}
+
+if (gamepad) {
+ gamepad.axisValueChanged.connect(reportAxisValue);
+ gamepad.buttonStateChanged.connect(reportButtonValue);
+
+ Script.update.connect(update);
+}
diff --git a/examples/grenadeLauncher.js b/examples/grenadeLauncher.js
index 0cac55baa7..dc25282448 100644
--- a/examples/grenadeLauncher.js
+++ b/examples/grenadeLauncher.js
@@ -14,6 +14,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
function getRandomFloat(min, max) {
return Math.random() * (max - min) + min;
}
@@ -34,11 +36,11 @@ var RELOAD_INTERVAL = 5;
var showScore = false;
// Load some sound to use for loading and firing
-var fireSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guns/GUN-SHOT2.raw");
-var loadSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guns/Gun_Reload_Weapon22.raw");
-var impactSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guns/BulletImpact2.raw");
-var targetHitSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/hit.raw");
-var targetLaunchSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/shoot.raw");
+var fireSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guns/GUN-SHOT2.raw");
+var loadSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guns/Gun_Reload_Weapon22.raw");
+var impactSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guns/BulletImpact2.raw");
+var targetHitSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/hit.raw");
+var targetLaunchSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/shoot.raw");
var gunModel = "http://public.highfidelity.io/models/attachments/HaloGun.fst";
@@ -67,7 +69,7 @@ var reticle = Overlays.addOverlay("image", {
y: screenSize.y / 2 - 16,
width: 32,
height: 32,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/reticle.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/reticle.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
diff --git a/examples/growTrees.js b/examples/growTrees.js
index 142c72300a..13d6cdc587 100644
--- a/examples/growTrees.js
+++ b/examples/growTrees.js
@@ -11,12 +11,14 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var zFightingSizeAdjust = 0.002; // used to adjust preview voxels to prevent z fighting
var previewLineWidth = 2.0;
var voxelSize = 1;
var windowDimensions = Controller.getViewportDimensions();
-var toolIconUrl = "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/";
+var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var MAX_VOXEL_SCALE_POWER = 5;
var MIN_VOXEL_SCALE_POWER = -8;
diff --git a/examples/gun.js b/examples/gun.js
index a5c0ee83e0..6f1371e5d9 100644
--- a/examples/gun.js
+++ b/examples/gun.js
@@ -14,6 +14,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
function getRandomFloat(min, max) {
return Math.random() * (max - min) + min;
}
@@ -33,11 +35,11 @@ var RELOAD_INTERVAL = 5;
var showScore = false;
// Load some sound to use for loading and firing
-var fireSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guns/GUN-SHOT2.raw");
-var loadSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guns/Gun_Reload_Weapon22.raw");
-var impactSound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guns/BulletImpact2.raw");
-var targetHitSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/hit.raw");
-var targetLaunchSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/shoot.raw");
+var fireSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guns/GUN-SHOT2.raw");
+var loadSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guns/Gun_Reload_Weapon22.raw");
+var impactSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guns/BulletImpact2.raw");
+var targetHitSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/hit.raw");
+var targetLaunchSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/shoot.raw");
var gunModel = "http://public.highfidelity.io/models/attachments/HaloGun.fst";
@@ -66,7 +68,7 @@ var reticle = Overlays.addOverlay("image", {
y: screenSize.y / 2 - 16,
width: 32,
height: 32,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/reticle.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/reticle.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
diff --git a/examples/inWorldTestTone.js b/examples/inWorldTestTone.js
index e4f34d87cd..590bb6c342 100644
--- a/examples/inWorldTestTone.js
+++ b/examples/inWorldTestTone.js
@@ -11,7 +11,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-var sound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/220Sine.wav");
+Script.include("libraries/globals.js");
+
+var sound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/220Sine.wav");
var soundPlaying = false;
diff --git a/examples/leapHands.js b/examples/leapHands.js
index 1095a9f4dc..c9c3af0063 100644
--- a/examples/leapHands.js
+++ b/examples/leapHands.js
@@ -23,15 +23,13 @@ var leapHands = (function () {
fingers,
NUM_FINGERS = 5, // 0 = thumb; ...; 4 = pinky
THUMB = 0,
- NUM_FINGER_JOINTS = 3, // 0 = metacarpal(hand)-proximal(finger) joint; ...; 2 = intermediate-distal(tip) joint
+ NUM_FINGER_JOINTS = 3, // 0 = metacarpal(hand)-proximal(finger) joint; ...; 2 = intermediate-distal joint
MAX_HAND_INACTIVE_COUNT = 20,
calibrationStatus,
UNCALIBRATED = 0,
CALIBRATING = 1,
CALIBRATED = 2,
CALIBRATION_TIME = 1000, // milliseconds
- PI = 3.141593,
- isWindows,
avatarScale,
avatarFaceModelURL,
avatarSkeletonModelURL,
@@ -132,9 +130,6 @@ var leapHands = (function () {
if (hands[0].controller.isActive() && hands[1].controller.isActive()) {
leapHandHeight = (hands[0].controller.getAbsTranslation().y + hands[1].controller.getAbsTranslation().y) / 2.0;
-
- // TODO: Temporary detection of Windows to work around Leap Controller problem.
- isWindows = (hands[1].controller.getAbsRotation().z > (0.25 * PI));
} else {
calibrationStatus = UNCALIBRATED;
return;
@@ -231,8 +226,6 @@ var leapHands = (function () {
function setUp() {
- // TODO: Leap Motion controller joint naming doesn't match up with skeleton joint naming; numbers are out by 1.
-
hands = [
{
jointName: "LeftHand",
@@ -251,6 +244,9 @@ var leapHands = (function () {
{ controller: Controller.createInputController("Spatial", "joint_R_wrist") }
];
+ // The Leap controller's first joint is the hand-metacarpal joint but this joint's data is not used because it's too
+ // dependent on the model skeleton exactly matching the Leap skeleton; using just the second and subsequent joints
+ // seems to work better over all.
fingers = [{}, {}];
fingers[0] = [
[
@@ -318,11 +314,7 @@ var leapHands = (function () {
j,
side,
handOffset,
- handRoll,
- handPitch,
- handYaw,
handRotation,
- wristAbsRotation,
locRotation,
cameraOrientation,
inverseAvatarOrientation;
@@ -361,20 +353,22 @@ var leapHands = (function () {
handOffset.x = -handOffset.x;
// Hand rotation in camera coordinates ...
- // TODO: 2.0* scale factors should not be necessary; Leap Motion controller code needs investigating.
- handRoll = 2.0 * -hands[h].controller.getAbsRotation().z;
- wristAbsRotation = wrists[h].controller.getAbsRotation();
- handPitch = 2.0 * wristAbsRotation.x - PI / 2.0;
- handYaw = 2.0 * -wristAbsRotation.y;
- // TODO: Roll values only work if hand is upside down; Leap Motion controller code needs investigating.
- handRoll = PI + handRoll;
+ handRotation = wrists[h].controller.getAbsRotation();
+ handRotation = {
+ x: handRotation.z,
+ y: handRotation.y,
+ z: handRotation.x,
+ w: handRotation.w
+ };
if (h === 0) {
- handRotation = Quat.multiply(Quat.angleAxis(-90.0, { x: 0, y: 1, z: 0 }),
- Quat.fromVec3Radians({ x: handRoll, y: handYaw, z: -handPitch }));
+ handRotation.x = -handRotation.x;
+ handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 1, y: 0, z: 0 }), handRotation);
+ handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 0, y: 0, z: 1 }), handRotation);
} else {
- handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 0, y: 1, z: 0 }),
- Quat.fromVec3Radians({ x: -handRoll, y: handYaw, z: handPitch }));
+ handRotation.z = -handRotation.z;
+ handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 1, y: 0, z: 0 }), handRotation);
+ handRotation = Quat.multiply(Quat.angleAxis(-90.0, { x: 0, y: 0, z: 1 }), handRotation);
}
// Hand rotation in avatar coordinates ...
@@ -392,44 +386,48 @@ var leapHands = (function () {
z: hands[h].zeroPosition.z - handOffset.z
};
- // TODO: 2.0* scale factors should not be necessary; Leap Motion controller code needs investigating.
- handRoll = 2.0 * -hands[h].controller.getAbsRotation().z;
- wristAbsRotation = wrists[h].controller.getAbsRotation();
- handPitch = 2.0 * -wristAbsRotation.x;
- handYaw = 2.0 * wristAbsRotation.y;
+ handRotation = wrists[h].controller.getAbsRotation();
+ handRotation = {
+ x: handRotation.z,
+ y: handRotation.y,
+ z: handRotation.x,
+ w: handRotation.w
+ };
- // TODO: Leap Motion controller's right-hand roll calculation only works if physical hand is upside down.
- // Approximate fix is to add a fudge factor.
- if (h === 1 && isWindows) {
- handRoll = handRoll + 0.6 * PI;
- }
-
- // Hand position and orientation ...
if (h === 0) {
+ handRotation.x = -handRotation.x;
handRotation = Quat.multiply(Quat.angleAxis(-90.0, { x: 0, y: 1, z: 0 }),
- Quat.fromVec3Radians({ x: handRoll, y: handYaw, z: -handPitch }));
+ handRotation);
} else {
+ handRotation.z = -handRotation.z;
handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 0, y: 1, z: 0 }),
- Quat.fromVec3Radians({ x: -handRoll, y: handYaw, z: handPitch }));
+ handRotation);
}
}
MyAvatar.setJointModelPositionAndOrientation(hands[h].jointName, handOffset, handRotation, true);
// Finger joints ...
- // TODO: 2.0 * scale factors should not be necessary; Leap Motion controller code needs investigating.
for (i = 0; i < NUM_FINGERS; i += 1) {
for (j = 0; j < NUM_FINGER_JOINTS; j += 1) {
if (fingers[h][i][j].controller !== null) {
locRotation = fingers[h][i][j].controller.getLocRotation();
if (i === THUMB) {
- MyAvatar.setJointData(fingers[h][i][j].jointName,
- Quat.fromPitchYawRollRadians(2.0 * side * locRotation.y, 2.0 * -locRotation.z,
- 2.0 * side * -locRotation.x));
+ locRotation = {
+ x: side * locRotation.y,
+ y: side * -locRotation.z,
+ z: side * -locRotation.x,
+ w: locRotation.w
+ };
} else {
- MyAvatar.setJointData(fingers[h][i][j].jointName,
- Quat.fromPitchYawRollRadians(2.0 * -locRotation.x, 0.0, 2.0 * -locRotation.y));
+ locRotation = {
+ x: -locRotation.x,
+ y: -locRotation.z,
+ z: -locRotation.y,
+ w: locRotation.w
+ };
}
+ MyAvatar.setJointData(fingers[h][i][j].jointName, locRotation);
}
}
}
diff --git a/examples/libraries/entityPropertyDialogBox.js b/examples/libraries/entityPropertyDialogBox.js
index fbac30e796..becc8c86b2 100644
--- a/examples/libraries/entityPropertyDialogBox.js
+++ b/examples/libraries/entityPropertyDialogBox.js
@@ -244,7 +244,7 @@ EntityPropertyDialogBox = (function () {
properties.color.blue = array[index++].value;
}
Entities.editEntity(editModelID, properties);
- selectionDisplay.highlightSelectable(editModelID, propeties);
+ selectionDisplay.select(editModelID, false);
}
modelSelected = false;
});
diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js
index 5a0164ad1f..b00876c969 100644
--- a/examples/libraries/entitySelectionTool.js
+++ b/examples/libraries/entitySelectionTool.js
@@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
SelectionDisplay = (function () {
var that = {};
@@ -29,10 +31,33 @@ SelectionDisplay = (function () {
var handleHoverColor = { red: 224, green: 67, blue: 36 };
var handleHoverAlpha = 1.0;
+ var rotateOverlayTargetSize = 10000; // really big target
+ var innerSnapAngle = 22.5; // the angle which we snap to on the inner rotation tool
+ var innerRadius;
+ var outerRadius;
+ var yawHandleRotation;
+ var pitchHandleRotation;
+ var rollHandleRotation;
+ var yawCenter;
+ var pitchCenter;
+ var rollCenter;
+ var yawZero;
+ var pitchZero;
+ var rollZero;
+ var yawNormal;
+ var pitchNormal;
+ var rollNormal;
+ var rotationNormal;
+
+ var originalRotation;
+ var originalPitch;
+ var originalYaw;
+ var originalRoll;
+
+
var rotateHandleColor = { red: 0, green: 0, blue: 0 };
var rotateHandleAlpha = 0.7;
-
var grabberSizeCorner = 0.025;
var grabberSizeEdge = 0.015;
var grabberSizeFace = 0.025;
@@ -100,7 +125,7 @@ SelectionDisplay = (function () {
});
var grabberMoveUp = Overlays.addOverlay("billboard", {
- url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/up-arrow.png",
+ url: HIFI_PUBLIC_BUCKET + "images/up-arrow.png",
position: { x:0, y: 0, z: 0},
color: { red: 0, green: 0, blue: 0 },
alpha: 1.0,
@@ -149,7 +174,8 @@ SelectionDisplay = (function () {
alpha: 0.5,
solid: true,
visible: false,
- rotation: baseOverlayRotation
+ rotation: baseOverlayRotation,
+ ignoreRayIntersection: true, // always ignore this
});
var yawOverlayAngles = { x: 90, y: 0, z: 0 };
@@ -159,6 +185,34 @@ SelectionDisplay = (function () {
var rollOverlayAngles = { x: 0, y: 180, z: 0 };
var rollOverlayRotation = Quat.fromVec3Degrees(rollOverlayAngles);
+ var rotateZeroOverlay = Overlays.addOverlay("line3d", {
+ visible: false,
+ lineWidth: 2.0,
+ start: { x: 0, y: 0, z: 0 },
+ end: { x: 0, y: 0, z: 0 },
+ color: { red: 255, green: 0, blue: 0 },
+ ignoreRayIntersection: true, // always ignore this
+ });
+
+ var rotateCurrentOverlay = Overlays.addOverlay("line3d", {
+ visible: false,
+ lineWidth: 2.0,
+ start: { x: 0, y: 0, z: 0 },
+ end: { x: 0, y: 0, z: 0 },
+ color: { red: 0, green: 0, blue: 255 },
+ ignoreRayIntersection: true, // always ignore this
+ });
+
+
+ var rotateOverlayTarget = Overlays.addOverlay("circle3d", {
+ position: { x:0, y: 0, z: 0},
+ size: rotateOverlayTargetSize,
+ color: { red: 0, green: 0, blue: 0 },
+ alpha: 0.0,
+ solid: true,
+ visible: false,
+ rotation: yawOverlayRotation,
+ });
var rotateOverlayInner = Overlays.addOverlay("circle3d", {
position: { x:0, y: 0, z: 0},
@@ -167,7 +221,15 @@ SelectionDisplay = (function () {
alpha: 0.2,
solid: true,
visible: false,
- rotation: yawOverlayRotation
+ rotation: yawOverlayRotation,
+ hasTickMarks: true,
+ majorTickMarksAngle: innerSnapAngle,
+ minorTickMarksAngle: 0,
+ majorTickMarksLength: -0.25,
+ minorTickMarksLength: 0,
+ majorTickMarksColor: { red: 0, green: 0, blue: 0 },
+ minorTickMarksColor: { red: 0, green: 0, blue: 0 },
+ ignoreRayIntersection: true, // always ignore this
});
var rotateOverlayOuter = Overlays.addOverlay("circle3d", {
@@ -177,7 +239,16 @@ SelectionDisplay = (function () {
alpha: 0.2,
solid: true,
visible: false,
- rotation: yawOverlayRotation
+ rotation: yawOverlayRotation,
+
+ hasTickMarks: true,
+ majorTickMarksAngle: 45.0,
+ minorTickMarksAngle: 5,
+ majorTickMarksLength: 0.25,
+ minorTickMarksLength: 0.1,
+ majorTickMarksColor: { red: 0, green: 0, blue: 0 },
+ minorTickMarksColor: { red: 0, green: 0, blue: 0 },
+ ignoreRayIntersection: true, // always ignore this
});
var rotateOverlayCurrent = Overlays.addOverlay("circle3d", {
@@ -188,10 +259,11 @@ SelectionDisplay = (function () {
solid: true,
visible: false,
rotation: yawOverlayRotation,
+ ignoreRayIntersection: true, // always ignore this
});
var yawHandle = Overlays.addOverlay("billboard", {
- url: "https://s3.amazonaws.com/uploads.hipchat.com/33953/231323/HRRhkMk8ueLk8ku/rotate-arrow.png",
+ url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png",
position: { x:0, y: 0, z: 0},
color: rotateHandleColor,
alpha: rotateHandleAlpha,
@@ -203,7 +275,7 @@ SelectionDisplay = (function () {
var pitchHandle = Overlays.addOverlay("billboard", {
- url: "https://s3.amazonaws.com/uploads.hipchat.com/33953/231323/HRRhkMk8ueLk8ku/rotate-arrow.png",
+ url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png",
position: { x:0, y: 0, z: 0},
color: rotateHandleColor,
alpha: rotateHandleAlpha,
@@ -215,7 +287,7 @@ SelectionDisplay = (function () {
var rollHandle = Overlays.addOverlay("billboard", {
- url: "https://s3.amazonaws.com/uploads.hipchat.com/33953/231323/HRRhkMk8ueLk8ku/rotate-arrow.png",
+ url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png",
position: { x:0, y: 0, z: 0},
color: rotateHandleColor,
alpha: rotateHandleAlpha,
@@ -262,11 +334,14 @@ SelectionDisplay = (function () {
overlayNames[pitchHandle] = "pitchHandle";
overlayNames[rollHandle] = "rollHandle";
+ overlayNames[rotateOverlayTarget] = "rotateOverlayTarget";
overlayNames[rotateOverlayInner] = "rotateOverlayInner";
overlayNames[rotateOverlayOuter] = "rotateOverlayOuter";
overlayNames[rotateOverlayCurrent] = "rotateOverlayCurrent";
-
+ overlayNames[rotateZeroOverlay] = "rotateZeroOverlay";
+ overlayNames[rotateCurrentOverlay] = "rotateCurrentOverlay";
+
that.cleanup = function () {
Overlays.deleteOverlay(highlightBox);
Overlays.deleteOverlay(selectionBox);
@@ -305,10 +380,15 @@ SelectionDisplay = (function () {
Overlays.deleteOverlay(pitchHandle);
Overlays.deleteOverlay(rollHandle);
+ Overlays.deleteOverlay(rotateOverlayTarget);
Overlays.deleteOverlay(rotateOverlayInner);
Overlays.deleteOverlay(rotateOverlayOuter);
Overlays.deleteOverlay(rotateOverlayCurrent);
+ Overlays.deleteOverlay(rotateZeroOverlay);
+ Overlays.deleteOverlay(rotateCurrentOverlay);
+
+
};
that.highlightSelectable = function(entityID) {
@@ -360,8 +440,8 @@ SelectionDisplay = (function () {
var diagonal = (Vec3.length(properties.dimensions) / 2) * 1.1;
var halfDimensions = Vec3.multiply(properties.dimensions, 0.5);
- var innerRadius = diagonal;
- var outerRadius = diagonal * 1.15;
+ innerRadius = diagonal;
+ outerRadius = diagonal * 1.15;
var innerActive = false;
var innerAlpha = 0.2;
var outerAlpha = 0.2;
@@ -374,31 +454,33 @@ SelectionDisplay = (function () {
var rotateHandleOffset = 0.05;
var grabberMoveUpOffset = 0.1;
- var left = properties.position.x - halfDimensions.x;
- var right = properties.position.x + halfDimensions.x;
- var bottom = properties.position.y - halfDimensions.y;
- var top = properties.position.y + halfDimensions.y;
- var near = properties.position.z - halfDimensions.z;
- var far = properties.position.z + halfDimensions.z;
- var center = { x: properties.position.x, y: properties.position.y, z: properties.position.z };
+ var top, far, left, bottom, near, right, boundsCenter, objectCenter, BLN, BRN, BLF, TLN, TRN, TLF, TRF;
- var BLN = { x: left, y: bottom, z: near };
- var BRN = { x: right, y: bottom, z: near };
- var BLF = { x: left, y: bottom, z: far };
- var BRF = { x: right, y: bottom, z: far };
- var TLN = { x: left, y: top, z: near };
- var TRN = { x: right, y: top, z: near };
- var TLF = { x: left, y: top, z: far };
- var TRF = { x: right, y: top, z: far };
+ objectCenter = { x: properties.position.x, y: properties.position.y, z: properties.position.z };
+
+ top = properties.boundingBox.tfl.y;
+ far = properties.boundingBox.tfl.z;
+ left = properties.boundingBox.tfl.x;
+
+ bottom = properties.boundingBox.brn.y;
+ right = properties.boundingBox.brn.x;
+ near = properties.boundingBox.brn.z;
+
+ boundsCenter = { x: properties.boundingBox.center.x, y: properties.boundingBox.center.y, z: properties.boundingBox.center.z };
+
+ BLN = { x: left, y: bottom, z: near };
+ BRN = { x: right, y: bottom, z: near };
+ BLF = { x: left, y: bottom, z: far };
+ BRF = { x: right, y: bottom, z: far };
+ TLN = { x: left, y: top, z: near };
+ TRN = { x: right, y: top, z: near };
+ TLF = { x: left, y: top, z: far };
+ TRF = { x: right, y: top, z: far };
var yawCorner;
var pitchCorner;
var rollCorner;
- var yawHandleRotation;
- var pitchHandleRotation;
- var rollHandleRotation;
-
// determine which bottom corner we are closest to
/*------------------------------
example:
@@ -412,124 +494,189 @@ SelectionDisplay = (function () {
------------------------------*/
- if (MyAvatar.position.x > center.x) {
+ if (MyAvatar.position.x > objectCenter.x) {
// must be BRF or BRN
- if (MyAvatar.position.z < center.z) {
- yawHandleRotation = Quat.fromVec3Degrees({ x: 90, y: 0, z: 0 });
- pitchHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 180, z: 180 });
- rollHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 90, z: 180 });
+ if (MyAvatar.position.z < objectCenter.z) {
- yawCorner = { x: right + rotateHandleOffset,
+ yawHandleRotation = Quat.fromVec3Degrees({ x: 270, y: 90, z: 0 });
+ pitchHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 90, z: 0 });
+ rollHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 0, z: 0 });
+
+ yawNormal = { x: 0, y: 1, z: 0 };
+ pitchNormal = { x: 1, y: 0, z: 0 };
+ rollNormal = { x: 0, y: 0, z: 1 };
+
+ yawCorner = { x: left + rotateHandleOffset,
y: bottom - rotateHandleOffset,
z: near - rotateHandleOffset };
- pitchCorner = { x: right + rotateHandleOffset,
- y: top + rotateHandleOffset,
- z: far + rotateHandleOffset };
-
- rollCorner = { x: left - rotateHandleOffset,
+ pitchCorner = { x: right - rotateHandleOffset,
y: top + rotateHandleOffset,
z: near - rotateHandleOffset};
+ rollCorner = { x: left + rotateHandleOffset,
+ y: top + rotateHandleOffset,
+ z: far + rotateHandleOffset };
+
+ yawCenter = { x: boundsCenter.x, y: bottom, z: boundsCenter.z };
+ pitchCenter = { x: right, y: boundsCenter.y, z: boundsCenter.z};
+ rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: far };
+
+
+ Overlays.editOverlay(pitchHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-south.png" });
+ Overlays.editOverlay(rollHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-south.png" });
+
+
} else {
- yawHandleRotation = Quat.fromVec3Degrees({ x: 90, y: 270, z: 0 });
+
+ yawHandleRotation = Quat.fromVec3Degrees({ x: 270, y: 0, z: 0 });
pitchHandleRotation = Quat.fromVec3Degrees({ x: 180, y: 270, z: 0 });
rollHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 0, z: 90 });
- yawCorner = { x: right + rotateHandleOffset,
+ yawNormal = { x: 0, y: 1, z: 0 };
+ pitchNormal = { x: 1, y: 0, z: 0 };
+ rollNormal = { x: 0, y: 0, z: 1 };
+
+
+ yawCorner = { x: left + rotateHandleOffset,
y: bottom - rotateHandleOffset,
z: far + rotateHandleOffset };
- pitchCorner = { x: left - rotateHandleOffset,
+ pitchCorner = { x: right - rotateHandleOffset,
y: top + rotateHandleOffset,
z: far + rotateHandleOffset };
- rollCorner = { x: right + rotateHandleOffset,
+ rollCorner = { x: left + rotateHandleOffset,
y: top + rotateHandleOffset,
z: near - rotateHandleOffset};
+
+ yawCenter = { x: boundsCenter.x, y: bottom, z: boundsCenter.z };
+ pitchCenter = { x: right, y: boundsCenter.y, z: boundsCenter.z };
+ rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: near};
+
+ Overlays.editOverlay(pitchHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png" });
+ Overlays.editOverlay(rollHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png" });
}
} else {
+
// must be BLF or BLN
- if (MyAvatar.position.z < center.z) {
- yawHandleRotation = Quat.fromVec3Degrees({ x: 90, y: 90, z: 0 });
+ if (MyAvatar.position.z < objectCenter.z) {
+
+ yawHandleRotation = Quat.fromVec3Degrees({ x: 270, y: 180, z: 0 });
pitchHandleRotation = Quat.fromVec3Degrees({ x: 90, y: 0, z: 90 });
rollHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 0, z: 180 });
- yawCorner = { x: left - rotateHandleOffset,
+ yawNormal = { x: 0, y: 1, z: 0 };
+ pitchNormal = { x: 1, y: 0, z: 0 };
+ rollNormal = { x: 0, y: 0, z: 1 };
+
+ yawCorner = { x: right - rotateHandleOffset,
y: bottom - rotateHandleOffset,
z: near - rotateHandleOffset };
- pitchCorner = { x: right + rotateHandleOffset,
+ pitchCorner = { x: left + rotateHandleOffset,
y: top + rotateHandleOffset,
z: near - rotateHandleOffset };
- rollCorner = { x: left - rotateHandleOffset,
+ rollCorner = { x: right - rotateHandleOffset,
y: top + rotateHandleOffset,
z: far + rotateHandleOffset};
-
- } else {
- yawHandleRotation = Quat.fromVec3Degrees({ x: 90, y: 180, z: 0 });
- pitchHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 0, z: 180 });
- rollHandleRotation = Quat.fromVec3Degrees({ x: 180, y: 270, z: 0 });
+ yawCenter = { x: boundsCenter.x, y: bottom, z: boundsCenter.z };
+ pitchCenter = { x: left, y: boundsCenter.y, z: boundsCenter.z };
+ rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: far};
- yawCorner = { x: left - rotateHandleOffset,
+ Overlays.editOverlay(pitchHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png" });
+ Overlays.editOverlay(rollHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png" });
+
+ } else {
+
+ yawHandleRotation = Quat.fromVec3Degrees({ x: 270, y: 270, z: 0 });
+ rollHandleRotation = Quat.fromVec3Degrees({ x: 0, y: 0, z: 180 });
+ pitchHandleRotation = Quat.fromVec3Degrees({ x: 180, y: 270, z: 0 });
+
+ yawNormal = { x: 0, y: 1, z: 0 };
+ rollNormal = { x: 0, y: 0, z: 1 };
+ pitchNormal = { x: 1, y: 0, z: 0 };
+
+ yawCorner = { x: right - rotateHandleOffset,
y: bottom - rotateHandleOffset,
z: far + rotateHandleOffset };
- pitchCorner = { x: left - rotateHandleOffset,
+ rollCorner = { x: right - rotateHandleOffset,
y: top + rotateHandleOffset,
z: near - rotateHandleOffset };
- rollCorner = { x: right + rotateHandleOffset,
+ pitchCorner = { x: left + rotateHandleOffset,
y: top + rotateHandleOffset,
z: far + rotateHandleOffset};
+
+ yawCenter = { x: boundsCenter.x, y: bottom, z: boundsCenter.z };
+ rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: near };
+ pitchCenter = { x: left, y: boundsCenter.y, z: boundsCenter.z};
+
+ Overlays.editOverlay(pitchHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png" });
+ Overlays.editOverlay(rollHandle, { url: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/rotate-arrow-west-north.png" });
+
}
}
+
+ var rotateHandlesVisible = true;
+ var translateHandlesVisible = true;
+ var stretchHandlesVisible = true;
+ var selectionBoxVisible = true;
+ if (mode == "ROTATE_YAW" || mode == "ROTATE_PITCH" || mode == "ROTATE_ROLL" || mode == "TRANSLATE_XZ") {
+ rotateHandlesVisible = false;
+ translateHandlesVisible = false;
+ stretchHandlesVisible = false;
+ selectionBoxVisible = false;
+ } else if (mode == "TRANSLATE_UP_DOWN") {
+ rotateHandlesVisible = false;
+ stretchHandlesVisible = false;
+ } else if (mode != "UNKNOWN") {
+ // every other mode is a stretch mode...
+ rotateHandlesVisible = false;
+ translateHandlesVisible = false;
+ }
Overlays.editOverlay(highlightBox, { visible: false });
- Overlays.editOverlay(selectionBox,
- {
- visible: true,
- position: center,
- dimensions: properties.dimensions,
- rotation: properties.rotation,
- });
+ Overlays.editOverlay(selectionBox, { visible: selectionBoxVisible, position: objectCenter, dimensions: properties.dimensions,
+ rotation: properties.rotation,});
- Overlays.editOverlay(grabberMoveUp, { visible: true, position: { x: center.x, y: top + grabberMoveUpOffset, z: center.z } });
+ Overlays.editOverlay(grabberMoveUp, { visible: translateHandlesVisible, position: { x: boundsCenter.x, y: top + grabberMoveUpOffset, z: boundsCenter.z } });
- Overlays.editOverlay(grabberLBN, { visible: true, position: { x: left, y: bottom, z: near } });
- Overlays.editOverlay(grabberRBN, { visible: true, position: { x: right, y: bottom, z: near } });
- Overlays.editOverlay(grabberLBF, { visible: true, position: { x: left, y: bottom, z: far } });
- Overlays.editOverlay(grabberRBF, { visible: true, position: { x: right, y: bottom, z: far } });
- Overlays.editOverlay(grabberLTN, { visible: true, position: { x: left, y: top, z: near } });
- Overlays.editOverlay(grabberRTN, { visible: true, position: { x: right, y: top, z: near } });
- Overlays.editOverlay(grabberLTF, { visible: true, position: { x: left, y: top, z: far } });
- Overlays.editOverlay(grabberRTF, { visible: true, position: { x: right, y: top, z: far } });
+ Overlays.editOverlay(grabberLBN, { visible: stretchHandlesVisible, position: { x: left, y: bottom, z: near } });
+ Overlays.editOverlay(grabberRBN, { visible: stretchHandlesVisible, position: { x: right, y: bottom, z: near } });
+ Overlays.editOverlay(grabberLBF, { visible: stretchHandlesVisible, position: { x: left, y: bottom, z: far } });
+ Overlays.editOverlay(grabberRBF, { visible: stretchHandlesVisible, position: { x: right, y: bottom, z: far } });
+ Overlays.editOverlay(grabberLTN, { visible: stretchHandlesVisible, position: { x: left, y: top, z: near } });
+ Overlays.editOverlay(grabberRTN, { visible: stretchHandlesVisible, position: { x: right, y: top, z: near } });
+ Overlays.editOverlay(grabberLTF, { visible: stretchHandlesVisible, position: { x: left, y: top, z: far } });
+ Overlays.editOverlay(grabberRTF, { visible: stretchHandlesVisible, position: { x: right, y: top, z: far } });
- Overlays.editOverlay(grabberTOP, { visible: true, position: { x: center.x, y: top, z: center.z } });
- Overlays.editOverlay(grabberBOTTOM, { visible: true, position: { x: center.x, y: bottom, z: center.z } });
- Overlays.editOverlay(grabberLEFT, { visible: true, position: { x: left, y: center.y, z: center.z } });
- Overlays.editOverlay(grabberRIGHT, { visible: true, position: { x: right, y: center.y, z: center.z } });
- Overlays.editOverlay(grabberNEAR, { visible: true, position: { x: center.x, y: center.y, z: near } });
- Overlays.editOverlay(grabberFAR, { visible: true, position: { x: center.x, y: center.y, z: far } });
+ Overlays.editOverlay(grabberTOP, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: top, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberBOTTOM, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: bottom, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberLEFT, { visible: stretchHandlesVisible, position: { x: left, y: boundsCenter.y, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberRIGHT, { visible: stretchHandlesVisible, position: { x: right, y: boundsCenter.y, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberNEAR, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: boundsCenter.y, z: near } });
+ Overlays.editOverlay(grabberFAR, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: boundsCenter.y, z: far } });
- Overlays.editOverlay(grabberEdgeTR, { visible: true, position: { x: right, y: top, z: center.z } });
- Overlays.editOverlay(grabberEdgeTL, { visible: true, position: { x: left, y: top, z: center.z } });
- Overlays.editOverlay(grabberEdgeTF, { visible: true, position: { x: center.x, y: top, z: far } });
- Overlays.editOverlay(grabberEdgeTN, { visible: true, position: { x: center.x, y: top, z: near } });
- Overlays.editOverlay(grabberEdgeBR, { visible: true, position: { x: right, y: bottom, z: center.z } });
- Overlays.editOverlay(grabberEdgeBL, { visible: true, position: { x: left, y: bottom, z: center.z } });
- Overlays.editOverlay(grabberEdgeBF, { visible: true, position: { x: center.x, y: bottom, z: far } });
- Overlays.editOverlay(grabberEdgeBN, { visible: true, position: { x: center.x, y: bottom, z: near } });
- Overlays.editOverlay(grabberEdgeNR, { visible: true, position: { x: right, y: center.y, z: near } });
- Overlays.editOverlay(grabberEdgeNL, { visible: true, position: { x: left, y: center.y, z: near } });
- Overlays.editOverlay(grabberEdgeFR, { visible: true, position: { x: right, y: center.y, z: far } });
- Overlays.editOverlay(grabberEdgeFL, { visible: true, position: { x: left, y: center.y, z: far } });
+ Overlays.editOverlay(grabberEdgeTR, { visible: stretchHandlesVisible, position: { x: right, y: top, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberEdgeTL, { visible: stretchHandlesVisible, position: { x: left, y: top, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberEdgeTF, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: top, z: far } });
+ Overlays.editOverlay(grabberEdgeTN, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: top, z: near } });
+ Overlays.editOverlay(grabberEdgeBR, { visible: stretchHandlesVisible, position: { x: right, y: bottom, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberEdgeBL, { visible: stretchHandlesVisible, position: { x: left, y: bottom, z: boundsCenter.z } });
+ Overlays.editOverlay(grabberEdgeBF, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: bottom, z: far } });
+ Overlays.editOverlay(grabberEdgeBN, { visible: stretchHandlesVisible, position: { x: boundsCenter.x, y: bottom, z: near } });
+ Overlays.editOverlay(grabberEdgeNR, { visible: stretchHandlesVisible, position: { x: right, y: boundsCenter.y, z: near } });
+ Overlays.editOverlay(grabberEdgeNL, { visible: stretchHandlesVisible, position: { x: left, y: boundsCenter.y, z: near } });
+ Overlays.editOverlay(grabberEdgeFR, { visible: stretchHandlesVisible, position: { x: right, y: boundsCenter.y, z: far } });
+ Overlays.editOverlay(grabberEdgeFL, { visible: stretchHandlesVisible, position: { x: left, y: boundsCenter.y, z: far } });
Overlays.editOverlay(baseOfEntityProjectionOverlay,
@@ -545,14 +692,12 @@ SelectionDisplay = (function () {
rotation: properties.rotation,
});
+
+ Overlays.editOverlay(rotateOverlayTarget, { visible: false });
Overlays.editOverlay(rotateOverlayInner,
{
visible: false,
- position: { x: properties.position.x,
- y: properties.position.y - (properties.dimensions.y / 2),
- z: properties.position.z},
-
size: innerRadius,
innerRadius: 0.9,
alpha: innerAlpha
@@ -561,34 +706,29 @@ SelectionDisplay = (function () {
Overlays.editOverlay(rotateOverlayOuter,
{
visible: false,
- position: { x: properties.position.x,
- y: properties.position.y - (properties.dimensions.y / 2),
- z: properties.position.z},
-
size: outerRadius,
innerRadius: 0.9,
startAt: 0,
endAt: 360,
- alpha: outerAlpha
+ alpha: outerAlpha,
});
Overlays.editOverlay(rotateOverlayCurrent,
{
visible: false,
- position: { x: properties.position.x,
- y: properties.position.y - (properties.dimensions.y / 2),
- z: properties.position.z},
-
size: outerRadius,
startAt: 0,
endAt: 0,
- innerRadius: 0.9
+ innerRadius: 0.9,
});
+
+ Overlays.editOverlay(rotateZeroOverlay, { visible: false });
+ Overlays.editOverlay(rotateCurrentOverlay, { visible: false });
// TODO: we have not implemented the rotating handle/controls yet... so for now, these handles are hidden
- Overlays.editOverlay(yawHandle, { visible: false, position: yawCorner, rotation: yawHandleRotation});
- Overlays.editOverlay(pitchHandle, { visible: false, position: pitchCorner, rotation: pitchHandleRotation});
- Overlays.editOverlay(rollHandle, { visible: false, position: rollCorner, rotation: rollHandleRotation});
+ Overlays.editOverlay(yawHandle, { visible: rotateHandlesVisible, position: yawCorner, rotation: yawHandleRotation});
+ Overlays.editOverlay(pitchHandle, { visible: rotateHandlesVisible, position: pitchCorner, rotation: pitchHandleRotation});
+ Overlays.editOverlay(rollHandle, { visible: rotateHandlesVisible, position: rollCorner, rotation: rollHandleRotation});
Entities.editEntity(entityID, { localRenderAlpha: 0.1 });
};
@@ -638,10 +778,14 @@ SelectionDisplay = (function () {
Overlays.editOverlay(pitchHandle, { visible: false });
Overlays.editOverlay(rollHandle, { visible: false });
+ Overlays.editOverlay(rotateOverlayTarget, { visible: false });
Overlays.editOverlay(rotateOverlayInner, { visible: false });
Overlays.editOverlay(rotateOverlayOuter, { visible: false });
Overlays.editOverlay(rotateOverlayCurrent, { visible: false });
+ Overlays.editOverlay(rotateZeroOverlay, { visible: false });
+ Overlays.editOverlay(rotateCurrentOverlay, { visible: false });
+
Entities.editEntity(entityID, { localRenderAlpha: 1.0 });
currentSelection = { id: -1, isKnownID: false };
@@ -1423,7 +1567,185 @@ SelectionDisplay = (function () {
Entities.editEntity(currentSelection, selectedEntityProperties);
tooltip.updateText(selectedEntityProperties);
that.select(currentSelection, false); // TODO: this should be more than highlighted
- };
+ };
+
+ that.rotateYaw = function(event) {
+ if (!entitySelected || mode !== "ROTATE_YAW") {
+ return; // not allowed
+ }
+
+ var pickRay = Camera.computePickRay(event.x, event.y);
+ Overlays.editOverlay(selectionBox, { ignoreRayIntersection: true, visible: false});
+ Overlays.editOverlay(baseOfEntityProjectionOverlay, { ignoreRayIntersection: true, visible: false });
+ Overlays.editOverlay(rotateOverlayTarget, { ignoreRayIntersection: false });
+ Overlays.editOverlay(rotateOverlayInner, { ignoreRayIntersection: true });
+ Overlays.editOverlay(rotateOverlayOuter, { ignoreRayIntersection: true });
+ Overlays.editOverlay(rotateOverlayCurrent, { ignoreRayIntersection: true });
+
+ var result = Overlays.findRayIntersection(pickRay);
+ if (result.intersects) {
+ var properties = Entities.getEntityProperties(currentSelection);
+ var center = yawCenter;
+ var zero = yawZero;
+ var centerToZero = Vec3.subtract(center, zero);
+ var centerToIntersect = Vec3.subtract(center, result.intersection);
+ var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
+
+ var distanceFromCenter = Vec3.distance(center, result.intersection);
+ var snapToInner = false;
+ if (distanceFromCenter < innerRadius) {
+ angleFromZero = Math.floor(angleFromZero/innerSnapAngle) * innerSnapAngle;
+ snapToInner = true;
+ }
+
+ // for debugging
+ //Overlays.editOverlay(rotateCurrentOverlay, { visible: true, start: center, end: result.intersection });
+
+ var yawChange = Quat.fromVec3Degrees({ x: 0, y: angleFromZero, z: 0 });
+ var newRotation = Quat.multiply(yawChange, originalRotation);
+
+ Entities.editEntity(currentSelection, { rotation: newRotation });
+
+ // update the rotation display accordingly...
+ var startAtCurrent = 0;
+ var endAtCurrent = angleFromZero;
+ var startAtRemainder = angleFromZero;
+ var endAtRemainder = 360;
+ if (angleFromZero < 0) {
+ startAtCurrent = 360 + angleFromZero;
+ endAtCurrent = 360;
+ startAtRemainder = 0;
+ endAtRemainder = startAtCurrent;
+ }
+ if (snapToInner) {
+ Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 });
+ Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder });
+ Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius });
+ } else {
+ Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 });
+ Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder });
+ Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius });
+ }
+
+ }
+ };
+
+ that.rotatePitch = function(event) {
+ if (!entitySelected || mode !== "ROTATE_PITCH") {
+ return; // not allowed
+ }
+ var pickRay = Camera.computePickRay(event.x, event.y);
+ Overlays.editOverlay(selectionBox, { ignoreRayIntersection: true, visible: false});
+ Overlays.editOverlay(baseOfEntityProjectionOverlay, { ignoreRayIntersection: true, visible: false });
+ Overlays.editOverlay(rotateOverlayTarget, { ignoreRayIntersection: false });
+ Overlays.editOverlay(rotateOverlayInner, { ignoreRayIntersection: true });
+ Overlays.editOverlay(rotateOverlayOuter, { ignoreRayIntersection: true });
+ Overlays.editOverlay(rotateOverlayCurrent, { ignoreRayIntersection: true });
+ var result = Overlays.findRayIntersection(pickRay);
+
+ if (result.intersects) {
+ var properties = Entities.getEntityProperties(currentSelection);
+ var center = pitchCenter;
+ var zero = pitchZero;
+ var centerToZero = Vec3.subtract(center, zero);
+ var centerToIntersect = Vec3.subtract(center, result.intersection);
+ var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
+
+ var distanceFromCenter = Vec3.distance(center, result.intersection);
+ var snapToInner = false;
+ if (distanceFromCenter < innerRadius) {
+ angleFromZero = Math.floor(angleFromZero/innerSnapAngle) * innerSnapAngle;
+ snapToInner = true;
+ }
+
+ // for debugging
+ //Overlays.editOverlay(rotateCurrentOverlay, { visible: true, start: center, end: result.intersection });
+
+ var pitchChange = Quat.fromVec3Degrees({ x: angleFromZero, y: 0, z: 0 });
+ var newRotation = Quat.multiply(pitchChange, originalRotation);
+
+ Entities.editEntity(currentSelection, { rotation: newRotation });
+
+ // update the rotation display accordingly...
+ var startAtCurrent = 0;
+ var endAtCurrent = angleFromZero;
+ var startAtRemainder = angleFromZero;
+ var endAtRemainder = 360;
+ if (angleFromZero < 0) {
+ startAtCurrent = 360 + angleFromZero;
+ endAtCurrent = 360;
+ startAtRemainder = 0;
+ endAtRemainder = startAtCurrent;
+ }
+ if (snapToInner) {
+ Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 });
+ Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder });
+ Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius });
+ } else {
+ Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 });
+ Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder });
+ Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius });
+ }
+ }
+ };
+
+ that.rotateRoll = function(event) {
+ if (!entitySelected || mode !== "ROTATE_ROLL") {
+ return; // not allowed
+ }
+ var pickRay = Camera.computePickRay(event.x, event.y);
+ Overlays.editOverlay(selectionBox, { ignoreRayIntersection: true, visible: false});
+ Overlays.editOverlay(baseOfEntityProjectionOverlay, { ignoreRayIntersection: true, visible: false });
+ Overlays.editOverlay(rotateOverlayTarget, { ignoreRayIntersection: false });
+ Overlays.editOverlay(rotateOverlayInner, { ignoreRayIntersection: true });
+ Overlays.editOverlay(rotateOverlayOuter, { ignoreRayIntersection: true });
+ Overlays.editOverlay(rotateOverlayCurrent, { ignoreRayIntersection: true });
+ var result = Overlays.findRayIntersection(pickRay);
+ if (result.intersects) {
+ var properties = Entities.getEntityProperties(currentSelection);
+ var center = rollCenter;
+ var zero = rollZero;
+ var centerToZero = Vec3.subtract(center, zero);
+ var centerToIntersect = Vec3.subtract(center, result.intersection);
+ var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
+
+ var distanceFromCenter = Vec3.distance(center, result.intersection);
+ var snapToInner = false;
+ if (distanceFromCenter < innerRadius) {
+ angleFromZero = Math.floor(angleFromZero/innerSnapAngle) * innerSnapAngle;
+ snapToInner = true;
+ }
+
+ // for debugging
+ //Overlays.editOverlay(rotateCurrentOverlay, { visible: true, start: center, end: result.intersection });
+
+ var rollChange = Quat.fromVec3Degrees({ x: 0, y: 0, z: angleFromZero });
+ var newRotation = Quat.multiply(rollChange, originalRotation);
+
+ Entities.editEntity(currentSelection, { rotation: newRotation });
+
+ // update the rotation display accordingly...
+ var startAtCurrent = 0;
+ var endAtCurrent = angleFromZero;
+ var startAtRemainder = angleFromZero;
+ var endAtRemainder = 360;
+ if (angleFromZero < 0) {
+ startAtCurrent = 360 + angleFromZero;
+ endAtCurrent = 360;
+ startAtRemainder = 0;
+ endAtRemainder = startAtCurrent;
+ }
+ if (snapToInner) {
+ Overlays.editOverlay(rotateOverlayOuter, { startAt: 0, endAt: 360 });
+ Overlays.editOverlay(rotateOverlayInner, { startAt: startAtRemainder, endAt: endAtRemainder });
+ Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: innerRadius });
+ } else {
+ Overlays.editOverlay(rotateOverlayInner, { startAt: 0, endAt: 360 });
+ Overlays.editOverlay(rotateOverlayOuter, { startAt: startAtRemainder, endAt: endAtRemainder });
+ Overlays.editOverlay(rotateOverlayCurrent, { startAt: startAtCurrent, endAt: endAtCurrent, size: outerRadius });
+ }
+ }
+ };
that.checkMove = function() {
if (currentSelection.isKnownID &&
@@ -1460,6 +1782,36 @@ SelectionDisplay = (function () {
case grabberMoveUp:
mode = "TRANSLATE_UP_DOWN";
somethingClicked = true;
+
+ // in translate mode, we hide our stretch handles...
+ Overlays.editOverlay(grabberLBN, { visible: false });
+ Overlays.editOverlay(grabberLBF, { visible: false });
+ Overlays.editOverlay(grabberRBN, { visible: false });
+ Overlays.editOverlay(grabberRBF, { visible: false });
+ Overlays.editOverlay(grabberLTN, { visible: false });
+ Overlays.editOverlay(grabberLTF, { visible: false });
+ Overlays.editOverlay(grabberRTN, { visible: false });
+ Overlays.editOverlay(grabberRTF, { visible: false });
+
+ Overlays.editOverlay(grabberTOP, { visible: false });
+ Overlays.editOverlay(grabberBOTTOM, { visible: false });
+ Overlays.editOverlay(grabberLEFT, { visible: false });
+ Overlays.editOverlay(grabberRIGHT, { visible: false });
+ Overlays.editOverlay(grabberNEAR, { visible: false });
+ Overlays.editOverlay(grabberFAR, { visible: false });
+
+ Overlays.editOverlay(grabberEdgeTR, { visible: false });
+ Overlays.editOverlay(grabberEdgeTL, { visible: false });
+ Overlays.editOverlay(grabberEdgeTF, { visible: false });
+ Overlays.editOverlay(grabberEdgeTN, { visible: false });
+ Overlays.editOverlay(grabberEdgeBR, { visible: false });
+ Overlays.editOverlay(grabberEdgeBL, { visible: false });
+ Overlays.editOverlay(grabberEdgeBF, { visible: false });
+ Overlays.editOverlay(grabberEdgeBN, { visible: false });
+ Overlays.editOverlay(grabberEdgeNR, { visible: false });
+ Overlays.editOverlay(grabberEdgeNL, { visible: false });
+ Overlays.editOverlay(grabberEdgeFR, { visible: false });
+ Overlays.editOverlay(grabberEdgeFL, { visible: false });
break;
case grabberRBN:
@@ -1542,20 +1894,131 @@ SelectionDisplay = (function () {
}
}
+ // if one of the items above was clicked, then we know we are in translate or stretch mode, and we
+ // should hide our rotate handles...
+ if (somethingClicked) {
+ Overlays.editOverlay(yawHandle, { visible: false });
+ Overlays.editOverlay(pitchHandle, { visible: false });
+ Overlays.editOverlay(rollHandle, { visible: false });
+
+ if (mode != "TRANSLATE_UP_DOWN") {
+ Overlays.editOverlay(grabberMoveUp, { visible: false });
+ }
+ }
+
if (!somethingClicked) {
+
+ print("rotate handle case...");
+
// After testing our stretch handles, then check out rotate handles
Overlays.editOverlay(yawHandle, { ignoreRayIntersection: false });
Overlays.editOverlay(pitchHandle, { ignoreRayIntersection: false });
Overlays.editOverlay(rollHandle, { ignoreRayIntersection: false });
var result = Overlays.findRayIntersection(pickRay);
+
+ var overlayOrientation;
+ var overlayCenter;
+
+ var properties = Entities.getEntityProperties(currentSelection);
+ var angles = Quat.safeEulerAngles(properties.rotation);
+ var pitch = angles.x;
+ var yaw = angles.y;
+ var roll = angles.z;
+
+ originalRotation = properties.rotation;
+ originalPitch = pitch;
+ originalYaw = yaw;
+ originalRoll = roll;
+
if (result.intersects) {
switch(result.overlayID) {
+ case yawHandle:
+ mode = "ROTATE_YAW";
+ somethingClicked = true;
+ overlayOrientation = yawHandleRotation;
+ overlayCenter = yawCenter;
+ yawZero = result.intersection;
+ rotationNormal = yawNormal;
+ break;
+
+ case pitchHandle:
+ mode = "ROTATE_PITCH";
+ somethingClicked = true;
+ overlayOrientation = pitchHandleRotation;
+ overlayCenter = pitchCenter;
+ pitchZero = result.intersection;
+ rotationNormal = pitchNormal;
+ break;
+
+ case rollHandle:
+ mode = "ROTATE_ROLL";
+ somethingClicked = true;
+ overlayOrientation = rollHandleRotation;
+ overlayCenter = rollCenter;
+ rollZero = result.intersection;
+ rotationNormal = rollNormal;
+ break;
+
default:
print("mousePressEvent()...... " + overlayNames[result.overlayID]);
mode = "UNKNOWN";
break;
}
}
+
+ print(" somethingClicked:" + somethingClicked);
+ print(" mode:" + mode);
+
+
+ if (somethingClicked) {
+
+ Overlays.editOverlay(rotateOverlayTarget, { visible: true, rotation: overlayOrientation, position: overlayCenter });
+ Overlays.editOverlay(rotateOverlayInner, { visible: true, rotation: overlayOrientation, position: overlayCenter });
+ Overlays.editOverlay(rotateOverlayOuter, { visible: true, rotation: overlayOrientation, position: overlayCenter, startAt: 0, endAt: 360 });
+ Overlays.editOverlay(rotateOverlayCurrent, { visible: true, rotation: overlayOrientation, position: overlayCenter, startAt: 0, endAt: 0 });
+
+ // for debugging
+ //Overlays.editOverlay(rotateZeroOverlay, { visible: true, start: overlayCenter, end: result.intersection });
+ //Overlays.editOverlay(rotateCurrentOverlay, { visible: true, start: overlayCenter, end: result.intersection });
+
+ Overlays.editOverlay(yawHandle, { visible: false });
+ Overlays.editOverlay(pitchHandle, { visible: false });
+ Overlays.editOverlay(rollHandle, { visible: false });
+
+
+ Overlays.editOverlay(yawHandle, { visible: false });
+ Overlays.editOverlay(pitchHandle, { visible: false });
+ Overlays.editOverlay(rollHandle, { visible: false });
+ Overlays.editOverlay(grabberMoveUp, { visible: false });
+ Overlays.editOverlay(grabberLBN, { visible: false });
+ Overlays.editOverlay(grabberLBF, { visible: false });
+ Overlays.editOverlay(grabberRBN, { visible: false });
+ Overlays.editOverlay(grabberRBF, { visible: false });
+ Overlays.editOverlay(grabberLTN, { visible: false });
+ Overlays.editOverlay(grabberLTF, { visible: false });
+ Overlays.editOverlay(grabberRTN, { visible: false });
+ Overlays.editOverlay(grabberRTF, { visible: false });
+
+ Overlays.editOverlay(grabberTOP, { visible: false });
+ Overlays.editOverlay(grabberBOTTOM, { visible: false });
+ Overlays.editOverlay(grabberLEFT, { visible: false });
+ Overlays.editOverlay(grabberRIGHT, { visible: false });
+ Overlays.editOverlay(grabberNEAR, { visible: false });
+ Overlays.editOverlay(grabberFAR, { visible: false });
+
+ Overlays.editOverlay(grabberEdgeTR, { visible: false });
+ Overlays.editOverlay(grabberEdgeTL, { visible: false });
+ Overlays.editOverlay(grabberEdgeTF, { visible: false });
+ Overlays.editOverlay(grabberEdgeTN, { visible: false });
+ Overlays.editOverlay(grabberEdgeBR, { visible: false });
+ Overlays.editOverlay(grabberEdgeBL, { visible: false });
+ Overlays.editOverlay(grabberEdgeBF, { visible: false });
+ Overlays.editOverlay(grabberEdgeBN, { visible: false });
+ Overlays.editOverlay(grabberEdgeNR, { visible: false });
+ Overlays.editOverlay(grabberEdgeNL, { visible: false });
+ Overlays.editOverlay(grabberEdgeFR, { visible: false });
+ Overlays.editOverlay(grabberEdgeFL, { visible: false });
+ }
}
if (!somethingClicked) {
@@ -1597,6 +2060,15 @@ SelectionDisplay = (function () {
that.mouseMoveEvent = function(event) {
//print("mouseMoveEvent()... mode:" + mode);
switch (mode) {
+ case "ROTATE_YAW":
+ that.rotateYaw(event);
+ break;
+ case "ROTATE_PITCH":
+ that.rotatePitch(event);
+ break;
+ case "ROTATE_ROLL":
+ that.rotateRoll(event);
+ break;
case "TRANSLATE_UP_DOWN":
that.translateUpDown(event);
break;
@@ -1654,14 +2126,34 @@ SelectionDisplay = (function () {
};
that.mouseReleaseEvent = function(event) {
+ var showHandles = false;
+ // hide our rotation overlays..., and show our handles
+ if (mode == "ROTATE_YAW" || mode == "ROTATE_PITCH" || mode == "ROTATE_ROLL") {
+ Overlays.editOverlay(rotateOverlayTarget, { visible: false });
+ Overlays.editOverlay(rotateOverlayInner, { visible: false });
+ Overlays.editOverlay(rotateOverlayOuter, { visible: false });
+ Overlays.editOverlay(rotateOverlayCurrent, { visible: false });
+ showHandles = true;
+ }
+
+ if (mode != "UNKNOWN") {
+ showHandles = true;
+ }
+
mode = "UNKNOWN";
// if something is selected, then reset the "original" properties for any potential next click+move operation
if (entitySelected) {
+
+ if (showHandles) {
+ that.select(currentSelection, event);
+ }
+
selectedEntityProperties = Entities.getEntityProperties(currentSelection);
selectedEntityPropertiesOriginalPosition = properties.position;
selectedEntityPropertiesOriginalDimensions = properties.dimensions;
}
+
};
Controller.mousePressEvent.connect(that.mousePressEvent);
diff --git a/examples/libraries/globals.js b/examples/libraries/globals.js
new file mode 100644
index 0000000000..1bd851af77
--- /dev/null
+++ b/examples/libraries/globals.js
@@ -0,0 +1,11 @@
+//
+// globals.js
+// examples/libraries
+//
+// Copyright 2014 High Fidelity, Inc.
+//
+// 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 = "https://s3.amazonaws.com/hifi-public/";
diff --git a/examples/locationsMenu.js b/examples/locationsMenu.js
index 24b0dabf46..30fa377a6f 100644
--- a/examples/locationsMenu.js
+++ b/examples/locationsMenu.js
@@ -9,6 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var scriptUrl = "https://script.google.com/macros/s/AKfycbwIo4lmF-qUwX1Z-9eA_P-g2gse9oFhNcjVyyksGukyDDEFXgU/exec?action=listOwners&domain=alpha.highfidelity.io";
var LocationMenu = function(opts) {
@@ -24,7 +26,7 @@ var LocationMenu = function(opts) {
var disabledColor = { red: 64, green: 64, blue: 64};
var position = { x: 0, y: 0 };
- var locationIconUrl = "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/location.svg";
+ var locationIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/location.svg";
var toolHeight = 50;
var toolWidth = 50;
var visible = false;
diff --git a/examples/move.js b/examples/move.js
old mode 100755
new mode 100644
diff --git a/examples/myBalance.js b/examples/myBalance.js
index bd48e8fd21..43f1f40eae 100644
--- a/examples/myBalance.js
+++ b/examples/myBalance.js
@@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var Controller = Controller || {};
var Overlays = Overlays || {};
var Script = Script || {};
@@ -18,7 +20,7 @@ var Account = Account || {};
(function () {
"use strict";
- var iconUrl = 'http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/',
+ var iconUrl = HIFI_PUBLIC_BUCKET + 'images/tools/',
overlayWidth = 150,
overlayHeight = 50,
overlayTopOffset = 15,
diff --git a/examples/newEditEntities.js b/examples/newEditEntities.js
index de39121e35..b753537631 100644
--- a/examples/newEditEntities.js
+++ b/examples/newEditEntities.js
@@ -11,6 +11,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
Script.include("libraries/stringHelpers.js");
Script.include("libraries/dataviewHelpers.js");
Script.include("libraries/httpMultiPart.js");
@@ -31,7 +32,7 @@ Script.include("libraries/entityPropertyDialogBox.js");
var entityPropertyDialogBox = EntityPropertyDialogBox;
var windowDimensions = Controller.getViewportDimensions();
-var toolIconUrl = "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/tools/";
+var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var toolHeight = 50;
var toolWidth = 50;
@@ -45,14 +46,14 @@ var SPAWN_DISTANCE = 1;
var DEFAULT_DIMENSION = 0.20;
var modelURLs = [
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Feisar_Ship.FBX",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/birarda/birarda_head.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/pug.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/newInvader16x16-large-purple.svo",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/minotaur/mino_full.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Combat_tank_V01.FBX",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/orc.fbx",
- "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/slimer.fbx"
+ HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
+ HIFI_PUBLIC_BUCKET + "meshes/birarda/birarda_head.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/pug.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-large-purple.svo",
+ HIFI_PUBLIC_BUCKET + "meshes/minotaur/mino_full.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/Combat_tank_V01.FBX",
+ HIFI_PUBLIC_BUCKET + "meshes/orc.fbx",
+ HIFI_PUBLIC_BUCKET + "meshes/slimer.fbx"
];
var mode = 0;
@@ -310,7 +311,7 @@ var exportMenu = null;
function isLocked(properties) {
// special case to lock the ground plane model in hq.
if (location.hostname == "hq.highfidelity.io" &&
- properties.modelURL == "https://s3-us-west-1.amazonaws.com/highfidelity-public/ozan/Terrain_Reduce_forAlpha.fbx") {
+ properties.modelURL == HIFI_PUBLIC_BUCKET + "ozan/Terrain_Reduce_forAlpha.fbx") {
return true;
}
return false;
@@ -569,6 +570,19 @@ function handeMenuEvent(menuItem) {
}
} else if (menuItem == "Edit Properties...") {
// good place to put the properties dialog
+
+ editModelID = -1;
+ if (entitySelected) {
+ print(" Edit Properties.... selectedEntityID="+ selectedEntityID);
+ editModelID = selectedEntityID;
+ } else {
+ print(" Edit Properties.... not holding...");
+ }
+ if (editModelID != -1) {
+ print(" Edit Properties.... about to edit properties...");
+ entityPropertyDialogBox.openDialog(editModelID);
+ }
+
} else if (menuItem == "Paste Models") {
modelImporter.paste();
} else if (menuItem == "Export Models") {
diff --git a/examples/overlaysExample.js b/examples/overlaysExample.js
index d0b3870803..fef502c761 100644
--- a/examples/overlaysExample.js
+++ b/examples/overlaysExample.js
@@ -11,6 +11,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
// The "Swatches" example of this script will create 9 different image overlays, that use the color feature to
// display different colors as color swatches. The overlays can be clicked on, to change the "selectedSwatch" variable
@@ -51,7 +52,7 @@ for (s = 0; s < numberOfSwatches; s++) {
width: 31,
height: 54,
subImage: { x: imageFromX, y: imageFromY, width: 30, height: 54 },
- imageURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/images/testing-swatches.svg",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/testing-swatches.svg",
color: swatchColors[s],
alpha: 1
});
@@ -63,8 +64,8 @@ var text = Overlays.addOverlay("text", {
y: 100,
width: 150,
height: 50,
- color: { red: 0, green: 0, blue: 0},
- textColor: { red: 255, green: 0, blue: 0},
+ backgroundColor: { red: 255, green: 255, blue: 255},
+ color: { red: 255, green: 0, blue: 0},
topMargin: 4,
leftMargin: 4,
text: "Here is some text.\nAnd a second line."
@@ -77,7 +78,7 @@ var toolA = Overlays.addOverlay("image", {
width: 62,
height: 40,
subImage: { x: 0, y: 0, width: 62, height: 40 },
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/hifi-interface-tools.svg",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/hifi-interface-tools.svg",
color: { red: 255, green: 255, blue: 255},
visible: false
});
@@ -87,7 +88,7 @@ var toolA = Overlays.addOverlay("image", {
var slider = Overlays.addOverlay("image", {
// alternate form of expressing bounds
bounds: { x: 100, y: 300, width: 158, height: 35},
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/slider.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/slider.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
@@ -101,7 +102,7 @@ var thumb = Overlays.addOverlay("image", {
y: 309,
width: 18,
height: 17,
- imageURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/images/thumb.png",
+ imageURL: HIFI_PUBLIC_BUCKET + "images/thumb.png",
color: { red: 255, green: 255, blue: 255},
alpha: 1
});
diff --git a/examples/particleBirds.js b/examples/particleBirds.js
index 9492a321ce..6ed37aefe1 100644
--- a/examples/particleBirds.js
+++ b/examples/particleBirds.js
@@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
// Multiply vector by scalar
function vScalarMult(v, s) {
var rval = { x: v.x * s, y: v.y * s, z: v.z * s };
@@ -68,23 +70,23 @@ function addBird()
var size;
var which = Math.random();
if (which < 0.2) {
- tweet = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/bushtit_1.raw");
+ tweet = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/bushtit_1.raw");
color = { red: 100, green: 50, blue: 120 };
size = 0.08;
} else if (which < 0.4) {
- tweet = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/rosyfacedlovebird.raw");
+ tweet = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/rosyfacedlovebird.raw");
color = { red: 100, green: 150, blue: 75 };
size = 0.09;
} else if (which < 0.6) {
- tweet = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/saysphoebe.raw");
+ tweet = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/saysphoebe.raw");
color = { red: 84, green: 121, blue: 36 };
size = 0.05;
} else if (which < 0.8) {
- tweet = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/mexicanWhipoorwill.raw");
+ tweet = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/mexicanWhipoorwill.raw");
color = { red: 23, green: 197, blue: 230 };
size = 0.12;
} else {
- tweet = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/westernscreechowl.raw");
+ tweet = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/westernscreechowl.raw");
color = { red: 50, green: 67, blue: 144 };
size = 0.15;
}
diff --git a/examples/particleModelExample.js b/examples/particleModelExample.js
index b489e704c9..d589e6bb31 100644
--- a/examples/particleModelExample.js
+++ b/examples/particleModelExample.js
@@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var count = 0;
var stopAfter = 100;
@@ -20,7 +22,7 @@ var modelPropertiesA = {
gravity: { x: 0, y: 0, z: 0 },
damping: 0,
radius : 0.25,
- modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Feisar_Ship.FBX",
+ modelURL: HIFI_PUBLICK_BUCKET + "meshes/Feisar_Ship.FBX",
lifetime: 20
};
@@ -30,7 +32,7 @@ var modelPropertiesB = {
gravity: { x: 0, y: 0, z: 0 },
damping: 0,
radius : 0.25,
- modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/newInvader16x16.svo",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16.svo",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
lifetime: 20
diff --git a/examples/playSound.js b/examples/playSound.js
index 189c24e86f..4130db5b16 100644
--- a/examples/playSound.js
+++ b/examples/playSound.js
@@ -8,8 +8,10 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+Script.include("libraries/globals.js");
+
// First, load a sample sound from a URL
-var bird = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Animals/bushtit_1.raw");
+var bird = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Animals/bushtit_1.raw");
function maybePlaySound(deltaTime) {
if (Math.random() < 0.01) {
diff --git a/examples/playSoundLoop.js b/examples/playSoundLoop.js
index 30f8762248..3122f13f37 100644
--- a/examples/playSoundLoop.js
+++ b/examples/playSoundLoop.js
@@ -11,12 +11,13 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
// A few sample files you may want to try:
-var sound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Guitars/Guitar+-+Nylon+A.raw");
-//var sound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/220Sine.wav");
-//var sound = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail+Party+Snippets/Bandcamp.wav");
+var sound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Nylon+A.raw");
+//var sound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/220Sine.wav");
+//var sound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Cocktail+Party+Snippets/Bandcamp.wav");
var soundPlaying = false;
var options = new AudioInjectionOptions();
diff --git a/examples/playSoundOrbit.js b/examples/playSoundOrbit.js
index da7c746e8e..2c44a4535a 100644
--- a/examples/playSoundOrbit.js
+++ b/examples/playSoundOrbit.js
@@ -9,7 +9,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-var soundClip = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Voxels/voxel create 3.raw");
+Script.include("libraries/globals.js");
+
+var soundClip = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Voxels/voxel create 3.raw");
var currentTime = 1.570079; // pi/2
var deltaTime = 0.05;
diff --git a/examples/playSoundWave.js b/examples/playSoundWave.js
index 419fd80cd2..f152effb47 100644
--- a/examples/playSoundWave.js
+++ b/examples/playSoundWave.js
@@ -9,7 +9,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-var soundClip = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Cocktail%20Party%20Snippets/Walken1.wav");
+Script.include("libraries/globals.js");
+
+var soundClip = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Cocktail%20Party%20Snippets/Walken1.wav");
function playSound() {
var options = new AudioInjectionOptions();
diff --git a/examples/radio.js b/examples/radio.js
index 575d9d70c8..293867398a 100644
--- a/examples/radio.js
+++ b/examples/radio.js
@@ -9,9 +9,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
-var modelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/models/entities/radio/Speakers.fbx";
-var soundURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/FamilyStereo.raw";
+var modelURL = HIFI_PUBLIC_BUCKET + "models/entities/radio/Speakers.fbx";
+var soundURL = HIFI_PUBLIC_BUCKET + "sounds/FamilyStereo.raw";
var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0);
var audioOptions = new AudioInjectionOptions();
diff --git a/examples/selectAudioDevice.js b/examples/selectAudioDevice.js
index 23606f774c..a90f3da4cf 100644
--- a/examples/selectAudioDevice.js
+++ b/examples/selectAudioDevice.js
@@ -41,6 +41,9 @@ if (typeof String.prototype.trimEndsWith != 'function') {
};
}
+const INPUT_DEVICE_SETTING = "audio_input_device";
+const OUTPUT_DEVICE_SETTING = "audio_output_device";
+
var selectedInputMenu = "";
var selectedOutputMenu = "";
@@ -48,9 +51,14 @@ function setupAudioMenus() {
Menu.addMenu("Tools > Audio");
Menu.addSeparator("Tools > Audio","Output Audio Device");
+ var outputDeviceSetting = Settings.getValue(OUTPUT_DEVICE_SETTING);
var outputDevices = AudioDevice.getOutputDevices();
var selectedOutputDevice = AudioDevice.getOutputDevice();
-
+ if (outputDevices.indexOf(outputDeviceSetting) != -1 && selectedOutputDevice != outputDeviceSetting) {
+ if (AudioDevice.setOutputDevice(outputDeviceSetting)) {
+ selectedOutputDevice = outputDeviceSetting;
+ }
+ }
for(var i = 0; i < outputDevices.length; i++) {
var thisDeviceSelected = (outputDevices[i] == selectedOutputDevice);
var menuItem = "Use " + outputDevices[i] + " for Output";
@@ -67,9 +75,14 @@ function setupAudioMenus() {
Menu.addSeparator("Tools > Audio","Input Audio Device");
+ var inputDeviceSetting = Settings.getValue(INPUT_DEVICE_SETTING);
var inputDevices = AudioDevice.getInputDevices();
var selectedInputDevice = AudioDevice.getInputDevice();
-
+ if (inputDevices.indexOf(inputDeviceSetting) != -1 && selectedInputDevice != inputDeviceSetting) {
+ if (AudioDevice.setInputDevice(inputDeviceSetting)) {
+ selectedInputDevice = inputDeviceSetting;
+ }
+ }
for(var i = 0; i < inputDevices.length; i++) {
var thisDeviceSelected = (inputDevices[i] == selectedInputDevice);
var menuItem = "Use " + inputDevices[i] + " for Input";
@@ -85,7 +98,8 @@ function setupAudioMenus() {
}
}
-setupAudioMenus();
+// Have a small delay before the menu's get setup and the audio devices can switch to the last selected ones
+Script.setTimeout(function() { setupAudioMenus(); }, 5000);
function scriptEnding() {
Menu.removeMenu("Tools > Audio");
@@ -101,15 +115,18 @@ function menuItemEvent(menuItem) {
Menu.setIsOptionChecked(selectedOutputMenu, false);
selectedOutputMenu = menuItem;
Menu.setIsOptionChecked(selectedOutputMenu, true);
- AudioDevice.setOutputDevice(selectedDevice);
-
+ if (AudioDevice.setOutputDevice(selectedDevice)) {
+ Settings.setValue(OUTPUT_DEVICE_SETTING, selectedDevice);
+ }
} else if (menuItem.endsWith(" for Input")) {
var selectedDevice = menuItem.trimStartsWith("Use ").trimEndsWith(" for Input");
print("input audio selection..." + selectedDevice);
Menu.setIsOptionChecked(selectedInputMenu, false);
selectedInputMenu = menuItem;
Menu.setIsOptionChecked(selectedInputMenu, true);
- AudioDevice.setInputDevice(selectedDevice);
+ if (AudioDevice.setInputDevice(selectedDevice)) {
+ Settings.setValue(INPUT_DEVICE_SETTING, selectedDevice);
+ }
}
}
}
diff --git a/examples/spaceInvadersExample.js b/examples/spaceInvadersExample.js
index 5d62102d71..862d731f90 100644
--- a/examples/spaceInvadersExample.js
+++ b/examples/spaceInvadersExample.js
@@ -11,6 +11,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
var iteration = 0;
var gameOver = false;
@@ -82,13 +84,13 @@ var missileFired = false;
var myMissile;
// sounds
-var hitSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/hit.raw");
-var shootSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/shoot.raw");
+var hitSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/hit.raw");
+var shootSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/shoot.raw");
var moveSounds = new Array();
-moveSounds[0] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/Lo1.raw");
-moveSounds[1] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/Lo2.raw");
-moveSounds[2] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/Lo3.raw");
-moveSounds[3] = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Space%20Invaders/Lo4.raw");
+moveSounds[0] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo1.raw");
+moveSounds[1] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo2.raw");
+moveSounds[2] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo3.raw");
+moveSounds[3] = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Space%20Invaders/Lo4.raw");
var currentMoveSound = 0;
var numberOfSounds = 4;
var stepsPerSound = invaderStepsPerCycle / numberOfSounds;
@@ -99,36 +101,36 @@ var soundInMyHead = true;
// models...
var invaderModels = new Array();
invaderModels[0] = {
- modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/newInvader16x16-large-purple.svo",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-large-purple.svo",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[1] = {
- modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/newInvader16x16-large-cyan.svo",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-large-cyan.svo",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[2] = {
- modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/newInvader16x16-medium-cyan.svo",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-medium-cyan.svo",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[3] = {
- modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/newInvader16x16-medium-green.svo",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-medium-green.svo",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
invaderModels[4] = {
- modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/newInvader16x16-small-green.svo",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/newInvader16x16-small-green.svo",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
};
-//modelURL: "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Feisar_Ship.FBX",
-//modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/invader.svo",
-// "http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/spaceInvader3.fbx"
+//modelURL: HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
+//modelURL: HIFI_PUBLIC_BUCKET + "meshes/invader.svo",
+// HIFI_PUBLIC_BUCKET + "meshes/spaceInvader3.fbx"
function initializeMyShip() {
myShipProperties = {
@@ -138,7 +140,7 @@ function initializeMyShip() {
damping: 0,
radius: shipSize,
color: { red: 0, green: 255, blue: 0 },
- modelURL: "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/myCannon16x16.svo",
+ modelURL: HIFI_PUBLIC_BUCKET + "meshes/myCannon16x16.svo",
modelScale: 450,
modelTranslation: { x: -1.3, y: -1.3, z: -1.3 },
lifetime: itemLifetimes
diff --git a/examples/squeezeHands.js b/examples/squeezeHands.js
index f920692a3b..21da7f9c25 100644
--- a/examples/squeezeHands.js
+++ b/examples/squeezeHands.js
@@ -9,8 +9,10 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
-var rightHandAnimation = "https://s3-us-west-1.amazonaws.com/highfidelity-public/animations/RightHandAnimPhilip.fbx";
-var leftHandAnimation = "https://s3-us-west-1.amazonaws.com/highfidelity-public/animations/LeftHandAnimPhilip.fbx";
+Script.include("libraries/globals.js");
+
+var rightHandAnimation = HIFI_PUBLIC_BUCKET + "animations/RightHandAnimPhilip.fbx";
+var leftHandAnimation = HIFI_PUBLIC_BUCKET + "animations/LeftHandAnimPhilip.fbx";
var LEFT = 0;
var RIGHT = 1;
diff --git a/examples/toyball.js b/examples/toyball.js
index e03fd67a5d..f79f3cb1f4 100644
--- a/examples/toyball.js
+++ b/examples/toyball.js
@@ -15,6 +15,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+Script.include("libraries/globals.js");
+
// maybe we should make these constants...
var LEFT_PALM = 0;
var LEFT_TIP = 1;
@@ -39,7 +41,7 @@ var rightHandParticle;
var newSound = new Sound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw");
var catchSound = new Sound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw");
-var throwSound = new Sound("http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
+var throwSound = new Sound(HIFI_PUBLIC_BUCKET + "sounds/Switches%20and%20sliders/slider%20-%20whoosh1.raw");
var targetRadius = 1.0;
diff --git a/examples/walk.js b/examples/walk.js
new file mode 100644
index 0000000000..a9e8f401d6
--- /dev/null
+++ b/examples/walk.js
@@ -0,0 +1,3851 @@
+//
+// walk.js
+//
+// version 1.007b
+//
+// Created by Davedub, August / September 2014
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// path to the animation files
+var pathToAnimFiles = 'http://s3-us-west-1.amazonaws.com/highfidelity-public/procedural-animator/animation-files/'; // working (but only without https)
+
+// path to the images used for the overlays
+var pathToOverlays = 'http://s3-us-west-1.amazonaws.com/highfidelity-public/procedural-animator/overlays/'; // working (but only without https)
+
+// path to the sounds used for the footsteps
+var pathToSounds = 'http://highfidelity-public.s3-us-west-1.amazonaws.com/sounds/Footsteps/';
+
+// load the animation datafiles
+Script.include(pathToAnimFiles+"dd-female-strut-walk-animation.js");
+Script.include(pathToAnimFiles+"dd-female-flying-up-animation.js");
+Script.include(pathToAnimFiles+"dd-female-flying-animation.js");
+Script.include(pathToAnimFiles+"dd-female-flying-down-animation.js");
+Script.include(pathToAnimFiles+"dd-female-standing-one-animation.js");
+Script.include(pathToAnimFiles+"dd-female-sidestep-left-animation.js");
+Script.include(pathToAnimFiles+"dd-female-sidestep-right-animation.js");
+Script.include(pathToAnimFiles+"dd-male-strut-walk-animation.js");
+Script.include(pathToAnimFiles+"dd-male-flying-up-animation.js");
+Script.include(pathToAnimFiles+"dd-male-flying-animation.js");
+Script.include(pathToAnimFiles+"dd-male-flying-down-animation.js");
+Script.include(pathToAnimFiles+"dd-male-standing-one-animation.js");
+Script.include(pathToAnimFiles+"dd-male-sidestep-left-animation.js");
+Script.include(pathToAnimFiles+"dd-male-sidestep-right-animation.js");
+
+// read in the data from the animation files
+var FemaleStrutWalkFile = new FemaleStrutWalk();
+var femaleStrutWalk = FemaleStrutWalkFile.loadAnimation();
+var FemaleFlyingUpFile = new FemaleFlyingUp();
+var femaleFlyingUp = FemaleFlyingUpFile.loadAnimation();
+var FemaleFlyingFile = new FemaleFlying();
+var femaleFlying = FemaleFlyingFile.loadAnimation();
+var FemaleFlyingDownFile = new FemaleFlyingDown();
+var femaleFlyingDown = FemaleFlyingDownFile.loadAnimation();
+var FemaleStandOneFile = new FemaleStandingOne();
+var femaleStandOne = FemaleStandOneFile.loadAnimation();
+var FemaleSideStepLeftFile = new FemaleSideStepLeft();
+var femaleSideStepLeft = FemaleSideStepLeftFile.loadAnimation();
+var FemaleSideStepRightFile = new FemaleSideStepRight();
+var femaleSideStepRight = FemaleSideStepRightFile.loadAnimation();
+var MaleStrutWalkFile = new MaleStrutWalk();
+var maleStrutWalk = MaleStrutWalkFile.loadAnimation();
+var MaleFlyingUpFile = new MaleFlyingUp();
+var maleFlyingUp = MaleFlyingUpFile.loadAnimation();
+var MaleFlyingFile = new MaleFlying();
+var maleFlying = MaleFlyingFile.loadAnimation();
+var MaleFlyingDownFile = new MaleFlyingDown();
+var maleFlyingDown = MaleFlyingDownFile.loadAnimation();
+var MaleStandOneFile = new MaleStandingOne();
+var maleStandOne = MaleStandOneFile.loadAnimation();
+var MaleSideStepLeftFile = new MaleSideStepLeft();
+var maleSideStepLeft = MaleSideStepLeftFile.loadAnimation();
+var MaleSideStepRightFile = new MaleSideStepRight();
+var maleSideStepRight = MaleSideStepRightFile.loadAnimation();
+
+// read in the sounds
+var footsteps = [];
+footsteps.push(new Sound(pathToSounds+"FootstepW2Left-12db.wav"));
+footsteps.push(new Sound(pathToSounds+"FootstepW2Right-12db.wav"));
+footsteps.push(new Sound(pathToSounds+"FootstepW3Left-12db.wav"));
+footsteps.push(new Sound(pathToSounds+"FootstepW3Right-12db.wav"));
+footsteps.push(new Sound(pathToSounds+"FootstepW5Left-12db.wav"));
+footsteps.push(new Sound(pathToSounds+"FootstepW5Right-12db.wav"));
+
+// all slider controls have a range (with the exception of phase controls that are always +-180) so we store them all here
+var sliderRanges = {"joints":[{"name":"hips","pitchRange":25,"yawRange":25,"rollRange":25,"pitchOffsetRange":25,"yawOffsetRange":25,"rollOffsetRange":25,"thrustRange":0.01,"bobRange":0.02,"swayRange":0.01},{"name":"upperLegs","pitchRange":90,"yawRange":35,"rollRange":35,"pitchOffsetRange":60,"yawOffsetRange":20,"rollOffsetRange":20},{"name":"lowerLegs","pitchRange":90,"yawRange":20,"rollRange":20,"pitchOffsetRange":90,"yawOffsetRange":20,"rollOffsetRange":20},{"name":"feet","pitchRange":60,"yawRange":20,"rollRange":20,"pitchOffsetRange":60,"yawOffsetRange":50,"rollOffsetRange":50},{"name":"toes","pitchRange":90,"yawRange":20,"rollRange":20,"pitchOffsetRange":90,"yawOffsetRange":20,"rollOffsetRange":20},{"name":"spine","pitchRange":40,"yawRange":40,"rollRange":40,"pitchOffsetRange":90,"yawOffsetRange":50,"rollOffsetRange":50},{"name":"spine1","pitchRange":20,"yawRange":40,"rollRange":20,"pitchOffsetRange":90,"yawOffsetRange":50,"rollOffsetRange":50},{"name":"spine2","pitchRange":20,"yawRange":40,"rollRange":20,"pitchOffsetRange":90,"yawOffsetRange":50,"rollOffsetRange":50},{"name":"shoulders","pitchRange":35,"yawRange":40,"rollRange":20,"pitchOffsetRange":180,"yawOffsetRange":180,"rollOffsetRange":180},{"name":"upperArms","pitchRange":90,"yawRange":90,"rollRange":90,"pitchOffsetRange":180,"yawOffsetRange":180,"rollOffsetRange":180},{"name":"lowerArms","pitchRange":90,"yawRange":90,"rollRange":120,"pitchOffsetRange":180,"yawOffsetRange":180,"rollOffsetRange":180},{"name":"hands","pitchRange":90,"yawRange":180,"rollRange":90,"pitchOffsetRange":180,"yawOffsetRange":180,"rollOffsetRange":180},{"name":"head","pitchRange":20,"yawRange":20,"rollRange":20,"pitchOffsetRange":90,"yawOffsetRange":90,"rollOffsetRange":90}]};
+
+// internal state (FSM based) constants
+var STANDING = 1;
+var WALKING = 2;
+var SIDE_STEPPING = 3;
+var FLYING = 4;
+var CONFIG_WALK_STYLES = 5;
+var CONFIG_WALK_TWEAKS = 6;
+var CONFIG_WALK_JOINTS = 7;
+var CONFIG_STANDING = 8;
+var CONFIG_FLYING = 9;
+var CONFIG_FLYING_UP = 10;
+var CONFIG_FLYING_DOWN = 11;
+var CONFIG_SIDESTEP_LEFT = 12;
+var CONFIG_SIDESTEP_RIGHT = 14;
+var INTERNAL_STATE = STANDING;
+
+// status
+var powerOn = true;
+var paused = false; // pause animation playback whilst adjusting certain parameters
+var minimised = true;
+var armsFree = true; // set true for hydra support - temporary fix for Hydras
+var statsOn = false;
+var playFootStepSounds = true;
+
+// constants
+var MAX_WALK_SPEED = 1257; // max oscillation speed
+var FLYING_SPEED = 6.4;// 12.4; // m/s - real humans can't run any faster than 12.4 m/s
+var TERMINAL_VELOCITY = 300; // max speed imposed by Interface
+var DIRECTION_UP = 1;
+var DIRECTION_DOWN = 2;
+var DIRECTION_LEFT = 4;
+var DIRECTION_RIGHT = 8;
+var DIRECTION_FORWARDS = 16;
+var DIRECTION_BACKWARDS = 32;
+var DIRECTION_NONE = 64;
+var MALE = 1;
+var FEMALE = 2;
+
+// start of animation control section
+var cumulativeTime = 0.0;
+var lastOrientation;
+
+// avi gender and default animations
+var avatarGender = MALE;
+var selectedWalk = maleStrutWalk; // the currently selected animation walk file (to edit any animation, paste it's name here and select walk editing mode)
+var selectedStand = maleStandOne;
+var selectedFlyUp = maleFlyingUp;
+var selectedFly = maleFlying;
+var selectedFlyDown = maleFlyingDown;
+var selectedSideStepLeft = maleSideStepLeft;
+var selectedSideStepRight = maleSideStepRight;
+if(avatarGender===FEMALE) {
+
+ // to make toggling the default quick
+ selectedWalk = femaleStrutWalk;
+ selectedStand = femaleStandOne;
+ selectedFlyUp = femaleFlyingUp;
+ selectedFly = femaleFlying;
+ selectedFlyDown = femaleFlyingDown;
+ selectedSideStepLeft = femaleSideStepLeft;
+ selectedSideStepRight = femaleSideStepRight;
+}
+var currentAnimation = selectedStand; // the current animation
+var selectedJointIndex = 0; // the index of the joint currently selected for editing
+var currentTransition = null; // used as a pointer to a Transition
+
+// walkwheel (foot / ground speed matching)
+var sideStepCycleStartLeft = 270;
+var sideStepCycleStartRight = 90;
+var walkWheelPosition = 0;
+var nextStep = DIRECTION_RIGHT; // first step is always right, because the sine waves say so. Unless you're mirrored.
+var nFrames = 0; // counts number of frames
+var strideLength = 0; // stride calibration
+var aviFootSize = {x:0.1, y:0.1, z:0.25}; // experimental values for addition to stride length - TODO: analyse and confirm is increasing smaller stride lengths accuracy once we have better ground detection
+
+// stats
+var frameStartTime = 0; // when the frame first starts we take a note of the time
+var frameExecutionTimeMax = 0; // keep track of the longest frame execution time
+
+// constructor for recent RecentMotion (i.e. frame data) class
+function RecentMotion(velocity, acceleration, principleDirection, state) {
+ this.velocity = velocity;
+ this.acceleration = acceleration;
+ this.principleDirection = principleDirection;
+ this.state = state;
+}
+
+// constructor for the FramesHistory object
+function FramesHistory() {
+ this.recentMotions = [];
+ for(var i = 0 ; i < 10 ; i++) {
+ var blank = new RecentMotion({ x:0, y:0, z:0 }, { x:0, y:0, z:0 }, DIRECTION_FORWARDS, STANDING );
+ this.recentMotions.push(blank);
+ }
+
+ // recentDirection 'method' args: (direction enum, number of steps back to compare)
+ this.recentDirection = function () {
+
+ if( arguments[0] && arguments[1] ) {
+
+ var directionCount = 0;
+ if( arguments[1] > this.recentMotions.length )
+ arguments[1] = this.recentMotions.length;
+
+ for(var i = 0 ; i < arguments[1] ; i++ ) {
+ if( this.recentMotions[i].principleDirection === arguments[0] )
+ directionCount++;
+ }
+ return directionCount / arguments[1] === 1 ? true : false;
+ }
+ return false;
+ }
+
+ // recentState 'method' args: (state enum, number of steps back to compare)
+ this.recentState = function () {
+
+ if( arguments[0] && arguments[1] ) {
+
+ var stateCount = 0;
+ if( arguments[1] > this.recentMotions.length )
+ arguments[1] = this.recentMotions.length;
+
+ for(var i = 0 ; i < arguments[1] ; i++ ) {
+ if( this.recentMotions[i].state === arguments[0] )
+ stateCount++;
+ }
+ return stateCount / arguments[1] === 1 ? true : false;
+ }
+ return false;
+ }
+ this.lastWalkStartTime = 0; // short walks and long walks need different handling
+}
+var framesHistory = new FramesHistory();
+
+// constructor for animation Transition class
+function Transition(lastAnimation, nextAnimation, reachPoses, transitionDuration, easingLower, easingUpper) {
+ this.lastAnimation = lastAnimation; // name of last animation
+ if(lastAnimation === selectedWalk ||
+ nextAnimation === selectedSideStepLeft ||
+ nextAnimation === selectedSideStepRight)
+ this.walkingAtStart = true; // boolean - is the last animation a walking animation?
+ else
+ this.walkingAtStart = false; // boolean - is the last animation a walking animation?
+ this.nextAnimation = nextAnimation; // name of next animation
+ if(nextAnimation === selectedWalk ||
+ nextAnimation === selectedSideStepLeft ||
+ nextAnimation === selectedSideStepRight)
+ this.walkingAtEnd = true; // boolean - is the next animation a walking animation?
+ else
+ this.walkingAtEnd = false; // boolean - is the next animation a walking animation?
+ this.reachPoses = reachPoses; // array of reach poses - am very much looking forward to putting these in!
+ this.transitionDuration = transitionDuration; // length of transition (seconds)
+ this.easingLower = easingLower; // Bezier curve handle (normalised)
+ this.easingUpper = easingUpper; // Bezier curve handle (normalised)
+ this.startTime = new Date().getTime(); // Starting timestamp (seconds)
+ this.progress = 0; // how far are we through the transition?
+ this.walkWheelIncrement = 3; // how much to turn the walkwheel each frame when coming to a halt. Get's set to 0 once the feet are under the avi
+ this.walkWheelAdvance = 0; // how many degrees the walk wheel has been advanced during the transition
+ this.walkStopAngle = 0; // what angle should we stop the walk cycle? (calculated on the fly)
+}
+
+// convert a local (to the avi) translation to a global one
+function localToGlobal(localTranslation) {
+
+ var aviOrientation = MyAvatar.orientation;
+ var front = Quat.getFront(aviOrientation);
+ var right = Quat.getRight(aviOrientation);
+ var up = Quat.getUp (aviOrientation);
+ var aviFront = Vec3.multiply(front,localTranslation.z);
+ var aviRight = Vec3.multiply(right,localTranslation.x);
+ var aviUp = Vec3.multiply(up ,localTranslation.y);
+ var globalTranslation = {x:0,y:0,z:0}; // final value
+ globalTranslation = Vec3.sum(globalTranslation, aviFront);
+ globalTranslation = Vec3.sum(globalTranslation, aviRight);
+ globalTranslation = Vec3.sum(globalTranslation, aviUp);
+ return globalTranslation;
+}
+
+// similar ot above - convert hips translations to global and apply
+function translateHips(localHipsTranslation) {
+
+ var aviOrientation = MyAvatar.orientation;
+ var front = Quat.getFront(aviOrientation);
+ var right = Quat.getRight(aviOrientation);
+ var up = Quat.getUp (aviOrientation);
+ var aviFront = Vec3.multiply(front,localHipsTranslation.y);
+ var aviRight = Vec3.multiply(right,localHipsTranslation.x);
+ var aviUp = Vec3.multiply(up ,localHipsTranslation.z);
+ var AviTranslationOffset = {x:0,y:0,z:0}; // final value
+ AviTranslationOffset = Vec3.sum(AviTranslationOffset, aviFront);
+ AviTranslationOffset = Vec3.sum(AviTranslationOffset, aviRight);
+ AviTranslationOffset = Vec3.sum(AviTranslationOffset, aviUp);
+ MyAvatar.position = {x: MyAvatar.position.x + AviTranslationOffset.x,
+ y: MyAvatar.position.y + AviTranslationOffset.y,
+ z: MyAvatar.position.z + AviTranslationOffset.z };
+}
+
+// clear all joint data
+function resetJoints() {
+
+ var avatarJointNames = MyAvatar.getJointNames();
+ for (var i = 0; i < avatarJointNames.length; i++) {
+ MyAvatar.clearJointData(avatarJointNames[i]);
+ }
+}
+
+// play footstep sound
+function playFootstep(side) {
+
+ var options = new AudioInjectionOptions();
+ options.position = Camera.getPosition();
+ options.volume = 0.5;
+ var walkNumber = 2; // 0 to 2
+ if(side===DIRECTION_RIGHT && playFootStepSounds) {
+ Audio.playSound(footsteps[walkNumber+1], options);
+ }
+ else if(side===DIRECTION_LEFT && playFootStepSounds) {
+ Audio.playSound(footsteps[walkNumber], options);
+ }
+}
+
+// put the fingers into a relaxed pose
+function curlFingers() {
+
+ // left hand fingers
+ for(var i = 18 ; i < 34 ; i++) {
+ MyAvatar.setJointData(jointList[i], Quat.fromPitchYawRollDegrees(8,0,0));
+ }
+ // left hand thumb
+ for(var i = 34 ; i < 38 ; i++) {
+ MyAvatar.setJointData(jointList[i], Quat.fromPitchYawRollDegrees(0,0,0));
+ }
+ // right hand fingers
+ for(var i = 42 ; i < 58 ; i++) {
+ MyAvatar.setJointData(jointList[i], Quat.fromPitchYawRollDegrees(8,0,0));
+ }
+ // right hand thumb
+ for(var i = 58 ; i < 62 ; i++) {
+ MyAvatar.setJointData(jointList[i], Quat.fromPitchYawRollDegrees(0,0,0));
+ }
+}
+
+// additional maths functions
+function degToRad( degreesValue ) { return degreesValue * Math.PI / 180; }
+function radToDeg( radiansValue ) { return radiansValue * 180 / Math.PI; }
+
+// animateAvatar - sine wave generators working like clockwork
+function animateAvatar( deltaTime, velocity, principleDirection ) {
+
+ // adjusting the walk speed in edit mode causes a nasty flicker. pausing the animation stops this
+ if(paused) return;
+
+ var cycle = cumulativeTime;
+ var transitionProgress = 1;
+ var adjustedFrequency = currentAnimation.settings.baseFrequency;
+
+ // upper legs phase reversal for walking backwards
+ var forwardModifier = 1;
+ if(principleDirection===DIRECTION_BACKWARDS)
+ forwardModifier = -1;
+
+ // don't want to lean forwards if going directly upwards
+ var leanPitchModifier = 1;
+ if(principleDirection===DIRECTION_UP)
+ leanPitchModifier = 0;
+
+ // is there a Transition to include?
+ if(currentTransition!==null) {
+
+ // if is a new transiton
+ if(currentTransition.progress===0) {
+
+ if( currentTransition.walkingAtStart ) {
+
+ if( INTERNAL_STATE !== SIDE_STEPPING ) {
+
+ // work out where we want the walk cycle to stop
+ var leftStop = selectedWalk.settings.stopAngleForwards + 180;
+ var rightStop = selectedWalk.settings.stopAngleForwards;
+ if( principleDirection === DIRECTION_BACKWARDS ) {
+ leftStop = selectedWalk.settings.stopAngleBackwards + 180;
+ rightStop = selectedWalk.settings.stopAngleBackwards;
+ }
+
+ // find the closest stop point from the walk wheel's angle
+ var angleToLeftStop = 180 - Math.abs( Math.abs( walkWheelPosition - leftStop ) - 180);
+ var angleToRightStop = 180 - Math.abs( Math.abs( walkWheelPosition - rightStop ) - 180);
+ if( walkWheelPosition > angleToLeftStop ) angleToLeftStop = 360 - angleToLeftStop;
+ if( walkWheelPosition > angleToRightStop ) angleToRightStop = 360 - angleToRightStop;
+
+ currentTransition.walkWheelIncrement = 6;
+
+ // keep the walkwheel turning by setting the walkWheelIncrement until our feet are tucked nicely underneath us.
+ if( angleToLeftStop < angleToRightStop ) {
+
+ currentTransition.walkStopAngle = leftStop;
+
+ } else {
+
+ currentTransition.walkStopAngle = rightStop;
+ }
+
+ } else {
+
+ // freeze wheel for sidestepping transitions
+ currentTransition.walkWheelIncrement = 0;
+ }
+ }
+ } // end if( currentTransition.walkingAtStart )
+
+ // calculate the Transition progress
+ var elapasedTime = (new Date().getTime() - currentTransition.startTime) / 1000;
+ currentTransition.progress = elapasedTime / currentTransition.transitionDuration;
+ transitionProgress = getBezier((1-currentTransition.progress), {x:0,y:0}, currentTransition.easingLower, currentTransition.easingUpper, {x:1,y:1}).y;
+
+ if(currentTransition.progress>=1) {
+
+ // time to kill off the transition
+ delete currentTransition;
+ currentTransition = null;
+
+ } else {
+
+ if( currentTransition.walkingAtStart ) {
+
+ if( INTERNAL_STATE !== SIDE_STEPPING ) {
+
+ // if at a stop angle, hold the walk wheel position for remainder of transition
+ var tolerance = 7; // must be greater than the walkWheel increment
+ if(( walkWheelPosition > (currentTransition.walkStopAngle - tolerance )) &&
+ ( walkWheelPosition < (currentTransition.walkStopAngle + tolerance ))) {
+
+ currentTransition.walkWheelIncrement = 0;
+ }
+ // keep turning walk wheel until both feet are below the avi
+ walkWheelPosition += currentTransition.walkWheelIncrement;
+ currentTransition.walkWheelAdvance += currentTransition.walkWheelIncrement;
+ }
+ }
+ }
+ }
+
+ // will we need to use the walk wheel this frame?
+ if(currentAnimation === selectedWalk ||
+ currentAnimation === selectedSideStepLeft ||
+ currentAnimation === selectedSideStepRight ||
+ currentTransition !== null) {
+
+ // set the stride length
+ if( INTERNAL_STATE!==SIDE_STEPPING &&
+ INTERNAL_STATE!==CONFIG_SIDESTEP_LEFT &&
+ INTERNAL_STATE!==CONFIG_SIDESTEP_RIGHT &&
+ currentTransition===null ) {
+
+ // if the timing's right, take a snapshot of the stride max and recalibrate
+ var tolerance = 1.0; // higher the number, the higher the chance of a calibration taking place, but is traded off with lower accuracy
+ var strideOne = 40;
+ var strideTwo = 220;
+
+ if( principleDirection === DIRECTION_BACKWARDS ) {
+ strideOne = 130;
+ strideTwo = 300;
+ }
+
+ if(( walkWheelPosition < (strideOne+tolerance) && walkWheelPosition > (strideOne-tolerance) ) ||
+ ( walkWheelPosition < (strideTwo+tolerance) && walkWheelPosition > (strideTwo-tolerance) )) {
+
+ // calculate the feet's offset from each other (in local Z only)
+ var footRPos = localToGlobal(MyAvatar.getJointPosition("RightFoot"));
+ var footLPos = localToGlobal(MyAvatar.getJointPosition("LeftFoot"));
+ var footOffsetZ = Math.abs(footRPos.z - footLPos.z);
+ if(footOffsetZ>1) strideLength = 2 * footOffsetZ + aviFootSize.z; // sometimes getting very low value here - just ignore for now
+ if(statsOn) print('Stride length calibrated to '+strideLength.toFixed(4)+' metres at '+walkWheelPosition.toFixed(1)+' degrees');
+ if(principleDirection===DIRECTION_FORWARDS) {
+ currentAnimation.calibration.strideLengthForwards = strideLength;
+ } else if (principleDirection===DIRECTION_BACKWARDS) {
+ currentAnimation.calibration.strideLengthBackwards = strideLength;
+ }
+
+ } else {
+
+ if(principleDirection===DIRECTION_FORWARDS)
+ strideLength = currentAnimation.calibration.strideLengthForwards;
+ else if (principleDirection===DIRECTION_BACKWARDS)
+ strideLength = currentAnimation.calibration.strideLengthBackwards;
+ }
+ }
+ else if(( INTERNAL_STATE===SIDE_STEPPING ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_LEFT ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_RIGHT ) ) {
+
+ // calculate lateral stride - same same, but different
+ // if the timing's right, take a snapshot of the stride max and recalibrate the stride length
+ var tolerance = 1.0; // higher the number, the higher the chance of a calibration taking place, but is traded off with lower accuracy
+ if(principleDirection===DIRECTION_LEFT) {
+
+ if( walkWheelPosition < (3+tolerance) && walkWheelPosition > (3-tolerance) ) {
+
+ // calculate the feet's offset from the hips (in local X only)
+ var footRPos = localToGlobal(MyAvatar.getJointPosition("RightFoot"));
+ var footLPos = localToGlobal(MyAvatar.getJointPosition("LeftFoot"));
+ var footOffsetX = Math.abs(footRPos.x - footLPos.x);
+ strideLength = footOffsetX;
+ if(statsOn) print('Stride width calibrated to '+strideLength.toFixed(4)+ ' metres at '+walkWheelPosition.toFixed(1)+' degrees');
+ currentAnimation.calibration.strideLengthLeft = strideLength;
+
+ } else {
+
+ strideLength = currentAnimation.calibration.strideLengthLeft;
+ }
+ }
+ else if (principleDirection===DIRECTION_RIGHT) {
+
+ if( walkWheelPosition < (170+tolerance) && walkWheelPosition > (170-tolerance) ) {
+
+ // calculate the feet's offset from the hips (in local X only)
+ var footRPos = localToGlobal(MyAvatar.getJointPosition("RightFoot"));
+ var footLPos = localToGlobal(MyAvatar.getJointPosition("LeftFoot"));
+ var footOffsetX = Math.abs(footRPos.x - footLPos.x);
+ strideLength = footOffsetX;
+ if(statsOn) print('Stride width calibrated to '+strideLength.toFixed(4)+ ' metres at '+walkWheelPosition.toFixed(1)+' degrees');
+ currentAnimation.calibration.strideLengthRight = strideLength;
+
+ } else {
+
+ strideLength = currentAnimation.calibration.strideLengthRight;
+ }
+ }
+ } // end stride length calculations
+
+ // wrap the stride length around a 'surveyor's wheel' twice and calculate the angular velocity at the given (linear) velocity
+ // omega = v / r , where r = circumference / 2 PI , where circumference = 2 * stride length
+ var wheelRadius = strideLength / Math.PI;
+ var angularVelocity = velocity / wheelRadius;
+
+ // calculate the degrees turned (at this angular velocity) since last frame
+ var radiansTurnedSinceLastFrame = deltaTime * angularVelocity;
+ var degreesTurnedSinceLastFrame = radToDeg(radiansTurnedSinceLastFrame);
+
+ // if we are in an edit mode, we will need fake time to turn the wheel
+ if( INTERNAL_STATE!==WALKING &&
+ INTERNAL_STATE!==SIDE_STEPPING )
+ degreesTurnedSinceLastFrame = currentAnimation.settings.baseFrequency / 70;
+
+ if( walkWheelPosition >= 360 )
+ walkWheelPosition = walkWheelPosition % 360;
+
+ // advance the walk wheel the appropriate amount
+ if( currentTransition===null || currentTransition.walkingAtEnd )
+ walkWheelPosition += degreesTurnedSinceLastFrame;
+
+ // set the new values for the exact correct walk cycle speed at this velocity
+ adjustedFrequency = 1;
+ cycle = walkWheelPosition;
+
+ // show stats and walk wheel?
+ if(statsOn) {
+
+ var distanceTravelled = velocity * deltaTime;
+ var deltaTimeMS = deltaTime * 1000;
+
+ if( INTERNAL_STATE===SIDE_STEPPING ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_LEFT ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_RIGHT ) {
+
+ // draw the walk wheel turning around the z axis for sidestepping
+ var directionSign = 1;
+ if(principleDirection===DIRECTION_RIGHT) directionSign = -1;
+ var yOffset = hipsToFeetDistance - (wheelRadius/1.2); // /1.2 is a visual kludge, probably necessary because of either the 'avi feet penetrate floor' issue - TODO - once ground plane following is in Interface, lock this down
+ var sinWalkWheelPosition = wheelRadius * Math.sin(degToRad( directionSign * walkWheelPosition ));
+ var cosWalkWheelPosition = wheelRadius * Math.cos(degToRad( directionSign * -walkWheelPosition ));
+ var wheelXPos = {x: cosWalkWheelPosition, y:-sinWalkWheelPosition - yOffset, z: 0};
+ var wheelXEnd = {x: -cosWalkWheelPosition, y:sinWalkWheelPosition - yOffset, z: 0};
+ sinWalkWheelPosition = wheelRadius * Math.sin(degToRad( -directionSign * walkWheelPosition+90 ));
+ cosWalkWheelPosition = wheelRadius * Math.cos(degToRad( -directionSign * walkWheelPosition+90 ));
+ var wheelYPos = {x:cosWalkWheelPosition, y:sinWalkWheelPosition - yOffset, z: 0};
+ var wheelYEnd = {x:-cosWalkWheelPosition, y:-sinWalkWheelPosition - yOffset, z: 0};
+ Overlays.editOverlay(walkWheelYLine, {visible: true, position:wheelYPos, end:wheelYEnd});
+ Overlays.editOverlay(walkWheelZLine, {visible: true, position:wheelXPos, end:wheelXEnd});
+
+ } else {
+
+ // draw the walk wheel turning around the x axis for walking forwards or backwards
+ var yOffset = hipsToFeetDistance - (wheelRadius/1.2); // /1.2 is a visual kludge, probably necessary because of either the 'avi feet penetrate floor' issue - TODO - once ground plane following is in Interface, lock this down
+ var sinWalkWheelPosition = wheelRadius * Math.sin(degToRad((forwardModifier*-1) * walkWheelPosition));
+ var cosWalkWheelPosition = wheelRadius * Math.cos(degToRad((forwardModifier*-1) * -walkWheelPosition));
+ var wheelZPos = {x:0, y:-sinWalkWheelPosition - yOffset, z: cosWalkWheelPosition};
+ var wheelZEnd = {x:0, y:sinWalkWheelPosition - yOffset, z: -cosWalkWheelPosition};
+ sinWalkWheelPosition = wheelRadius * Math.sin(degToRad(forwardModifier * walkWheelPosition+90));
+ cosWalkWheelPosition = wheelRadius * Math.cos(degToRad(forwardModifier * walkWheelPosition+90));
+ var wheelYPos = {x:0, y:sinWalkWheelPosition - yOffset, z: cosWalkWheelPosition};
+ var wheelYEnd = {x:0, y:-sinWalkWheelPosition - yOffset, z: -cosWalkWheelPosition};
+ Overlays.editOverlay(walkWheelYLine, { visible: true, position:wheelYPos, end:wheelYEnd });
+ Overlays.editOverlay(walkWheelZLine, { visible: true, position:wheelZPos, end:wheelZEnd });
+ }
+
+ // populate stats overlay
+ var walkWheelInfo =
+ ' Walk Wheel Stats\n--------------------------------------\n \n \n'
+ + '\nFrame time: '+deltaTimeMS.toFixed(2)
+ + ' mS\nVelocity: '+velocity.toFixed(2)
+ + ' m/s\nDistance: '+distanceTravelled.toFixed(3)
+ + ' m\nOmega: '+angularVelocity.toFixed(3)
+ + ' rad / s\nDeg to turn: '+degreesTurnedSinceLastFrame.toFixed(2)
+ + ' deg\nWheel position: '+cycle.toFixed(1)
+ + ' deg\nWheel radius: '+wheelRadius.toFixed(3)
+ + ' m\nHips To Feet: '+hipsToFeetDistance.toFixed(3)
+ + ' m\nStride: '+strideLength.toFixed(3)
+ + ' m\n';
+ Overlays.editOverlay(walkWheelStats, {text: walkWheelInfo});
+ }
+ } // end of walk wheel and stride length calculation
+
+
+ // Start applying motion
+ var pitchOscillation = 0;
+ var yawOscillation = 0;
+ var rollOscillation = 0;
+ var pitchOscillationLast = 0;
+ var yawOscillationLast = 0;
+ var rollOscillationLast = 0;
+ var pitchOffset = 0;
+ var yawOffset = 0;
+ var rollOffset = 0;
+ var pitchOffsetLast = 0;
+ var yawOffsetLast = 0;
+ var rollOffsetLast = 0;
+
+ // calcualte any hips translation
+ // Note: can only apply hips translations whilst in a config (edit) mode at present, not whilst under locomotion
+ if( INTERNAL_STATE===CONFIG_WALK_STYLES ||
+ INTERNAL_STATE===CONFIG_WALK_TWEAKS ||
+ INTERNAL_STATE===CONFIG_WALK_JOINTS ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_LEFT ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_RIGHT ||
+ INTERNAL_STATE===CONFIG_FLYING ||
+ INTERNAL_STATE===CONFIG_FLYING_UP ||
+ INTERNAL_STATE===CONFIG_FLYING_DOWN ) {
+
+ // calculate hips translation
+ var motorOscillation = Math.sin(degToRad((cycle * adjustedFrequency * 2) + currentAnimation.joints[0].thrustPhase)) + currentAnimation.joints[0].thrustOffset;
+ var swayOscillation = Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[0].swayPhase)) + currentAnimation.joints[0].swayOffset;
+ var bobOscillation = Math.sin(degToRad((cycle * adjustedFrequency * 2) + currentAnimation.joints[0].bobPhase)) + currentAnimation.joints[0].bobOffset;
+
+ // apply hips translation
+ translateHips({x:swayOscillation*currentAnimation.joints[0].sway, y:motorOscillation*currentAnimation.joints[0].thrust, z:bobOscillation*currentAnimation.joints[0].bob});
+ }
+
+ // hips rotation
+ // apply the current Transition?
+ if(currentTransition!==null) {
+
+ if( currentTransition.walkingAtStart ) {
+
+ pitchOscillation = currentAnimation.joints[0].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency * 2)
+ + currentAnimation.joints[0].pitchPhase)) + currentAnimation.joints[0].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[0].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[0].yawPhase)) + currentAnimation.joints[0].yawOffset;
+
+ rollOscillation = (currentAnimation.joints[0].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[0].rollPhase)) + currentAnimation.joints[0].rollOffset);
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[0].pitch * Math.sin(degToRad(( walkWheelPosition * 2)
+ + currentTransition.lastAnimation.joints[0].pitchPhase)) + currentTransition.lastAnimation.joints[0].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[0].yaw * Math.sin(degToRad(( walkWheelPosition )
+ + currentTransition.lastAnimation.joints[0].yawPhase)) + currentTransition.lastAnimation.joints[0].yawOffset;
+
+ rollOscillationLast = (currentTransition.lastAnimation.joints[0].roll * Math.sin(degToRad(( walkWheelPosition )
+ + currentTransition.lastAnimation.joints[0].rollPhase)) + currentTransition.lastAnimation.joints[0].rollOffset);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[0].pitch * Math.sin(degToRad((cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[0].pitchPhase)) + currentAnimation.joints[0].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[0].yaw * Math.sin(degToRad((cycle * adjustedFrequency )
+ + currentAnimation.joints[0].yawPhase)) + currentAnimation.joints[0].yawOffset;
+
+ rollOscillation = (currentAnimation.joints[0].roll * Math.sin(degToRad((cycle * adjustedFrequency )
+ + currentAnimation.joints[0].rollPhase)) + currentAnimation.joints[0].rollOffset);
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[0].pitch * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency * 2)
+ + currentTransition.lastAnimation.joints[0].pitchPhase)) + currentTransition.lastAnimation.joints[0].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[0].yaw * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[0].yawPhase)) + currentTransition.lastAnimation.joints[0].yawOffset;
+
+ rollOscillationLast = (currentTransition.lastAnimation.joints[0].roll * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[0].rollPhase)) + currentTransition.lastAnimation.joints[0].rollOffset);
+
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[0].pitch * Math.sin(degToRad((cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[0].pitchPhase)) + currentAnimation.joints[0].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[0].yaw * Math.sin(degToRad((cycle * adjustedFrequency )
+ + currentAnimation.joints[0].yawPhase)) + currentAnimation.joints[0].yawOffset;
+
+ rollOscillation = (currentAnimation.joints[0].roll * Math.sin(degToRad((cycle * adjustedFrequency )
+ + currentAnimation.joints[0].rollPhase)) + currentAnimation.joints[0].rollOffset);
+ }
+
+ // apply hips rotation
+ MyAvatar.setJointData("Hips", Quat.fromPitchYawRollDegrees(-pitchOscillation + (leanPitchModifier * getLeanPitch(velocity)), // getLeanPitch - lean forwards as velocity increases
+ yawOscillation, // Yup, that's correct ;-)
+ rollOscillation + getLeanRoll(deltaTime, velocity))); // getLeanRoll - banking on cornering
+
+ // upper legs
+ if( INTERNAL_STATE!==SIDE_STEPPING &&
+ INTERNAL_STATE!==CONFIG_SIDESTEP_LEFT &&
+ INTERNAL_STATE!==CONFIG_SIDESTEP_RIGHT ) {
+
+ // apply the current Transition to the upper legs?
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[1].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + (forwardModifier * currentAnimation.joints[1].pitchPhase)));
+ yawOscillation = currentAnimation.joints[1].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[1].yawPhase));
+ rollOscillation = currentAnimation.joints[1].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[1].rollPhase));
+
+ pitchOffset = currentAnimation.joints[1].pitchOffset;
+ yawOffset = currentAnimation.joints[1].yawOffset;
+ rollOffset = currentAnimation.joints[1].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[1].pitch
+ * Math.sin(degToRad( walkWheelPosition + (forwardModifier * currentTransition.lastAnimation.joints[1].pitchPhase )));
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[1].yaw
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[1].yawPhase ));
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[1].roll
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[1].rollPhase ));
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[1].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[1].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[1].rollOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[1].pitch * Math.sin(degToRad((cycle * adjustedFrequency ) + (forwardModifier * currentAnimation.joints[1].pitchPhase)));
+ yawOscillation = currentAnimation.joints[1].yaw * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[1].yawPhase));
+ rollOscillation = currentAnimation.joints[1].roll * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[1].rollPhase));
+
+ pitchOffset = currentAnimation.joints[1].pitchOffset;
+ yawOffset = currentAnimation.joints[1].yawOffset;
+ rollOffset = currentAnimation.joints[1].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[1].pitch
+ * Math.sin(degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + (forwardModifier * currentTransition.lastAnimation.joints[1].pitchPhase )));
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[1].yaw
+ * Math.sin(degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[1].yawPhase ));
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[1].roll
+ * Math.sin(degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[1].rollPhase ));
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[1].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[1].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[1].rollOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation ) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation ) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation ) + ((1-transitionProgress) * rollOscillationLast);
+
+ pitchOffset = (transitionProgress * pitchOffset) + ((1-transitionProgress) * pitchOffsetLast);
+ yawOffset = (transitionProgress * yawOffset) + ((1-transitionProgress) * yawOffsetLast);
+ rollOffset = (transitionProgress * rollOffset) + ((1-transitionProgress) * rollOffsetLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[1].pitch * Math.sin(degToRad((cycle * adjustedFrequency ) + (forwardModifier * currentAnimation.joints[1].pitchPhase)));
+ yawOscillation = currentAnimation.joints[1].yaw * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[1].yawPhase));
+ rollOscillation = currentAnimation.joints[1].roll * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[1].rollPhase));
+
+ pitchOffset = currentAnimation.joints[1].pitchOffset;
+ yawOffset = currentAnimation.joints[1].yawOffset;
+ rollOffset = currentAnimation.joints[1].rollOffset;
+ }
+
+ // apply the upper leg rotations
+ MyAvatar.setJointData("RightUpLeg", Quat.fromPitchYawRollDegrees( pitchOscillation + pitchOffset, yawOscillation + yawOffset, -rollOscillation - rollOffset ));
+ MyAvatar.setJointData("LeftUpLeg", Quat.fromPitchYawRollDegrees( -pitchOscillation + pitchOffset, yawOscillation - yawOffset, -rollOscillation + rollOffset ));
+
+
+ // lower leg
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[2].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[2].pitchPhase));
+ yawOscillation = currentAnimation.joints[2].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[2].yawPhase));
+ rollOscillation = currentAnimation.joints[2].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[2].rollPhase));
+
+ pitchOffset = currentAnimation.joints[2].pitchOffset;
+ yawOffset = currentAnimation.joints[2].yawOffset;
+ rollOffset = currentAnimation.joints[2].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[2].pitch * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[2].pitchPhase));
+ yawOscillationLast = currentTransition.lastAnimation.joints[2].yaw * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[2].yawPhase));
+ rollOscillationLast = currentTransition.lastAnimation.joints[2].roll * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[2].rollPhase));
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[2].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[2].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[2].rollOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[2].pitch * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[2].pitchPhase));
+ yawOscillation = currentAnimation.joints[2].yaw * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[2].yawPhase));
+ rollOscillation = currentAnimation.joints[2].roll * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[2].rollPhase));
+
+ pitchOffset = currentAnimation.joints[2].pitchOffset;
+ yawOffset = currentAnimation.joints[2].yawOffset;
+ rollOffset = currentAnimation.joints[2].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[2].pitch
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[2].pitchPhase));
+ yawOscillationLast = currentTransition.lastAnimation.joints[2].yaw
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[2].yawPhase));
+ rollOscillationLast = currentTransition.lastAnimation.joints[2].roll
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[2].rollPhase));
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[2].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[2].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[2].rollOffset;
+ }
+
+ pitchOscillation = ( transitionProgress * pitchOscillation ) + ( (1-transitionProgress) * pitchOscillationLast );
+ yawOscillation = ( transitionProgress * yawOscillation ) + ( (1-transitionProgress) * yawOscillationLast );
+ rollOscillation = ( transitionProgress * rollOscillation ) + ( (1-transitionProgress) * rollOscillationLast );
+
+ pitchOffset = ( transitionProgress * pitchOffset ) + ( (1-transitionProgress) * pitchOffsetLast );
+ yawOffset = ( transitionProgress * yawOffset ) + ( (1-transitionProgress) * yawOffsetLast );
+ rollOffset = ( transitionProgress * rollOffset ) + ( (1-transitionProgress) * rollOffsetLast );
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[2].pitch * Math.sin( degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[2].pitchPhase ));
+ yawOscillation = currentAnimation.joints[2].yaw * Math.sin( degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[2].yawPhase ));
+ rollOscillation = currentAnimation.joints[2].roll * Math.sin( degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[2].rollPhase ));
+
+ pitchOffset = currentAnimation.joints[2].pitchOffset;
+ yawOffset = currentAnimation.joints[2].yawOffset;
+ rollOffset = currentAnimation.joints[2].rollOffset;
+ }
+
+ // apply lower leg joint rotations
+ MyAvatar.setJointData("RightLeg", Quat.fromPitchYawRollDegrees( -pitchOscillation + pitchOffset, yawOscillation - yawOffset, rollOscillation - rollOffset ));
+ MyAvatar.setJointData("LeftLeg", Quat.fromPitchYawRollDegrees( pitchOscillation + pitchOffset, yawOscillation + yawOffset, rollOscillation + rollOffset ));
+
+ } // end if !SIDE_STEPPING
+
+ else if( INTERNAL_STATE===SIDE_STEPPING ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_LEFT ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_RIGHT ) {
+
+ // sidestepping uses the sinewave generators slightly differently for the legs
+ pitchOscillation = currentAnimation.joints[1].pitch * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[1].pitchPhase));
+ yawOscillation = currentAnimation.joints[1].yaw * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[1].yawPhase));
+ rollOscillation = currentAnimation.joints[1].roll * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[1].rollPhase));
+
+ // apply upper leg rotations for sidestepping
+ MyAvatar.setJointData("RightUpLeg", Quat.fromPitchYawRollDegrees(
+ -pitchOscillation + currentAnimation.joints[1].pitchOffset,
+ yawOscillation + currentAnimation.joints[1].yawOffset,
+ rollOscillation + currentAnimation.joints[1].rollOffset ));
+ MyAvatar.setJointData("LeftUpLeg", Quat.fromPitchYawRollDegrees(
+ pitchOscillation + currentAnimation.joints[1].pitchOffset,
+ yawOscillation - currentAnimation.joints[1].yawOffset,
+ -rollOscillation - currentAnimation.joints[1].rollOffset ));
+
+ // calculate lower leg joint rotations for sidestepping
+ pitchOscillation = currentAnimation.joints[2].pitch * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[2].pitchPhase));
+ yawOscillation = currentAnimation.joints[2].yaw * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[2].yawPhase));
+ rollOscillation = currentAnimation.joints[2].roll * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[2].rollPhase));
+
+ // apply lower leg joint rotations
+ MyAvatar.setJointData("RightLeg", Quat.fromPitchYawRollDegrees(
+ -pitchOscillation + currentAnimation.joints[2].pitchOffset,
+ yawOscillation - currentAnimation.joints[2].yawOffset,
+ rollOscillation - currentAnimation.joints[2].rollOffset)); // TODO: needs a kick just before fwd peak
+ MyAvatar.setJointData("LeftLeg", Quat.fromPitchYawRollDegrees(
+ pitchOscillation + currentAnimation.joints[2].pitchOffset,
+ yawOscillation + currentAnimation.joints[2].yawOffset,
+ rollOscillation + currentAnimation.joints[2].rollOffset));
+ }
+
+ // feet
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[3].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[3].pitchPhase));
+ yawOscillation = currentAnimation.joints[3].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[3].yawPhase));
+ rollOscillation = currentAnimation.joints[3].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[3].rollPhase));
+
+ pitchOffset = currentAnimation.joints[3].pitchOffset;
+ yawOffset = currentAnimation.joints[3].yawOffset;
+ rollOffset = currentAnimation.joints[3].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[3].pitch * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[3].pitchPhase));
+ yawOscillationLast = currentTransition.lastAnimation.joints[3].yaw * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[3].yawPhase));
+ rollOscillationLast = currentTransition.lastAnimation.joints[3].roll * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[3].rollPhase));
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[3].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[3].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[3].rollOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[3].pitch * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[3].pitchPhase));
+ yawOscillation = currentAnimation.joints[3].yaw * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[3].yawPhase));
+ rollOscillation = currentAnimation.joints[3].roll * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[3].rollPhase));
+
+ pitchOffset = currentAnimation.joints[3].pitchOffset;
+ yawOffset = currentAnimation.joints[3].yawOffset;
+ rollOffset = currentAnimation.joints[3].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[3].pitch
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[3].pitchPhase));
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[3].yaw
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[3].yawPhase));
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[3].roll
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[3].rollPhase));
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[3].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[3].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[3].rollOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation ) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation ) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation ) + ((1-transitionProgress) * rollOscillationLast);
+
+ pitchOffset = (transitionProgress * pitchOffset) + ((1-transitionProgress) * pitchOffsetLast);
+ yawOffset = (transitionProgress * yawOffset) + ((1-transitionProgress) * yawOffsetLast);
+ rollOffset = (transitionProgress * rollOffset) + ((1-transitionProgress) * rollOffsetLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[3].pitch * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[3].pitchPhase));
+ yawOscillation = currentAnimation.joints[3].yaw * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[3].yawPhase));
+ rollOscillation = currentAnimation.joints[3].roll * Math.sin(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[3].rollPhase));
+
+ pitchOffset = currentAnimation.joints[3].pitchOffset;
+ yawOffset = currentAnimation.joints[3].yawOffset;
+ rollOffset = currentAnimation.joints[3].rollOffset;
+ }
+
+ // apply foot rotations
+ MyAvatar.setJointData("RightFoot", Quat.fromPitchYawRollDegrees( pitchOscillation + pitchOffset, yawOscillation + yawOffset, rollOscillation + rollOffset ));
+ MyAvatar.setJointData("LeftFoot", Quat.fromPitchYawRollDegrees( -pitchOscillation + pitchOffset, yawOscillation - yawOffset, rollOscillation - rollOffset ));
+
+ // play footfall sound yet? To determine this, we take the differential of the foot's pitch curve to decide when the foot hits the ground.
+ if( INTERNAL_STATE===WALKING ||
+ INTERNAL_STATE===SIDE_STEPPING ||
+ INTERNAL_STATE===CONFIG_WALK_STYLES ||
+ INTERNAL_STATE===CONFIG_WALK_TWEAKS ||
+ INTERNAL_STATE===CONFIG_WALK_JOINTS ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_LEFT ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_RIGHT ) {
+
+ // finding dy/dx is as simple as determining the cosine wave for the foot's pitch function.
+ var feetPitchDifferential = Math.cos(degToRad((cycle * adjustedFrequency ) + currentAnimation.joints[3].pitchPhase));
+ var threshHold = 0.9; // sets the audio trigger point. with accuracy.
+ if(feetPitchDifferential<-threshHold &&
+ nextStep===DIRECTION_LEFT &&
+ principleDirection!==DIRECTION_UP &&
+ principleDirection!==DIRECTION_DOWN) {
+
+ playFootstep(DIRECTION_LEFT);
+ nextStep = DIRECTION_RIGHT;
+ }
+ else if(feetPitchDifferential>threshHold &&
+ nextStep===DIRECTION_RIGHT &&
+ principleDirection!==DIRECTION_UP &&
+ principleDirection!==DIRECTION_DOWN) {
+
+ playFootstep(DIRECTION_RIGHT);
+ nextStep = DIRECTION_LEFT;
+ }
+ }
+
+ // toes
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[4].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[4].pitchPhase));
+ yawOscillation = currentAnimation.joints[4].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[4].yawPhase)) + currentAnimation.joints[4].yawOffset;
+ rollOscillation = currentAnimation.joints[4].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[4].rollPhase)) + currentAnimation.joints[4].rollOffset;
+
+ pitchOffset = currentAnimation.joints[4].pitchOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[4].pitch * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[4].pitchPhase));
+ yawOscillationLast = currentTransition.lastAnimation.joints[4].yaw * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[4].yawPhase)) + currentTransition.lastAnimation.joints[4].yawOffset;;
+ rollOscillationLast = currentTransition.lastAnimation.joints[4].roll * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[4].rollPhase))+ currentTransition.lastAnimation.joints[4].rollOffset;
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[4].pitchOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[4].pitch * Math.sin(degToRad((cycle * adjustedFrequency) + currentAnimation.joints[4].pitchPhase));
+ yawOscillation = currentAnimation.joints[4].yaw * Math.sin(degToRad((cycle * adjustedFrequency) + currentAnimation.joints[4].yawPhase)) + currentAnimation.joints[4].yawOffset;
+ rollOscillation = currentAnimation.joints[4].roll * Math.sin(degToRad((cycle * adjustedFrequency) + currentAnimation.joints[4].rollPhase)) + currentAnimation.joints[4].rollOffset;
+
+ pitchOffset = currentAnimation.joints[4].pitchOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[4].pitch
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[4].pitchPhase));
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[4].yaw
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[4].yawPhase)) + currentTransition.lastAnimation.joints[4].yawOffset;;
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[4].roll
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[4].rollPhase))+ currentTransition.lastAnimation.joints[4].rollOffset;
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[4].pitchOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ pitchOffset = (transitionProgress * pitchOffset) + ((1-transitionProgress) * pitchOffsetLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[4].pitch * Math.sin(degToRad((cycle * adjustedFrequency) + currentAnimation.joints[4].pitchPhase));
+ yawOscillation = currentAnimation.joints[4].yaw * Math.sin(degToRad((cycle * adjustedFrequency) + currentAnimation.joints[4].yawPhase)) + currentAnimation.joints[4].yawOffset;
+ rollOscillation = currentAnimation.joints[4].roll * Math.sin(degToRad((cycle * adjustedFrequency) + currentAnimation.joints[4].rollPhase)) + currentAnimation.joints[4].rollOffset;
+
+ pitchOffset = currentAnimation.joints[4].pitchOffset;
+ }
+
+ // apply toe rotations
+ MyAvatar.setJointData("RightToeBase", Quat.fromPitchYawRollDegrees(-pitchOscillation + pitchOffset, yawOscillation, rollOscillation));
+ MyAvatar.setJointData("LeftToeBase", Quat.fromPitchYawRollDegrees( pitchOscillation + pitchOffset, yawOscillation, rollOscillation));
+
+ // spine
+ if( currentTransition !== null ) {
+
+ if( currentTransition.walkingAtStart ) {
+
+ pitchOscillation = currentAnimation.joints[5].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency * 2 ) + currentAnimation.joints[5].pitchPhase)) + currentAnimation.joints[5].pitchOffset;
+ yawOscillation = currentAnimation.joints[5].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[5].yawPhase)) + currentAnimation.joints[5].yawOffset;
+ rollOscillation = currentAnimation.joints[5].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[5].rollPhase)) + currentAnimation.joints[5].rollOffset;
+
+ // calculate where we would have been if we'd continued in the last state
+ pitchOscillationLast = currentTransition.lastAnimation.joints[5].pitch
+ * Math.sin(degToRad(( walkWheelPosition * 2 ) + currentTransition.lastAnimation.joints[5].pitchPhase))
+ + currentTransition.lastAnimation.joints[5].pitchOffset;
+ yawOscillationLast = currentTransition.lastAnimation.joints[5].yaw
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[5].yawPhase))
+ + currentTransition.lastAnimation.joints[5].yawOffset;
+ rollOscillationLast = currentTransition.lastAnimation.joints[5].roll
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[5].rollPhase))
+ + currentTransition.lastAnimation.joints[5].rollOffset;
+ } else {
+
+ pitchOscillation = currentAnimation.joints[5].pitch * Math.sin( degToRad(( cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[5].pitchPhase)) + currentAnimation.joints[5].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[5].yaw * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[5].yawPhase)) + currentAnimation.joints[5].yawOffset;
+
+ rollOscillation = currentAnimation.joints[5].roll * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[5].rollPhase)) + currentAnimation.joints[5].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[5].pitch
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency * 2 )
+ + currentTransition.lastAnimation.joints[5].pitchPhase))
+ + currentTransition.lastAnimation.joints[5].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[5].yaw
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[5].yawPhase))
+ + currentTransition.lastAnimation.joints[5].yawOffset;
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[5].roll
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[5].rollPhase))
+ + currentTransition.lastAnimation.joints[5].rollOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation ) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation ) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation ) + ((1-transitionProgress) * rollOscillationLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[5].pitch * Math.sin(degToRad(( cycle * adjustedFrequency * 2) + currentAnimation.joints[5].pitchPhase)) + currentAnimation.joints[5].pitchOffset;
+ yawOscillation = currentAnimation.joints[5].yaw * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[5].yawPhase)) + currentAnimation.joints[5].yawOffset;
+ rollOscillation = currentAnimation.joints[5].roll * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[5].rollPhase)) + currentAnimation.joints[5].rollOffset;
+ }
+
+ // apply spine joint rotations
+ MyAvatar.setJointData("Spine", Quat.fromPitchYawRollDegrees( pitchOscillation, yawOscillation, rollOscillation ));
+
+ // spine 1
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[6].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency * 2) + currentAnimation.joints[6].pitchPhase)) + currentAnimation.joints[6].pitchOffset;
+ yawOscillation = currentAnimation.joints[6].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[6].yawPhase)) + currentAnimation.joints[6].yawOffset;
+ rollOscillation = currentAnimation.joints[6].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[6].rollPhase)) + currentAnimation.joints[6].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[6].pitch
+ * Math.sin(degToRad(( walkWheelPosition * 2 ) + currentTransition.lastAnimation.joints[6].pitchPhase))
+ + currentTransition.lastAnimation.joints[6].pitchOffset;
+ yawOscillationLast = currentTransition.lastAnimation.joints[6].yaw
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[6].yawPhase))
+ + currentTransition.lastAnimation.joints[6].yawOffset;
+ rollOscillationLast = currentTransition.lastAnimation.joints[6].roll
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[6].rollPhase))
+ + currentTransition.lastAnimation.joints[6].rollOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[6].pitch * Math.sin( degToRad(( cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[6].pitchPhase)) + currentAnimation.joints[6].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[6].yaw * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[6].yawPhase)) + currentAnimation.joints[6].yawOffset;
+
+ rollOscillation = currentAnimation.joints[6].roll * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[6].rollPhase)) + currentAnimation.joints[6].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[6].pitch
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency * 2 )
+ + currentTransition.lastAnimation.joints[6].pitchPhase))
+ + currentTransition.lastAnimation.joints[6].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[6].yaw
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[6].yawPhase))
+ + currentTransition.lastAnimation.joints[6].yawOffset;
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[6].roll
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[6].rollPhase))
+ + currentTransition.lastAnimation.joints[6].rollOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[6].pitch * Math.sin(degToRad(( cycle * adjustedFrequency * 2) + currentAnimation.joints[6].pitchPhase)) + currentAnimation.joints[6].pitchOffset;
+ yawOscillation = currentAnimation.joints[6].yaw * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[6].yawPhase)) + currentAnimation.joints[6].yawOffset;
+ rollOscillation = currentAnimation.joints[6].roll * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[6].rollPhase)) + currentAnimation.joints[6].rollOffset;
+ }
+ // apply spine1 joint rotations
+ MyAvatar.setJointData("Spine1", Quat.fromPitchYawRollDegrees( pitchOscillation, yawOscillation, rollOscillation ));
+
+ // spine 2
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+ pitchOscillation = currentAnimation.joints[7].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency * 2) + currentAnimation.joints[7].pitchPhase)) + currentAnimation.joints[7].pitchOffset;
+ yawOscillation = currentAnimation.joints[7].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[7].yawPhase)) + currentAnimation.joints[7].yawOffset;
+ rollOscillation = currentAnimation.joints[7].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[7].rollPhase)) + currentAnimation.joints[7].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[7].pitch
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[7].pitchPhase))
+ + currentTransition.lastAnimation.joints[7].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[7].yaw
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[7].yawPhase))
+ + currentTransition.lastAnimation.joints[7].yawOffset;
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[7].roll
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[7].rollPhase))
+ + currentTransition.lastAnimation.joints[7].rollOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[7].pitch
+ * Math.sin( degToRad(( cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[7].pitchPhase))
+ + currentAnimation.joints[7].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[7].yaw
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[7].yawPhase))
+ + currentAnimation.joints[7].yawOffset;
+
+ rollOscillation = currentAnimation.joints[7].roll
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[7].rollPhase))
+ + currentAnimation.joints[7].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[7].pitch
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[7].pitchPhase))
+ + currentTransition.lastAnimation.joints[7].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[7].yaw
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[7].yawPhase))
+ + currentTransition.lastAnimation.joints[7].yawOffset;
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[7].roll
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[7].rollPhase))
+ + currentTransition.lastAnimation.joints[7].rollOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation ) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation ) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation ) + ((1-transitionProgress) * rollOscillationLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[7].pitch * Math.sin(degToRad(( cycle * adjustedFrequency * 2) + currentAnimation.joints[7].pitchPhase))
+ + currentAnimation.joints[7].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[7].yaw * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[7].yawPhase))
+ + currentAnimation.joints[7].yawOffset;
+
+ rollOscillation = currentAnimation.joints[7].roll * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[7].rollPhase))
+ + currentAnimation.joints[7].rollOffset;
+ }
+ // apply spine2 joint rotations
+ MyAvatar.setJointData("Spine2", Quat.fromPitchYawRollDegrees( pitchOscillation, yawOscillation, rollOscillation ));
+
+ if(!armsFree) {
+
+ // shoulders
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+ pitchOscillation = currentAnimation.joints[8].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[8].pitchPhase)) + currentAnimation.joints[8].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[8].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[8].yawPhase));
+
+ rollOscillation = currentAnimation.joints[8].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency * 2)
+ + currentAnimation.joints[8].rollPhase)) + currentAnimation.joints[8].rollOffset;
+
+ yawOffset = currentAnimation.joints[8].yawOffset;
+
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[8].pitch
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[8].pitchPhase))
+ + currentTransition.lastAnimation.joints[8].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[8].yaw
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[8].yawPhase))
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[8].roll
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[8].rollPhase))
+ + currentTransition.lastAnimation.joints[8].rollOffset;
+
+ yawOffsetLast = currentTransition.lastAnimation.joints[8].yawOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[8].pitch * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[8].pitchPhase)) + currentAnimation.joints[8].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[8].yaw * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[8].yawPhase));
+
+ rollOscillation = currentAnimation.joints[8].roll * Math.sin( degToRad(( cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[8].rollPhase)) + currentAnimation.joints[8].rollOffset;
+
+ yawOffset = currentAnimation.joints[8].yawOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[8].pitch
+ * Math.sin( degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[8].pitchPhase))
+ + currentTransition.lastAnimation.joints[8].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[8].yaw
+ * Math.sin( degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[8].yawPhase))
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[8].roll
+ * Math.sin( degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[8].rollPhase))
+ + currentTransition.lastAnimation.joints[8].rollOffset;
+
+ yawOffsetLast = currentTransition.lastAnimation.joints[8].yawOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ yawOffset = (transitionProgress * yawOffset) + ((1-transitionProgress) * yawOffsetLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[8].pitch * Math.sin(degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[8].pitchPhase)) + currentAnimation.joints[8].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[8].yaw * Math.sin(degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[8].yawPhase));
+
+ rollOscillation = currentAnimation.joints[8].roll * Math.sin(degToRad(( cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[8].rollPhase)) + currentAnimation.joints[8].rollOffset;
+
+ yawOffset = currentAnimation.joints[8].yawOffset;
+ }
+
+ MyAvatar.setJointData("RightShoulder", Quat.fromPitchYawRollDegrees(pitchOscillation, yawOscillation + yawOffset, rollOscillation ));
+ MyAvatar.setJointData("LeftShoulder", Quat.fromPitchYawRollDegrees(pitchOscillation, yawOscillation - yawOffset, -rollOscillation ));
+
+ // upper arms
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[9].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[9].pitchPhase));
+ yawOscillation = currentAnimation.joints[9].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[9].yawPhase));
+ rollOscillation = currentAnimation.joints[9].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency * 2) + currentAnimation.joints[9].rollPhase)) + currentAnimation.joints[9].rollOffset;
+
+ pitchOffset = currentAnimation.joints[9].pitchOffset;
+ yawOffset = currentAnimation.joints[9].yawOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[9].pitch
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[9].pitchPhase))
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[9].yaw
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[9].yawPhase))
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[9].roll
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[9].rollPhase))
+ + currentTransition.lastAnimation.joints[9].rollOffset;
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[9].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[9].yawOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[9].pitch
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[9].pitchPhase));
+
+ yawOscillation = currentAnimation.joints[9].yaw
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[9].yawPhase));
+
+ rollOscillation = currentAnimation.joints[9].roll
+ * Math.sin(degToRad(( cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[9].rollPhase))
+ + currentAnimation.joints[9].rollOffset;
+
+ pitchOffset = currentAnimation.joints[9].pitchOffset;
+ yawOffset = currentAnimation.joints[9].yawOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[9].pitch
+ * Math.sin( degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[9].pitchPhase))
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[9].yaw
+ * Math.sin( degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[9].yawPhase))
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[9].roll
+ * Math.sin( degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[9].rollPhase))
+ + currentTransition.lastAnimation.joints[9].rollOffset;
+
+ pitchOffsetLast = currentTransition.lastAnimation.joints[9].pitchOffset;
+ yawOffsetLast = currentTransition.lastAnimation.joints[9].yawOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ pitchOffset = (transitionProgress * pitchOffset) + ((1-transitionProgress) * pitchOffsetLast);
+ yawOffset = (transitionProgress * yawOffset) + ((1-transitionProgress) * yawOffsetLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[9].pitch
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[9].pitchPhase));
+
+ yawOscillation = currentAnimation.joints[9].yaw
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[9].yawPhase));
+
+ rollOscillation = currentAnimation.joints[9].roll
+ * Math.sin( degToRad(( cycle * adjustedFrequency * 2)
+ + currentAnimation.joints[9].rollPhase))
+ + currentAnimation.joints[9].rollOffset;
+
+ pitchOffset = currentAnimation.joints[9].pitchOffset;
+ yawOffset = currentAnimation.joints[9].yawOffset;
+
+ }
+ MyAvatar.setJointData("RightArm", Quat.fromPitchYawRollDegrees( -pitchOscillation + pitchOffset, yawOscillation - yawOffset, rollOscillation ));
+ MyAvatar.setJointData("LeftArm", Quat.fromPitchYawRollDegrees( pitchOscillation + pitchOffset, yawOscillation + yawOffset, -rollOscillation ));
+
+ // forearms
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[10].pitch
+ * Math.sin( degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[10].pitchPhase ))
+ + currentAnimation.joints[10].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[10].yaw
+ * Math.sin( degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[10].yawPhase ));
+
+ rollOscillation = currentAnimation.joints[10].roll
+ * Math.sin( degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[10].rollPhase ));
+
+ yawOffset = currentAnimation.joints[10].yawOffset;
+ rollOffset = currentAnimation.joints[10].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[10].pitch
+ * Math.sin( degToRad(( walkWheelPosition )
+ + currentTransition.lastAnimation.joints[10].pitchPhase))
+ + currentTransition.lastAnimation.joints[10].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[10].yaw
+ * Math.sin( degToRad(( walkWheelPosition )
+ + currentTransition.lastAnimation.joints[10].yawPhase));
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[10].roll
+ * Math.sin( degToRad(( walkWheelPosition )
+ + currentTransition.lastAnimation.joints[10].rollPhase));
+
+ yawOffsetLast = currentTransition.lastAnimation.joints[10].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[10].rollOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[10].pitch
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[10].pitchPhase ))
+ + currentAnimation.joints[10].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[10].yaw
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[10].yawPhase ));
+
+ rollOscillation = currentAnimation.joints[10].roll
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[10].rollPhase ));
+
+ yawOffset = currentAnimation.joints[10].yawOffset;
+ rollOffset = currentAnimation.joints[10].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[10].pitch
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[10].pitchPhase))
+ + currentTransition.lastAnimation.joints[10].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[10].yaw
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[10].yawPhase));
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[10].roll
+ * Math.sin( degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[10].rollPhase));
+
+ yawOffsetLast = currentTransition.lastAnimation.joints[10].yawOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[10].rollOffset;
+ }
+
+ // blend the previous and next
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = -(transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ yawOffset = (transitionProgress * yawOffset) + ((1-transitionProgress) * yawOffsetLast);
+ rollOffset = (transitionProgress * rollOffset) + ((1-transitionProgress) * rollOffsetLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[10].pitch
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[10].pitchPhase ))
+ + currentAnimation.joints[10].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[10].yaw
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[10].yawPhase ));
+
+ rollOscillation = currentAnimation.joints[10].roll
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[10].rollPhase ));
+
+ yawOffset = currentAnimation.joints[10].yawOffset;
+ rollOffset = currentAnimation.joints[10].rollOffset;
+ }
+
+ // apply forearms rotations
+ MyAvatar.setJointData("RightForeArm", Quat.fromPitchYawRollDegrees( pitchOscillation, yawOscillation + yawOffset, rollOscillation + rollOffset ));
+ MyAvatar.setJointData("LeftForeArm", Quat.fromPitchYawRollDegrees( pitchOscillation, yawOscillation - yawOffset, rollOscillation - rollOffset ));
+
+ // hands
+ var sideStepSign = 1;
+ if(INTERNAL_STATE===SIDE_STEPPING) {
+ sideStepSign = 1;
+ }
+ if(currentTransition!==null) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = currentAnimation.joints[11].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[11].pitchPhase)) + currentAnimation.joints[11].pitchOffset;
+ yawOscillation = currentAnimation.joints[11].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[11].yawPhase)) + currentAnimation.joints[11].yawOffset;
+ rollOscillation = currentAnimation.joints[11].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency ) + currentAnimation.joints[11].rollPhase)) ;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[11].pitch
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[11].pitchPhase))
+ + currentTransition.lastAnimation.joints[11].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[11].yaw
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[11].yawPhase))
+ + currentTransition.lastAnimation.joints[11].yawOffset;
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[11].roll
+ * Math.sin(degToRad( walkWheelPosition + currentTransition.lastAnimation.joints[11].rollPhase))
+
+ rollOffset = currentAnimation.joints[11].rollOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[11].rollOffset;
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[11].pitch
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[11].pitchPhase))
+ + currentAnimation.joints[11].pitchOffset;
+
+ yawOscillation = currentAnimation.joints[11].yaw
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[11].yawPhase))
+ + currentAnimation.joints[11].yawOffset;
+
+ rollOscillation = currentAnimation.joints[11].roll
+ * Math.sin( degToRad(( cycle * adjustedFrequency )
+ + currentAnimation.joints[11].rollPhase));
+
+ rollOffset = currentAnimation.joints[11].rollOffset;
+
+ pitchOscillationLast = currentTransition.lastAnimation.joints[11].pitch
+ * Math.sin(degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[11].pitchPhase))
+ + currentTransition.lastAnimation.joints[11].pitchOffset;
+
+ yawOscillationLast = currentTransition.lastAnimation.joints[11].yaw
+ * Math.sin(degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[11].yawPhase))
+ + currentTransition.lastAnimation.joints[11].yawOffset;
+
+ rollOscillationLast = currentTransition.lastAnimation.joints[11].roll
+ * Math.sin(degToRad( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency
+ + currentTransition.lastAnimation.joints[11].rollPhase))
+
+ rollOffset = currentAnimation.joints[11].rollOffset;
+ rollOffsetLast = currentTransition.lastAnimation.joints[11].rollOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ rollOffset = (transitionProgress * rollOffset) + ((1-transitionProgress) * rollOffsetLast);
+
+ } else {
+
+ pitchOscillation = currentAnimation.joints[11].pitch * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[11].pitchPhase)) + currentAnimation.joints[11].pitchOffset;
+ yawOscillation = currentAnimation.joints[11].yaw * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[11].yawPhase)) + currentAnimation.joints[11].yawOffset;
+ rollOscillation = currentAnimation.joints[11].roll * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[11].rollPhase));
+
+ rollOffset = currentAnimation.joints[11].rollOffset;
+ }
+
+ // set the hand rotations
+ MyAvatar.setJointData("RightHand", Quat.fromPitchYawRollDegrees( sideStepSign * pitchOscillation, yawOscillation, rollOscillation + rollOffset));
+ MyAvatar.setJointData("LeftHand", Quat.fromPitchYawRollDegrees( pitchOscillation, -yawOscillation, rollOscillation - rollOffset));
+
+ } // end if(!armsFree)
+
+ // head (includes neck joint) - currently zeroed out in STANDING animation files by request
+ if( currentTransition !== null ) {
+
+ if(currentTransition.walkingAtStart) {
+
+ pitchOscillation = 0.5 * currentAnimation.joints[12].pitch * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency * 2)
+ + currentAnimation.joints[12].pitchPhase)) + currentAnimation.joints[12].pitchOffset;
+
+ yawOscillation = 0.5 * currentAnimation.joints[12].yaw * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[12].yawPhase)) + currentAnimation.joints[12].yawOffset;
+
+ rollOscillation = 0.5 * currentAnimation.joints[12].roll * Math.sin(degToRad(( cumulativeTime * currentAnimation.settings.baseFrequency )
+ + currentAnimation.joints[12].rollPhase)) + currentAnimation.joints[12].rollOffset;
+
+ pitchOscillationLast = 0.5 * currentTransition.lastAnimation.joints[12].pitch
+ * Math.sin(degToRad(( walkWheelPosition * 2) + currentTransition.lastAnimation.joints[12].pitchPhase))
+ + currentTransition.lastAnimation.joints[12].pitchOffset;
+
+ yawOscillationLast = 0.5 * currentTransition.lastAnimation.joints[12].yaw
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[12].yawPhase))
+ + currentTransition.lastAnimation.joints[12].yawOffset;
+
+ rollOscillationLast = 0.5 * currentTransition.lastAnimation.joints[12].roll
+ * Math.sin(degToRad(( walkWheelPosition ) + currentTransition.lastAnimation.joints[12].rollPhase))
+ + currentTransition.lastAnimation.joints[12].rollOffset;
+
+ } else {
+
+ pitchOscillation = 0.5 * currentAnimation.joints[12].pitch * Math.sin(degToRad(( cycle * adjustedFrequency * 2) + currentAnimation.joints[12].pitchPhase)) + currentAnimation.joints[12].pitchOffset;
+ yawOscillation = 0.5 * currentAnimation.joints[12].yaw * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[12].yawPhase)) + currentAnimation.joints[12].yawOffset;
+ rollOscillation = 0.5 * currentAnimation.joints[12].roll * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[12].rollPhase)) + currentAnimation.joints[12].rollOffset;
+
+ pitchOscillationLast = 0.5 * currentTransition.lastAnimation.joints[12].pitch
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency * 2)
+ + currentTransition.lastAnimation.joints[12].pitchPhase))
+ + currentTransition.lastAnimation.joints[12].pitchOffset;
+
+ yawOscillationLast = 0.5 * currentTransition.lastAnimation.joints[12].yaw
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[12].yawPhase))
+ + currentTransition.lastAnimation.joints[12].yawOffset;
+
+ rollOscillationLast = 0.5 * currentTransition.lastAnimation.joints[12].roll
+ * Math.sin(degToRad(( cumulativeTime * currentTransition.lastAnimation.settings.baseFrequency )
+ + currentTransition.lastAnimation.joints[12].rollPhase))
+ + currentTransition.lastAnimation.joints[12].rollOffset;
+ }
+
+ pitchOscillation = (transitionProgress * pitchOscillation) + ((1-transitionProgress) * pitchOscillationLast);
+ yawOscillation = (transitionProgress * yawOscillation) + ((1-transitionProgress) * yawOscillationLast);
+ rollOscillation = (transitionProgress * rollOscillation) + ((1-transitionProgress) * rollOscillationLast);
+
+ } else {
+
+ pitchOscillation = 0.5 * currentAnimation.joints[12].pitch * Math.sin(degToRad(( cycle * adjustedFrequency * 2) + currentAnimation.joints[12].pitchPhase)) + currentAnimation.joints[12].pitchOffset;
+ yawOscillation = 0.5 * currentAnimation.joints[12].yaw * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[12].yawPhase)) + currentAnimation.joints[12].yawOffset;
+ rollOscillation = 0.5 * currentAnimation.joints[12].roll * Math.sin(degToRad(( cycle * adjustedFrequency ) + currentAnimation.joints[12].rollPhase)) + currentAnimation.joints[12].rollOffset;
+ }
+
+ MyAvatar.setJointData( "Head", Quat.fromPitchYawRollDegrees( pitchOscillation, yawOscillation, rollOscillation ));
+ MyAvatar.setJointData( "Neck", Quat.fromPitchYawRollDegrees( pitchOscillation, yawOscillation, rollOscillation ));
+}
+
+
+
+// Bezier function for applying to transitions - src: Dan Pupius (www.pupius.net) http://13thparallel.com/archive/bezier-curves/
+Coord = function (x,y) {
+ if(!x) var x=0;
+ if(!y) var y=0;
+ return {x: x, y: y};
+}
+
+function B1(t) { return t*t*t }
+function B2(t) { return 3*t*t*(1-t) }
+function B3(t) { return 3*t*(1-t)*(1-t) }
+function B4(t) { return (1-t)*(1-t)*(1-t) }
+
+function getBezier(percent,C1,C2,C3,C4) {
+ var pos = new Coord();
+ pos.x = C1.x*B1(percent) + C2.x*B2(percent) + C3.x*B3(percent) + C4.x*B4(percent);
+ pos.y = C1.y*B1(percent) + C2.y*B2(percent) + C3.y*B3(percent) + C4.y*B4(percent);
+ return pos;
+}
+
+// Butterworth LP filter - coeffs calculated using: http://www-users.cs.york.ac.uk/~fisher/mkfilter/trad.html
+var NZEROS = 8;
+var NPOLES = 8;
+var GAIN = 17.40692157;
+var xv = [0,0,0,0,0,0,0,0,0]; //xv.length = NZEROS+1;
+var yv = [0,0,0,0,0,0,0,0,0]; //yv.length = NPOLES+1;
+
+function filterButterworth(nextInputValue)
+{
+ xv[0] = xv[1]; xv[1] = xv[2]; xv[2] = xv[3]; xv[3] = xv[4]; xv[4] = xv[5]; xv[5] = xv[6]; xv[6] = xv[7]; xv[7] = xv[8];
+ xv[8] = nextInputValue / GAIN;
+ yv[0] = yv[1]; yv[1] = yv[2]; yv[2] = yv[3]; yv[3] = yv[4]; yv[4] = yv[5]; yv[5] = yv[6]; yv[6] = yv[7]; yv[7] = yv[8];
+ yv[8] = (xv[0] + xv[8]) + 8 * (xv[1] + xv[7]) + 28 * (xv[2] + xv[6])
+ + 56 * (xv[3] + xv[5]) + 70 * xv[4]
+ + ( -0.0033008230 * yv[0]) + ( -0.0440409341 * yv[1])
+ + ( -0.2663485333 * yv[2]) + ( -0.9570250765 * yv[3])
+ + ( -2.2596729000 * yv[4]) + ( -3.6088345059 * yv[5])
+ + ( -3.9148571397 * yv[6]) + ( -2.6527135283 * yv[7]);
+ return yv[8];
+}
+
+// the faster we go, the further we lean forward. the angle is calcualted here
+var leanAngles = []; // smooth out and add damping with simple averaging filter.
+leanAngles.length = 15;
+
+function getLeanPitch(velocity) {
+
+ if(velocity>TERMINAL_VELOCITY) velocity=TERMINAL_VELOCITY;
+ var leanProgress = velocity / TERMINAL_VELOCITY;
+ var responseSharpness = 1.8;
+ if(principleDirection==DIRECTION_BACKWARDS) responseSharpness = 3.6; // lean back a bit extra when walking backwards
+ var leanProgressBezier = getBezier((1-leanProgress),{x:0,y:0},{x:0,y:responseSharpness},{x:0,y:1},{x:1,y:1}).y;
+
+ // simple averaging filter seems to give best results
+ leanAngles.push(leanProgressBezier);
+ leanAngles.shift(); // FIFO
+ var totalLeanAngles = 0;
+ for(ea in leanAngles) totalLeanAngles += leanAngles[ea];
+ var leanProgressAverageFiltered = totalLeanAngles / leanAngles.length;
+
+ // calculate final return value
+ var leanPitchFinal = 0;
+ if(principleDirection===DIRECTION_BACKWARDS) {
+ leanPitchFinal = -currentAnimation.settings.flyingHipsPitch * leanProgressAverageFiltered;// + finalAccelerationResponse;
+ } else {
+ leanPitchFinal = currentAnimation.settings.flyingHipsPitch * leanProgressAverageFiltered;// + finalAccelerationResponse;
+ }
+ return leanPitchFinal;
+}
+
+// calculate the angle at which to bank into corners when turning
+var leanRollAngles = []; // smooth out and add damping with simple averaging filter
+leanRollAngles.length = 25;
+
+var angularVelocities = []; // keep a record of the last few so can filter out spurious values
+angularVelocities.length = 5;
+
+function getLeanRoll(deltaTime, velocity) {
+
+ // what's our current anglular velocity?
+ var angularVelocityMax = 70; // from observation
+ var currentOrientationVec3 = Quat.safeEulerAngles(MyAvatar.orientation);
+ var lastOrientationVec3 = Quat.safeEulerAngles(lastOrientation);
+ var deltaYaw = lastOrientationVec3.y-currentOrientationVec3.y;
+ lastOrientation = MyAvatar.orientation;
+
+ var angularVelocity = deltaYaw / deltaTime;
+ if(angularVelocity>angularVelocityMax) angularVelocity = angularVelocityMax;
+ if(angularVelocity<-angularVelocityMax) angularVelocity = -angularVelocityMax;
+
+ // filter the angular velocity for a nicer response and a bit of wobble (intentional overshoot / ringing)
+ angularVelocity = filterButterworth(angularVelocity);
+
+ var turnSign = 1;
+ if(angularVelocity<0) turnSign = -1;
+ if(principleDirection===DIRECTION_BACKWARDS)
+ turnSign *= -1;
+
+ // calculate the amount of roll based on both angular and linear velocities
+ if(velocity>TERMINAL_VELOCITY) velocity = TERMINAL_VELOCITY;
+ var leanRollProgress = (velocity / TERMINAL_VELOCITY) * (Math.abs(angularVelocity) / angularVelocityMax);
+
+ // apply our response curve
+ var leanRollProgressBezier = getBezier((1-leanRollProgress),{x:0,y:0},{x:0,y:2.5},{x:0,y:1},{x:1,y:1}).y;
+
+ // simple averaging filter
+ leanRollAngles.push(turnSign * leanRollProgressBezier);
+ leanRollAngles.shift(); // FIFO
+ var totalLeanRollAngles = 0;
+ for(var ea in leanRollAngles) totalLeanRollAngles += leanRollAngles[ea];
+ var leanRollProgressAverageFiltered = totalLeanRollAngles / leanRollAngles.length;
+
+ return currentAnimation.settings.maxBankingAngle * leanRollProgressAverageFiltered;
+}
+
+// set up the interface components, update the internal state and kick off any transitions
+function setInternalState(newInternalState) {
+
+ switch(newInternalState) {
+
+ case WALKING:
+
+ if(!minimised) doStandardMenu();
+ INTERNAL_STATE = WALKING;
+ return;
+
+ case FLYING:
+
+ if(!minimised) doStandardMenu();
+ INTERNAL_STATE = FLYING;
+ return;
+
+ case SIDE_STEPPING:
+
+ if(!minimised) doStandardMenu();
+ INTERNAL_STATE = SIDE_STEPPING;
+ return;
+
+ case CONFIG_WALK_STYLES:
+
+ INTERNAL_STATE = CONFIG_WALK_STYLES;
+ currentAnimation = selectedWalk;
+ if(!minimised) {
+ hidebuttonOverlays();
+ hideJointControls();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(true);
+ setBackground(controlsBackgroundWalkEditStyles);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configWalkStylesButtonSelected);
+ setButtonOverlayVisible(configWalkTweaksButton);
+ setButtonOverlayVisible(configWalkJointsButton);
+ setButtonOverlayVisible(backButton);
+ setSliderThumbsVisible(false);
+ }
+ return;
+
+ case CONFIG_WALK_TWEAKS:
+
+ INTERNAL_STATE = CONFIG_WALK_TWEAKS;
+ currentAnimation = selectedWalk;
+ if(!minimised) {
+ hidebuttonOverlays();
+ hideJointControls();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditTweaks);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configWalkStylesButton);
+ setButtonOverlayVisible(configWalkTweaksButtonSelected);
+ setButtonOverlayVisible(configWalkJointsButton);
+ setButtonOverlayVisible(backButton);
+ initialiseWalkTweaks();
+ }
+ return;
+
+ case CONFIG_WALK_JOINTS:
+
+ INTERNAL_STATE = CONFIG_WALK_JOINTS;
+ currentAnimation = selectedWalk;
+ if(!minimised) {
+ hidebuttonOverlays();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditJoints);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configWalkStylesButton);
+ setButtonOverlayVisible(configWalkTweaksButton);
+ setButtonOverlayVisible(configWalkJointsButtonSelected);
+ setButtonOverlayVisible(backButton);
+ initialiseJointsEditingPanel(selectedJointIndex);
+ }
+ return;
+
+ case CONFIG_STANDING:
+
+ INTERNAL_STATE = CONFIG_STANDING;
+ currentAnimation = selectedStand;
+ if(!minimised) {
+ hidebuttonOverlays();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditJoints);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configSideStepRightButton);
+ setButtonOverlayVisible(configSideStepLeftButton);
+ setButtonOverlayVisible(configStandButtonSelected);
+ setButtonOverlayVisible(backButton);
+ initialiseJointsEditingPanel(selectedJointIndex);
+ }
+ return;
+
+ case CONFIG_SIDESTEP_LEFT:
+
+ INTERNAL_STATE = CONFIG_SIDESTEP_LEFT;
+ currentAnimation = selectedSideStepLeft;
+ if(!minimised) {
+ hidebuttonOverlays();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditJoints);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configSideStepRightButton);
+ setButtonOverlayVisible(configSideStepLeftButtonSelected);
+ setButtonOverlayVisible(configStandButton);
+ setButtonOverlayVisible(backButton);
+ initialiseJointsEditingPanel(selectedJointIndex);
+ }
+ return;
+
+ case CONFIG_SIDESTEP_RIGHT:
+
+ INTERNAL_STATE = CONFIG_SIDESTEP_RIGHT;
+ currentAnimation = selectedSideStepRight;
+ if(!minimised) {
+ hidebuttonOverlays();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditJoints);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configSideStepRightButtonSelected);
+ setButtonOverlayVisible(configSideStepLeftButton);
+ setButtonOverlayVisible(configStandButton);
+ setButtonOverlayVisible(backButton);
+ initialiseJointsEditingPanel(selectedJointIndex);
+ }
+ return;
+
+ case CONFIG_FLYING:
+
+ INTERNAL_STATE = CONFIG_FLYING;
+ currentAnimation = selectedFly;
+ if(!minimised) {
+ hidebuttonOverlays();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditJoints);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configFlyingUpButton);
+ setButtonOverlayVisible(configFlyingDownButton);
+ setButtonOverlayVisible(configFlyingButtonSelected);
+ setButtonOverlayVisible(backButton);
+ initialiseJointsEditingPanel(selectedJointIndex);
+ }
+ return;
+
+ case CONFIG_FLYING_UP:
+
+ INTERNAL_STATE = CONFIG_FLYING_UP;
+ currentAnimation = selectedFlyUp;
+ if(!minimised) {
+ hidebuttonOverlays();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditJoints);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configFlyingUpButtonSelected);
+ setButtonOverlayVisible(configFlyingDownButton);
+ setButtonOverlayVisible(configFlyingButton);
+ setButtonOverlayVisible(backButton);
+ initialiseJointsEditingPanel(selectedJointIndex);
+ }
+ return;
+
+ case CONFIG_FLYING_DOWN:
+
+ INTERNAL_STATE = CONFIG_FLYING_DOWN;
+ currentAnimation = selectedFlyDown;
+ if(!minimised) {
+ hidebuttonOverlays();
+ showFrontPanelButtons(false);
+ showWalkStyleButtons(false);
+ setBackground(controlsBackgroundWalkEditJoints);
+ setButtonOverlayVisible(onButton);
+ setButtonOverlayVisible(configFlyingUpButton);
+ setButtonOverlayVisible(configFlyingDownButtonSelected);
+ setButtonOverlayVisible(configFlyingButton);
+ setButtonOverlayVisible(backButton);
+ initialiseJointsEditingPanel(selectedJointIndex);
+ }
+ return;
+
+ case STANDING:
+ default:
+
+ INTERNAL_STATE = STANDING;
+ if(!minimised) doStandardMenu();
+
+ // initialisation - runs at script startup only
+ if(strideLength===0) {
+
+ if(principleDirection===DIRECTION_BACKWARDS)
+ strideLength = selectedWalk.calibration.strideLengthBackwards;
+ else
+ strideLength = selectedWalk.calibration.strideLengthForwards;
+
+ curlFingers();
+ }
+ return;
+ }
+}
+
+// Main loop
+
+// stabilising vars - most state changes are preceded by a couple of hints that they are about to happen rather than
+// momentarilly switching between states (causes flicker), we count the number of hints in a row before actually changing state
+var standHints = 0;
+var walkHints = 0;
+var flyHints = 0;
+var requiredHints = 2; // tweakable - debounce state changes - how many times do we get a state change request in a row before we actually change state? (used to be 4 or 5)
+var principleDirection = 0;
+
+// helper function for stats output
+function directionAsString(directionEnum) {
+
+ switch(directionEnum) {
+ case DIRECTION_UP: return 'Up';
+ case DIRECTION_DOWN: return 'Down';
+ case DIRECTION_LEFT: return 'Left';
+ case DIRECTION_RIGHT: return 'Right';
+ case DIRECTION_FORWARDS: return 'Forwards';
+ case DIRECTION_BACKWARDS: return 'Backwards';
+ default: return 'Unknown';
+ }
+}
+// helper function for stats output
+function internalStateAsString(internalState) {
+
+ switch(internalState) {
+ case STANDING: return 'Standing';
+ case WALKING: return 'Walking';
+ case SIDE_STEPPING: return 'Side Stepping';
+ case FLYING: return 'Flying';
+ default: return 'Editing';
+ }
+}
+
+Script.update.connect(function(deltaTime) {
+
+ if(powerOn) {
+
+ frameStartTime = new Date().getTime();
+ cumulativeTime += deltaTime;
+ nFrames++;
+ var speed = 0;
+
+ // firstly check for editing modes, as these require no positioning calculations
+ var editing = false;
+ switch(INTERNAL_STATE) {
+
+ case CONFIG_WALK_STYLES:
+ currentAnimation = selectedWalk;
+ animateAvatar(deltaTime, speed, principleDirection);
+ editing = true;
+ break;
+ case CONFIG_WALK_TWEAKS:
+ currentAnimation = selectedWalk;
+ animateAvatar(deltaTime, speed, DIRECTION_FORWARDS);
+ editing = true;
+ break;
+ case CONFIG_WALK_JOINTS:
+ currentAnimation = selectedWalk;
+ animateAvatar(deltaTime, speed, DIRECTION_FORWARDS);
+ editing = true;
+ break;
+ case CONFIG_STANDING:
+ currentAnimation = selectedStand;
+ animateAvatar(deltaTime, speed, DIRECTION_FORWARDS);
+ editing = true;
+ break;
+ case CONFIG_SIDESTEP_LEFT:
+ currentAnimation = selectedSideStepLeft;
+ animateAvatar(deltaTime, speed, DIRECTION_LEFT);
+ editing = true;
+ break;
+ case CONFIG_SIDESTEP_RIGHT:
+ currentAnimation = selectedSideStepRight;
+ animateAvatar(deltaTime, speed, DIRECTION_RIGHT);
+ editing = true;
+ break;
+ case CONFIG_FLYING:
+ currentAnimation = selectedFly;
+ animateAvatar(deltaTime, speed, DIRECTION_FORWARDS);
+ editing = true;
+ break;
+ case CONFIG_FLYING_UP:
+ currentAnimation = selectedFlyUp;
+ animateAvatar(deltaTime, speed, DIRECTION_UP);
+ editing = true;
+ break;
+ case CONFIG_FLYING_DOWN:
+ currentAnimation = selectedFlyDown;
+ animateAvatar(deltaTime, speed, DIRECTION_DOWN);
+ editing = true;
+ break;
+ default:
+ break;
+ }
+
+ // we have to declare these vars here ( outside 'if(!editing)' ), so they are still in scope
+ // when we record the frame's data and when we do the stats update at the end
+ var deltaX = 0;
+ var deltaY = 0;
+ var deltaZ = 0;
+ var acceleration = { x:0, y:0, z:0 };
+ var accelerationJS = MyAvatar.getAcceleration();
+
+ // calculate overriding (local) direction of translation for use later when decide which animation should be played
+ var inverseRotation = Quat.inverse(MyAvatar.orientation);
+ var localVelocity = Vec3.multiplyQbyV(inverseRotation, MyAvatar.getVelocity());
+
+ if(!editing) {
+
+ // the first thing to do is find out how fast we're going,
+ // what our acceleration is and which direction we're principly moving in
+
+ // calcualte (local) change in velocity
+ var velocity = MyAvatar.getVelocity();
+ speed = Vec3.length(velocity);
+
+ // determine the candidate animation to play
+ var actionToTake = 0;
+ if( speed < 0.5) {
+ actionToTake = STANDING;
+ standHints++;
+ }
+ else if( speed < FLYING_SPEED ) {
+ actionToTake = WALKING;
+ walkHints++;
+ }
+ else if( speed >= FLYING_SPEED ) {
+ actionToTake = FLYING;
+ flyHints++;
+ }
+
+ deltaX = localVelocity.x;
+ deltaY = localVelocity.y;
+ deltaZ = -localVelocity.z;
+
+ // determine the principle direction
+ if(Math.abs(deltaX)>Math.abs(deltaY)
+ &&Math.abs(deltaX)>Math.abs(deltaZ)) {
+ if(deltaX<0) {
+ principleDirection = DIRECTION_RIGHT;
+ } else {
+ principleDirection = DIRECTION_LEFT;
+ }
+ }
+ else if(Math.abs(deltaY)>Math.abs(deltaX)
+ &&Math.abs(deltaY)>Math.abs(deltaZ)) {
+ if(deltaY>0) {
+ principleDirection = DIRECTION_UP;
+ }
+ else {
+ principleDirection = DIRECTION_DOWN;
+ }
+ }
+ else if(Math.abs(deltaZ)>Math.abs(deltaX)
+ &&Math.abs(deltaZ)>Math.abs(deltaY)) {
+ if(deltaZ>0) {
+ principleDirection = DIRECTION_FORWARDS;
+ } else {
+ principleDirection = DIRECTION_BACKWARDS;
+ }
+ }
+
+ // NB: this section will change significantly once we are ground plane aware
+ // it will change even more once we have uneven surfaces to deal with
+
+ // maybe at walking speed, but sideways?
+ if( actionToTake === WALKING &&
+ ( principleDirection === DIRECTION_LEFT ||
+ principleDirection === DIRECTION_RIGHT )) {
+
+ actionToTake = SIDE_STEPPING;
+ }
+
+ // maybe at walking speed, but flying up?
+ if( actionToTake === WALKING &&
+ ( principleDirection === DIRECTION_UP )) {
+
+ actionToTake = FLYING;
+ standHints--;
+ flyHints++;
+ }
+
+ // maybe at walking speed, but flying down?
+ if( actionToTake === WALKING &&
+ ( principleDirection === DIRECTION_DOWN )) {
+
+ actionToTake = FLYING;
+ standHints--;
+ flyHints++;
+ }
+
+ // log this frame's motion for later reference
+ var accelerationX = ( framesHistory.recentMotions[0].velocity.x - localVelocity.x ) / deltaTime;
+ var accelerationY = ( localVelocity.y - framesHistory.recentMotions[0].velocity.y ) / deltaTime;
+ var accelerationZ = ( framesHistory.recentMotions[0].velocity.z - localVelocity.z ) / deltaTime;
+ acceleration = {x:accelerationX, y:accelerationY, z:accelerationZ};
+
+
+ // select appropriate animation and initiate Transition if required
+ switch(actionToTake) {
+
+ case STANDING:
+
+ if( standHints > requiredHints || INTERNAL_STATE===STANDING) { // wait for a few consecutive hints (17mS each)
+
+ standHints = 0;
+ walkHints = 0;
+ flyHints = 0;
+
+ // do we need to change state?
+ if( INTERNAL_STATE!==STANDING ) {
+
+ // initiate the transition
+ if(currentTransition) {
+ delete currentTransition;
+ currentTransition = null;
+ }
+
+ switch(currentAnimation) {
+
+ case selectedWalk:
+
+ // Walking to Standing
+ var timeWalking = new Date().getTime() - framesHistory.lastWalkStartTime;
+
+ var bezierCoeffsOne = {x:0.0, y:1.0};
+ var bezierCoeffsTwo = {x:0.0, y:1.0};
+ var transitionTime = 0.4;
+
+ // very different curves for incremental steps
+ if( timeWalking < 550 ) {
+ bezierCoeffsOne = {x:0.63, y:0.17};
+ bezierCoeffsTwo = {x:0.77, y:0.3};
+ transitionTime = 0.75;
+ }
+ currentTransition = new Transition( currentAnimation, selectedStand, [], transitionTime, bezierCoeffsOne, bezierCoeffsTwo );
+ break;
+
+
+ case selectedSideStepLeft:
+ case selectedSideStepRight:
+
+ break;
+
+ default:
+
+ currentTransition = new Transition(currentAnimation, selectedStand, [], 0.3, {x:0.5,y:0.08}, {x:0.28,y:1});
+ break;
+ }
+
+ setInternalState(STANDING);
+ currentAnimation = selectedStand;
+
+ }
+ animateAvatar(1,0,principleDirection);
+ }
+ break;
+
+ case WALKING:
+ case SIDE_STEPPING:
+ if( walkHints > requiredHints ||
+ INTERNAL_STATE===WALKING ||
+ INTERNAL_STATE===SIDE_STEPPING ) { // wait for few consecutive hints (17mS each)
+
+ standHints = 0;
+ walkHints = 0;
+ flyHints = 0;
+
+ if( actionToTake === WALKING && INTERNAL_STATE !== WALKING) {
+
+ // initiate the transition
+ if(currentTransition) {
+ delete currentTransition;
+ currentTransition = null;
+ }
+
+ // set the appropriate start position for the walk wheel
+ if( principleDirection === DIRECTION_BACKWARDS ) {
+
+ walkWheelPosition = selectedWalk.settings.startAngleBackwards;
+
+ } else {
+
+ walkWheelPosition = selectedWalk.settings.startAngleForwards;
+ }
+
+ switch(currentAnimation) {
+
+ case selectedStand:
+
+ // Standing to Walking
+ currentTransition = new Transition(currentAnimation, selectedWalk, [], 0.25, {x:0.5,y:0.08}, {x:0.05,y:0.75});
+ break;
+
+ case selectedSideStepLeft:
+ case selectedSideStepRight:
+
+ break;
+
+ default:
+
+ currentTransition = new Transition(currentAnimation, selectedWalk, [], 0.3, {x:0.5,y:0.08}, {x:0.05,y:0.75});
+ break;
+ }
+ framesHistory.lastWalkStartTime = new Date().getTime();
+ setInternalState(WALKING);
+ currentAnimation = selectedWalk;
+ }
+ else if(actionToTake===SIDE_STEPPING) {
+
+ var selectedSideStep = selectedSideStepRight;
+ if( principleDirection === DIRECTION_LEFT ) {
+
+ selectedSideStep = selectedSideStepLeft;
+
+ } else {
+
+ selectedSideStep = selectedSideStepRight;
+ }
+
+ if( INTERNAL_STATE !== SIDE_STEPPING ) {
+
+ if( principleDirection === DIRECTION_LEFT ) {
+
+ walkWheelPosition = sideStepCycleStartLeft;
+
+ } else {
+
+ walkWheelPosition = sideStepCycleStartRight;
+ }
+ switch(currentAnimation) {
+
+ case selectedStand:
+
+ break;
+
+ default:
+
+ break;
+ }
+ setInternalState(SIDE_STEPPING);
+ }
+
+ currentAnimation = selectedSideStep;
+ }
+ animateAvatar( deltaTime, speed, principleDirection );
+ }
+ break;
+
+ case FLYING:
+
+ if( flyHints > requiredHints - 1 || INTERNAL_STATE===FLYING ) { // wait for a few consecutive hints (17mS each)
+
+ standHints = 0;
+ walkHints = 0;
+ flyHints = 0;
+
+ if(INTERNAL_STATE!==FLYING) setInternalState(FLYING);
+
+ // change animation for flying directly up or down. TODO - check RecentMotions, if is a change then put a transition on it
+ if(principleDirection===DIRECTION_UP) {
+
+ if(currentAnimation !== selectedFlyUp) {
+
+ // initiate a Transition
+ if(currentTransition && currentTransition.nextAnimation!==selectedFlyUp) {
+ delete currentTransition;
+ currentTransition = null;
+ }
+ switch(currentAnimation) {
+
+ case selectedStand:
+
+ currentTransition = new Transition(currentAnimation, selectedFlyUp, [], 0.35, {x:0.5,y:0.08}, {x:0.28,y:1});
+ break;
+
+ case selectedSideStepLeft:
+ case selectedSideStepRight:
+
+ break;
+
+ default:
+
+ currentTransition = new Transition(currentAnimation, selectedFlyUp, [], 0.35, {x:0.5,y:0.08}, {x:0.28,y:1});
+ break;
+ }
+ currentAnimation = selectedFlyUp;
+ }
+
+ } else if(principleDirection==DIRECTION_DOWN) {
+
+ if(currentAnimation !== selectedFlyDown) { // TODO: as the locomotion gets cleaner (i.e. less false reports from Interface) this value can be reduced
+
+ // initiate a Transition
+ if(currentTransition && currentTransition.nextAnimation!==selectedFlyDown) {
+ delete currentTransition;
+ currentTransition = null;
+ }
+ switch(currentAnimation) {
+
+ case selectedStand:
+
+ currentTransition = new Transition(currentAnimation, selectedFlyDown, [], 0.35, {x:0.5,y:0.08}, {x:0.28,y:1});
+ break;
+
+ case selectedSideStepLeft:
+ case selectedSideStepRight:
+
+ break;
+
+ default:
+
+ currentTransition = new Transition(currentAnimation, selectedFlyDown, [], 0.35, {x:0.5,y:0.08}, {x:0.28,y:1});
+ break;
+ }
+ currentAnimation = selectedFlyDown;
+ }
+
+ } else {
+
+ if(currentAnimation !== selectedFly) { // TODO: as the locomotion gets cleaner (i.e. less false reports from Interface) this value can be reduced
+
+ // initiate a Transition
+ if(currentTransition && currentTransition.nextAnimation!==selectedFly) {
+ delete currentTransition;
+ currentTransition = null;
+ }
+ switch(currentAnimation) {
+
+ case selectedStand:
+
+ currentTransition = new Transition(currentAnimation, selectedFly, [], 0.35, {x:0.5,y:0.08}, {x:0.28,y:1});
+ break;
+
+ case selectedSideStepLeft:
+ case selectedSideStepRight:
+
+ break;
+
+ default:
+
+ currentTransition = new Transition(currentAnimation, selectedFly, [], 0.35, {x:0.5,y:0.08}, {x:0.28,y:1});
+ break;
+ }
+ currentAnimation = selectedFly;
+ }
+ }
+ animateAvatar(deltaTime, speed, principleDirection);
+ }
+ break;
+
+ } // end switch(actionToTake)
+
+ } // end if(!editing)
+
+
+ // record the frame's stats for later reference
+ var thisMotion = new RecentMotion(localVelocity, acceleration, principleDirection, INTERNAL_STATE);
+ framesHistory.recentMotions.push(thisMotion);
+ framesHistory.recentMotions.shift();
+
+
+ // before we go, populate the stats overlay
+ if( statsOn ) {
+
+ var cumulativeTimeMS = Math.floor(cumulativeTime*1000);
+ var deltaTimeMS = deltaTime * 1000;
+ var frameExecutionTime = new Date().getTime() - frameStartTime;
+ if(frameExecutionTime>frameExecutionTimeMax) frameExecutionTimeMax = frameExecutionTime;
+
+ var angluarVelocity = Vec3.length(MyAvatar.getAngularVelocity());
+
+ var debugInfo = '\n \n \n \n Stats\n--------------------------------------\n \n \n'
+ + '\nFrame number: '+nFrames
+ + '\nFrame time: '+deltaTimeMS.toFixed(2)
+ + ' mS\nRender time: '+frameExecutionTime.toFixed(0)
+ + ' mS\nLocalised speed: '+speed.toFixed(3)
+ + ' m/s\nCumulative Time '+cumulativeTimeMS.toFixed(0)
+ + ' mS\nState: '+internalStateAsString(INTERNAL_STATE)
+ + ' \nDirection: '+directionAsString(principleDirection)
+ + ' \nAngular Velocity: ' + angluarVelocity.toFixed(3)
+ + ' rad/s';
+ Overlays.editOverlay(debugStats, {text: debugInfo});
+
+ // update these every 250 mS (assuming 60 fps)
+ if( nFrames % 15 === 0 ) {
+ var debugInfo = ' Periodic Stats\n--------------------------------------\n \n \n'
+ + ' \n \nRender time peak hold: '+frameExecutionTimeMax.toFixed(0)
+ + ' mS\n \n \n(L) MyAvatar.getVelocity()'
+ + ' \n \nlocalVelocityX: '+deltaX.toFixed(1)
+ + ' m/s\nlocalVelocityY: '+deltaY.toFixed(1)
+ + ' m/s\nlocalVelocityZ: '+deltaZ.toFixed(1)
+ + ' m/s\n \n(G) MyAvatar.getAcceleration()'
+ + ' \n\nAcceleration X: '+accelerationJS.x.toFixed(1)
+ + ' m/s/s\nAcceleration Y: '+accelerationJS.y.toFixed(1)
+ + ' m/s/s\nAcceleration Z: '+accelerationJS.z.toFixed(1)
+ + ' m/s/s\n \n(L) Acceleration using\nMyAvatar.getVelocity()'
+ + ' \n \nAcceleration X: '+acceleration.x.toFixed(1)
+ + ' m/s/s\nAcceleration Y: '+acceleration.y.toFixed(1)
+ + ' m/s/s\nAcceleration Z: '+acceleration.z.toFixed(1)
+ + ' m/s/s';
+ Overlays.editOverlay(debugStatsPeriodic, {text: debugInfo});
+ frameExecutionTimeMax = 0;
+ }
+ }
+ }
+});
+
+
+// overlays start
+
+// controller dimensions
+var backgroundWidth = 350;
+var backgroundHeight = 700;
+var backgroundX = Window.innerWidth-backgroundWidth-58;
+var backgroundY = Window.innerHeight/2 - backgroundHeight/2;
+var minSliderX = backgroundX + 30;
+var maxSliderX = backgroundX + 295;
+var sliderRangeX = 295 - 30;
+var jointsControlWidth = 200;
+var jointsControlHeight = 300;
+var jointsControlX = backgroundX + backgroundWidth/2 - jointsControlWidth/2;
+var jointsControlY = backgroundY + 242 - jointsControlHeight/2;
+var buttonsY = 20; // distance from top of panel to buttons
+
+// arrays of overlay names
+var sliderThumbOverlays = []; // thumb sliders
+var backgroundOverlays = [];
+var buttonOverlays = [];
+var jointsControlOverlays = [];
+var bigButtonOverlays = [];
+
+
+// load UI backgrounds
+var controlsBackground = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX, y: backgroundY, width: backgroundWidth, height: backgroundHeight },
+ imageURL: pathToOverlays+"ddao-background.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+backgroundOverlays.push(controlsBackground);
+
+var controlsBackgroundWalkEditStyles = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX, y: backgroundY, width: backgroundWidth, height: backgroundHeight },
+ imageURL: pathToOverlays+"ddao-background-edit-styles.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+backgroundOverlays.push(controlsBackgroundWalkEditStyles);
+
+var controlsBackgroundWalkEditTweaks = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX, y: backgroundY, width: backgroundWidth, height: backgroundHeight },
+ imageURL: pathToOverlays+"ddao-background-edit-tweaks.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+backgroundOverlays.push(controlsBackgroundWalkEditTweaks);
+
+var controlsBackgroundWalkEditJoints = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX, y: backgroundY, width: backgroundWidth, height: backgroundHeight },
+ imageURL: pathToOverlays+"ddao-background-edit-joints.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+backgroundOverlays.push(controlsBackgroundWalkEditJoints);
+
+var controlsBackgroundFlyingEdit = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX, y: backgroundY, width: backgroundWidth, height: backgroundHeight },
+ imageURL: pathToOverlays+"ddao-background-flying-edit.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+backgroundOverlays.push(controlsBackgroundFlyingEdit);
+
+// minimised tab - not put in array, as is a one off
+var controlsMinimisedTab = Overlays.addOverlay("image", {
+ x: Window.innerWidth-58, y: Window.innerHeight -145, width: 50, height: 50,
+ //subImage: { x: 0, y: 50, width: 50, height: 50 },
+ imageURL: pathToOverlays + 'ddao-minimise-tab.png',
+ visible: minimised,
+ alpha: 0.9
+ });
+
+// load character joint selection control images
+var hipsJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-hips.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(hipsJointControl);
+
+var upperLegsJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-upper-legs.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(upperLegsJointControl);
+
+var lowerLegsJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-lower-legs.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(lowerLegsJointControl);
+
+var feetJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-feet.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(feetJointControl);
+
+var toesJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-toes.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(toesJointControl);
+
+var spineJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-spine.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(spineJointControl);
+
+var spine1JointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-spine1.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(spine1JointControl);
+
+var spine2JointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-spine2.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(spine2JointControl);
+
+var shouldersJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-shoulders.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(shouldersJointControl);
+
+var upperArmsJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-upper-arms.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(upperArmsJointControl);
+
+var forearmsJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-forearms.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(forearmsJointControl);
+
+var handsJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-hands.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(handsJointControl);
+
+var headJointControl = Overlays.addOverlay("image", {
+ bounds: { x: jointsControlX, y: jointsControlY, width: 200, height: 300},
+ imageURL: pathToOverlays+"ddao-background-edit-head.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+jointsControlOverlays.push(headJointControl);
+
+
+// sider thumb overlays
+var sliderOne = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderOne);
+var sliderTwo = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderTwo);
+var sliderThree = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderThree);
+var sliderFour = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderFour);
+var sliderFive = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderFive);
+var sliderSix = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderSix);
+var sliderSeven = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderSeven);
+var sliderEight = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderEight);
+var sliderNine = Overlays.addOverlay("image", {
+ bounds: { x: 0, y: 0, width: 25, height: 25 },
+ imageURL: pathToOverlays+"ddao-slider-handle.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+sliderThumbOverlays.push(sliderNine);
+
+
+// button overlays
+var onButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+20, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-on-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(onButton);
+var offButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+20, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-off-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(offButton);
+var configWalkButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-walk-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkButton);
+var configWalkButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-walk-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkButtonSelected);
+var configStandButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+146, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-stand-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configStandButton);
+var configStandButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+146, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-stand-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configStandButtonSelected);
+
+var configFlyingButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+209, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-fly-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configFlyingButton);
+var configFlyingButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+209, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-fly-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configFlyingButtonSelected);
+
+var configFlyingUpButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-fly-up-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configFlyingUpButton);
+var configFlyingUpButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-fly-up-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configFlyingUpButtonSelected);
+
+var configFlyingDownButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+146, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-fly-down-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configFlyingDownButton);
+var configFlyingDownButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+146, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-fly-down-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configFlyingDownButtonSelected);
+
+var hideButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+272, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-hide-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(hideButton);
+var hideButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+272, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-hide-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(hideButtonSelected);
+var configWalkStylesButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-walk-styles-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkStylesButton);
+var configWalkStylesButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-walk-styles-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkStylesButtonSelected);
+var configWalkTweaksButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+146, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-walk-tweaks-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkTweaksButton);
+var configWalkTweaksButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+146, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-walk-tweaks-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkTweaksButtonSelected);
+
+var configSideStepLeftButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-sidestep-left-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configSideStepLeftButton);
+var configSideStepLeftButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+83, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-sidestep-left-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configSideStepLeftButtonSelected);
+
+var configSideStepRightButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+209, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-sidestep-right-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configSideStepRightButton);
+var configSideStepRightButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+209, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-edit-sidestep-right-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configSideStepRightButtonSelected);
+
+var configWalkJointsButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+209, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-bones-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkJointsButton);
+var configWalkJointsButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+209, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-bones-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(configWalkJointsButtonSelected);
+
+var backButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+272, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-back-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(backButton);
+var backButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX+272, y: backgroundY+buttonsY, width: 60, height: 47 },
+ imageURL: pathToOverlays+"ddao-back-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+buttonOverlays.push(backButtonSelected);
+
+// big button overlays - front panel
+var bigButtonYOffset = 408; // distance from top of panel to top of first button
+
+var femaleBigButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-female-big-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(femaleBigButton);
+
+var femaleBigButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-female-big-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(femaleBigButtonSelected);
+
+var maleBigButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset + 60, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-male-big-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(maleBigButton);
+
+var maleBigButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset + 60, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-male-big-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(maleBigButtonSelected);
+
+var armsFreeBigButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset + 120, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-arms-free-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(armsFreeBigButton);
+
+var armsFreeBigButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset + 120, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-arms-free-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(armsFreeBigButtonSelected);
+
+var footstepsBigButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset + 180, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-footsteps-big-button.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(footstepsBigButton);
+
+var footstepsBigButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset + 180, width: 230, height: 36},
+ imageURL: pathToOverlays+"ddao-footsteps-big-button-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(footstepsBigButtonSelected);
+
+
+// walk styles
+bigButtonYOffset = 121;
+var strutWalkBigButton = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset, width: 230, height: 36 },
+ imageURL: pathToOverlays+"ddao-walk-select-button-strut.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(strutWalkBigButton);
+
+var strutWalkBigButtonSelected = Overlays.addOverlay("image", {
+ bounds: { x: backgroundX + backgroundWidth/2 - 115, y: backgroundY + bigButtonYOffset, width: 230, height: 36 },
+ imageURL: pathToOverlays+"ddao-walk-select-button-strut-selected.png",
+ color: { red: 255, green: 255, blue: 255},
+ alpha: 1,
+ visible: false
+ });
+bigButtonOverlays.push(strutWalkBigButtonSelected);
+
+// overlays to show the walk wheel stats
+var walkWheelZLine = Overlays.addOverlay("line3d", {
+ position: { x: 0, y: 0, z:hipsToFeetDistance },
+ end: { x: 0, y: 0, z: -hipsToFeetDistance },
+ color: { red: 0, green: 255, blue: 255},
+ alpha: 1,
+ lineWidth: 5,
+ visible: statsOn,
+ anchor: "MyAvatar"
+ });
+var walkWheelYLine = Overlays.addOverlay("line3d", {
+ position: { x: 0, y: hipsToFeetDistance, z:0 },
+ end: { x: 0, y: -hipsToFeetDistance, z:0 },
+ color: { red: 255, green: 0, blue: 255},
+ alpha: 1,
+ lineWidth: 5,
+ visible: statsOn,
+ anchor: "MyAvatar"
+ });
+var debugStats = Overlays.addOverlay("text", {
+ x: backgroundX-199, y: backgroundY,
+ width: 200,
+ height: 180,
+ color: { red: 204, green: 204, blue: 204},
+ topMargin: 10,
+ leftMargin: 15,
+ visible: statsOn,
+ backgroundColor: { red: 34, green: 34, blue: 34},
+ alpha: 1.0,
+ text: "Debug Stats\n\n\nNothing to report yet."
+ });
+var debugStatsPeriodic = Overlays.addOverlay("text", {
+ x: backgroundX-199, y: backgroundY+179,
+ width: 200,
+ height: 392,
+ color: { red: 204, green: 204, blue: 204},
+ topMargin: 5,
+ leftMargin: 15,
+ visible: statsOn,
+ backgroundColor: { red: 34, green: 34, blue: 34},
+ alpha: 1.0,
+ text: "Debug Stats\n\n\nNothing to report yet."
+ });
+var walkWheelStats = Overlays.addOverlay("text", {
+ x: backgroundX-199, y: backgroundY+510,
+ width: 200,
+ height: 190,
+ color: { red: 204, green: 204, blue: 204},
+ topMargin: 5,
+ leftMargin: 15,
+ visible: statsOn,
+ backgroundColor: { red: 34, green: 34, blue: 34},
+ alpha: 1.0,
+ text: "WalkWheel Stats\n\n\nNothing to report yet.\n\n\nPlease start walking\nto see the walkwheel."
+ });
+
+// various show / hide GUI element functions
+function doStandardMenu() {
+ hidebuttonOverlays();
+ hideJointControls();
+ setBackground(controlsBackground);
+ if(powerOn) setButtonOverlayVisible(onButton);
+ else setButtonOverlayVisible(offButton);
+ setButtonOverlayVisible(configWalkButton);
+ setButtonOverlayVisible(configStandButton);
+ setButtonOverlayVisible(configFlyingButton);
+ setButtonOverlayVisible(hideButton);
+ setSliderThumbsVisible(false);
+ showFrontPanelButtons(true);
+ showWalkStyleButtons(false);
+}
+function showFrontPanelButtons(showButtons) {
+
+ if(avatarGender===FEMALE) {
+ Overlays.editOverlay(femaleBigButtonSelected, { visible: showButtons } );
+ Overlays.editOverlay(femaleBigButton, { visible: false } );
+ Overlays.editOverlay(maleBigButtonSelected, { visible: false } );
+ Overlays.editOverlay(maleBigButton, { visible: showButtons } );
+ } else {
+ Overlays.editOverlay(femaleBigButtonSelected, { visible: false } );
+ Overlays.editOverlay(femaleBigButton, { visible: showButtons } );
+ Overlays.editOverlay(maleBigButtonSelected, { visible: showButtons } );
+ Overlays.editOverlay(maleBigButton, { visible: false } );
+ }
+ if(armsFree) {
+ Overlays.editOverlay(armsFreeBigButtonSelected, { visible: showButtons } );
+ Overlays.editOverlay(armsFreeBigButton, { visible: false } );
+ } else {
+ Overlays.editOverlay(armsFreeBigButtonSelected, { visible: false } );
+ Overlays.editOverlay(armsFreeBigButton, { visible: showButtons } );
+ }
+ if(playFootStepSounds) {
+ Overlays.editOverlay(footstepsBigButtonSelected, { visible: showButtons } );
+ Overlays.editOverlay(footstepsBigButton, { visible: false } );
+ } else {
+ Overlays.editOverlay(footstepsBigButtonSelected, { visible: false } );
+ Overlays.editOverlay(footstepsBigButton, { visible: showButtons } );
+ }
+}
+function minimiseDialog() {
+
+ if(minimised) {
+ setBackground();
+ hidebuttonOverlays();
+ setSliderThumbsVisible(false);
+ hideJointControls();
+ showFrontPanelButtons(false);
+ Overlays.editOverlay(controlsMinimisedTab, { visible: true } );
+ } else {
+ setInternalState(STANDING); // show all the controls again
+ Overlays.editOverlay(controlsMinimisedTab, { visible: false } );
+ }
+}
+function setBackground(backgroundName) {
+ for(var i in backgroundOverlays) {
+ if(backgroundOverlays[i] === backgroundName)
+ Overlays.editOverlay(backgroundName, { visible: true } );
+ else Overlays.editOverlay(backgroundOverlays[i], { visible: false } );
+ }
+}
+function setButtonOverlayVisible(buttonOverlayName) {
+ for(var i in buttonOverlays) {
+ if(buttonOverlays[i] === buttonOverlayName) {
+ Overlays.editOverlay(buttonOverlayName, { visible: true } );
+ }
+ }
+}
+// top row menu type buttons (smaller)
+function hidebuttonOverlays() {
+ for(var i in buttonOverlays) {
+ Overlays.editOverlay(buttonOverlays[i], { visible: false } );
+ }
+}
+function hideJointControls() {
+ for(var i in jointsControlOverlays) {
+ Overlays.editOverlay(jointsControlOverlays[i], { visible: false } );
+ }
+}
+function setSliderThumbsVisible(thumbsVisible) {
+ for(var i = 0 ; i < sliderThumbOverlays.length ; i++) {
+ Overlays.editOverlay(sliderThumbOverlays[i], { visible: thumbsVisible } );
+ }
+}
+function initialiseJointsEditingPanel(propertyIndex) {
+
+ selectedJointIndex = propertyIndex;
+
+ // set the image for the selected joint on the character control
+ hideJointControls();
+ switch (selectedJointIndex) {
+ case 0:
+ Overlays.editOverlay(hipsJointControl, { visible: true });
+ break;
+ case 1:
+ Overlays.editOverlay(upperLegsJointControl, { visible: true });
+ break;
+ case 2:
+ Overlays.editOverlay(lowerLegsJointControl, { visible: true });
+ break;
+ case 3:
+ Overlays.editOverlay(feetJointControl, { visible: true });
+ break;
+ case 4:
+ Overlays.editOverlay(toesJointControl, { visible: true });
+ break;
+ case 5:
+ Overlays.editOverlay(spineJointControl, { visible: true });
+ break;
+ case 6:
+ Overlays.editOverlay(spine1JointControl, { visible: true });
+ break;
+ case 7:
+ Overlays.editOverlay(spine2JointControl, { visible: true });
+ break;
+ case 8:
+ Overlays.editOverlay(shouldersJointControl, { visible: true });
+ break;
+ case 9:
+ Overlays.editOverlay(upperArmsJointControl, { visible: true });
+ break;
+ case 10:
+ Overlays.editOverlay(forearmsJointControl, { visible: true });
+ break;
+ case 11:
+ Overlays.editOverlay(handsJointControl, { visible: true });
+ break;
+ case 12:
+ Overlays.editOverlay(headJointControl, { visible: true });
+ break;
+ }
+
+ // set sliders to adjust individual joint properties
+ var i = 0;
+ var yLocation = backgroundY+359;
+
+ // pitch your role
+ var sliderXPos = currentAnimation.joints[selectedJointIndex].pitch
+ / sliderRanges.joints[selectedJointIndex].pitchRange * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+ sliderXPos = currentAnimation.joints[selectedJointIndex].yaw
+ / sliderRanges.joints[selectedJointIndex].yawRange * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+ sliderXPos = currentAnimation.joints[selectedJointIndex].roll
+ / sliderRanges.joints[selectedJointIndex].rollRange * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+
+ // set phases (full range, -180 to 180)
+ sliderXPos = (90 + currentAnimation.joints[selectedJointIndex].pitchPhase/2)/180 * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+ sliderXPos = (90 + currentAnimation.joints[selectedJointIndex].yawPhase/2)/180 * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+ sliderXPos = (90 + currentAnimation.joints[selectedJointIndex].rollPhase/2)/180 * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+
+ // offset ranges are also -ve thr' zero to +ve, so have to offset
+ sliderXPos = (((sliderRanges.joints[selectedJointIndex].pitchOffsetRange+currentAnimation.joints[selectedJointIndex].pitchOffset)/2)
+ /sliderRanges.joints[selectedJointIndex].pitchOffsetRange) * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+ sliderXPos = (((sliderRanges.joints[selectedJointIndex].yawOffsetRange+currentAnimation.joints[selectedJointIndex].yawOffset)/2)
+ /sliderRanges.joints[selectedJointIndex].yawOffsetRange) * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+ sliderXPos = (((sliderRanges.joints[selectedJointIndex].rollOffsetRange+currentAnimation.joints[selectedJointIndex].rollOffset)/2)
+ /sliderRanges.joints[selectedJointIndex].rollOffsetRange) * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=30, visible: true });
+}
+
+function initialiseWalkTweaks() {
+
+ // set sliders to adjust walk properties
+ var i = 0;
+ var yLocation = backgroundY+71;
+
+ var sliderXPos = currentAnimation.settings.baseFrequency / MAX_WALK_SPEED * sliderRangeX; // walk speed
+ Overlays.editOverlay(sliderThumbOverlays[i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = 0 * sliderRangeX; // start flying speed - depricated
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = currentAnimation.joints[0].sway / sliderRanges.joints[0].swayRange * sliderRangeX; // Hips sway
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = currentAnimation.joints[0].bob / sliderRanges.joints[0].bobRange * sliderRangeX; // Hips bob
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = currentAnimation.joints[0].thrust / sliderRanges.joints[0].thrustRange * sliderRangeX; // Hips thrust
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = (((sliderRanges.joints[1].rollOffsetRange+currentAnimation.joints[1].rollOffset)/2) // legs separation - is upper legs roll offset
+ / sliderRanges.joints[1].rollOffsetRange) * sliderRangeX;
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = currentAnimation.joints[1].pitch / sliderRanges.joints[1].pitchRange * sliderRangeX; // stride - is upper legs pitch
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = currentAnimation.joints[9].yaw / sliderRanges.joints[9].yawRange * sliderRangeX; // arms swing - is upper arms yaw
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+ sliderXPos = (((sliderRanges.joints[9].pitchOffsetRange-currentAnimation.joints[9].pitchOffset)/2)
+ / sliderRanges.joints[9].pitchOffsetRange) * sliderRangeX; // arms out - is upper arms pitch offset
+ Overlays.editOverlay(sliderThumbOverlays[++i], { x: minSliderX + sliderXPos, y: yLocation+=60, visible: true });
+}
+
+function showWalkStyleButtons(showButtons) {
+
+ // set all big buttons to hidden, but skip the first 8, as are for the front panel
+ for(var i = 8 ; i < bigButtonOverlays.length ; i++) {
+ Overlays.editOverlay(bigButtonOverlays[i], { visible: false });
+ }
+
+ if(!showButtons) return;
+
+ // set all the non-selected ones to showing
+ for(var i = 8 ; i < bigButtonOverlays.length ; i+=2) {
+ Overlays.editOverlay(bigButtonOverlays[i], { visible: showButtons });
+ }
+
+ // set the currently selected one
+ if(selectedWalk === femaleStrutWalk || selectedWalk === maleStrutWalk) {
+ Overlays.editOverlay(strutWalkBigButtonSelected, { visible: showButtons });
+ Overlays.editOverlay(strutWalkBigButton, {visible: false});
+ }
+}
+
+// mouse event handlers
+var movingSliderOne = false;
+var movingSliderTwo = false;
+var movingSliderThree = false;
+var movingSliderFour = false;
+var movingSliderFive = false;
+var movingSliderSix = false;
+var movingSliderSeven = false;
+var movingSliderEight = false;
+var movingSliderNine = false;
+
+function mousePressEvent(event) {
+
+ var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
+
+ // check for a character joint control click
+ switch (clickedOverlay) {
+
+ case hideButton:
+ Overlays.editOverlay(hideButton, { visible: false } );
+ Overlays.editOverlay(hideButtonSelected, { visible: true } );
+ return;
+
+ case backButton:
+ Overlays.editOverlay(backButton, { visible: false } );
+ Overlays.editOverlay(backButtonSelected, { visible: true } );
+ return;
+
+ case controlsMinimisedTab:
+ // TODO: add visual user feedback for tab click
+ return;
+
+ case footstepsBigButton:
+ playFootStepSounds = true;
+ Overlays.editOverlay(footstepsBigButtonSelected, { visible: true } );
+ Overlays.editOverlay(footstepsBigButton, { visible: false } );
+ return;
+
+ case footstepsBigButtonSelected:
+ playFootStepSounds = false;
+ Overlays.editOverlay(footstepsBigButton, { visible: true } );
+ Overlays.editOverlay(footstepsBigButtonSelected, { visible: false } );
+ return;
+
+ case femaleBigButton:
+ case maleBigButtonSelected:
+ avatarGender = FEMALE;
+ selectedWalk = femaleStrutWalk;
+ selectedStand = femaleStandOne;
+ selectedFlyUp = femaleFlyingUp;
+ selectedFly = femaleFlying;
+ selectedFlyDown = femaleFlyingDown;
+ selectedSideStepLeft = femaleSideStepLeft;
+ selectedSideStepRight = femaleSideStepRight;
+ Overlays.editOverlay(femaleBigButtonSelected, { visible: true } );
+ Overlays.editOverlay(femaleBigButton, { visible: false } );
+ Overlays.editOverlay(maleBigButton, { visible: true } );
+ Overlays.editOverlay(maleBigButtonSelected, { visible: false } );
+ return;
+
+ case armsFreeBigButton:
+ armsFree = true;
+ Overlays.editOverlay(armsFreeBigButtonSelected, { visible: true } );
+ Overlays.editOverlay(armsFreeBigButton, { visible: false } );
+ return;
+
+ case armsFreeBigButtonSelected:
+ armsFree = false;
+ Overlays.editOverlay(armsFreeBigButtonSelected, { visible: false } );
+ Overlays.editOverlay(armsFreeBigButton, { visible: true } );
+ return;
+
+ case maleBigButton:
+ case femaleBigButtonSelected:
+ avatarGender = MALE;
+ selectedWalk = maleStrutWalk;
+ selectedStand = maleStandOne;
+ selectedFlyUp = maleFlyingUp;
+ selectedFly = maleFlying;
+ selectedFlyDown = maleFlyingDown;
+ selectedSideStepLeft = maleSideStepLeft;
+ selectedSideStepRight = maleSideStepRight;
+ Overlays.editOverlay(femaleBigButton, { visible: true } );
+ Overlays.editOverlay(femaleBigButtonSelected, { visible: false } );
+ Overlays.editOverlay(maleBigButtonSelected, { visible: true } );
+ Overlays.editOverlay(maleBigButton, { visible: false } );
+ return;
+
+
+ case strutWalkBigButton:
+ if(avatarGender===FEMALE) selectedWalk = femaleStrutWalk;
+ else selectedWalk = maleStrutWalk;
+ currentAnimation = selectedWalk;
+ showWalkStyleButtons(true);
+ return;
+
+ case strutWalkBigButtonSelected:
+
+ // toggle forwards / backwards walk display
+ if(principleDirection===DIRECTION_FORWARDS) {
+ principleDirection=DIRECTION_BACKWARDS;
+ } else principleDirection=DIRECTION_FORWARDS;
+ return;
+
+ case sliderOne:
+ movingSliderOne = true;
+ return;
+
+ case sliderTwo:
+ movingSliderTwo = true;
+ return;
+
+ case sliderThree:
+ movingSliderThree = true;
+ return;
+
+ case sliderFour:
+ movingSliderFour = true;
+ return;
+
+ case sliderFive:
+ movingSliderFive = true;
+ return;
+
+ case sliderSix:
+ movingSliderSix = true;
+ return;
+
+ case sliderSeven:
+ movingSliderSeven = true;
+ return;
+
+ case sliderEight:
+ movingSliderEight = true;
+ return;
+
+ case sliderNine:
+ movingSliderNine = true;
+ return;
+ }
+
+ if( INTERNAL_STATE===CONFIG_WALK_JOINTS ||
+ INTERNAL_STATE===CONFIG_STANDING ||
+ INTERNAL_STATE===CONFIG_FLYING ||
+ INTERNAL_STATE===CONFIG_FLYING_UP ||
+ INTERNAL_STATE===CONFIG_FLYING_DOWN ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_LEFT ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_RIGHT ) {
+
+ // check for new joint selection and update display accordingly
+ var clickX = event.x - backgroundX - 75;
+ var clickY = event.y - backgroundY - 92;
+
+ if(clickX>60&&clickX<120&&clickY>123&&clickY<155) {
+ initialiseJointsEditingPanel(0);
+ return;
+ }
+ else if(clickX>63&&clickX<132&&clickY>156&&clickY<202) {
+ initialiseJointsEditingPanel(1);
+ return;
+ }
+ else if(clickX>58&&clickX<137&&clickY>203&&clickY<250) {
+ initialiseJointsEditingPanel(2);
+ return;
+ }
+ else if(clickX>58&&clickX<137&&clickY>250&&clickY<265) {
+ initialiseJointsEditingPanel(3);
+ return;
+ }
+ else if(clickX>58&&clickX<137&&clickY>265&&clickY<280) {
+ initialiseJointsEditingPanel(4);
+ return;
+ }
+ else if(clickX>78&&clickX<121&&clickY>111&&clickY<128) {
+ initialiseJointsEditingPanel(5);
+ return;
+ }
+ else if(clickX>78&&clickX<128&&clickY>89&&clickY<111) {
+ initialiseJointsEditingPanel(6);
+ return;
+ }
+ else if(clickX>85&&clickX<118&&clickY>77&&clickY<94) {
+ initialiseJointsEditingPanel(7);
+ return;
+ }
+ else if(clickX>64&&clickX<125&&clickY>55&&clickY<77) {
+ initialiseJointsEditingPanel(8);
+ return;
+ }
+ else if((clickX>44&&clickX<73&&clickY>71&&clickY<94)
+ ||(clickX>125&&clickX<144&&clickY>71&&clickY<94)) {
+ initialiseJointsEditingPanel(9);
+ return;
+ }
+ else if((clickX>28&&clickX<57&&clickY>94&&clickY<119)
+ ||(clickX>137&&clickX<170&&clickY>97&&clickY<114)) {
+ initialiseJointsEditingPanel(10);
+ return;
+ }
+ else if((clickX>18&&clickX<37&&clickY>115&&clickY<136)
+ ||(clickX>157&&clickX<182&&clickY>115&&clickY<136)) {
+ initialiseJointsEditingPanel(11);
+ return;
+ }
+ else if(clickX>81&&clickX<116&&clickY>12&&clickY<53) {
+ initialiseJointsEditingPanel(12);
+ return;
+ }
+ }
+}
+function mouseMoveEvent(event) {
+
+ // only need deal with slider changes
+ if(powerOn) {
+
+ if( INTERNAL_STATE===CONFIG_WALK_JOINTS ||
+ INTERNAL_STATE===CONFIG_STANDING ||
+ INTERNAL_STATE===CONFIG_FLYING ||
+ INTERNAL_STATE===CONFIG_FLYING_UP ||
+ INTERNAL_STATE===CONFIG_FLYING_DOWN ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_LEFT ||
+ INTERNAL_STATE===CONFIG_SIDESTEP_RIGHT ) {
+
+ var thumbClickOffsetX = event.x - minSliderX;
+ var thumbPositionNormalised = thumbClickOffsetX / sliderRangeX;
+ if(thumbPositionNormalised<0) thumbPositionNormalised = 0;
+ if(thumbPositionNormalised>1) thumbPositionNormalised = 1;
+ var sliderX = thumbPositionNormalised * sliderRangeX ; // sets range
+
+ if(movingSliderOne) { // currently selected joint pitch
+ Overlays.editOverlay(sliderOne, { x: sliderX + minSliderX} );
+ currentAnimation.joints[selectedJointIndex].pitch = thumbPositionNormalised * sliderRanges.joints[selectedJointIndex].pitchRange;
+ }
+ else if(movingSliderTwo) { // currently selected joint yaw
+ Overlays.editOverlay(sliderTwo, { x: sliderX + minSliderX} );
+ currentAnimation.joints[selectedJointIndex].yaw = thumbPositionNormalised * sliderRanges.joints[selectedJointIndex].yawRange;
+ }
+ else if(movingSliderThree) { // currently selected joint roll
+ Overlays.editOverlay(sliderThree, { x: sliderX + minSliderX} );
+ currentAnimation.joints[selectedJointIndex].roll = thumbPositionNormalised * sliderRanges.joints[selectedJointIndex].rollRange;
+ }
+ else if(movingSliderFour) { // currently selected joint pitch phase
+ Overlays.editOverlay(sliderFour, { x: sliderX + minSliderX} );
+ var newPhase = 360 * thumbPositionNormalised - 180;
+ currentAnimation.joints[selectedJointIndex].pitchPhase = newPhase;
+ }
+ else if(movingSliderFive) { // currently selected joint yaw phase;
+ Overlays.editOverlay(sliderFive, { x: sliderX + minSliderX} );
+ var newPhase = 360 * thumbPositionNormalised - 180;
+ currentAnimation.joints[selectedJointIndex].yawPhase = newPhase;
+ }
+ else if(movingSliderSix) { // currently selected joint roll phase
+ Overlays.editOverlay(sliderSix, { x: sliderX + minSliderX} );
+ var newPhase = 360 * thumbPositionNormalised - 180;
+ currentAnimation.joints[selectedJointIndex].rollPhase = newPhase;
+ }
+ else if(movingSliderSeven) { // currently selected joint pitch offset
+ Overlays.editOverlay(sliderSeven, { x: sliderX + minSliderX} ); // currently selected joint pitch offset
+ var newOffset = (thumbPositionNormalised-0.5) * 2 * sliderRanges.joints[selectedJointIndex].pitchOffsetRange;
+ currentAnimation.joints[selectedJointIndex].pitchOffset = newOffset;
+ }
+ else if(movingSliderEight) { // currently selected joint yaw offset
+ Overlays.editOverlay(sliderEight, { x: sliderX + minSliderX} ); // currently selected joint yaw offset
+ var newOffset = (thumbPositionNormalised-0.5) * 2 * sliderRanges.joints[selectedJointIndex].yawOffsetRange;
+ currentAnimation.joints[selectedJointIndex].yawOffset = newOffset;
+ }
+ else if(movingSliderNine) { // currently selected joint roll offset
+ Overlays.editOverlay(sliderNine, { x: sliderX + minSliderX} ); // currently selected joint roll offset
+ var newOffset = (thumbPositionNormalised-0.5) * 2 * sliderRanges.joints[selectedJointIndex].rollOffsetRange;
+ currentAnimation.joints[selectedJointIndex].rollOffset = newOffset;
+ }
+ }
+ else if(INTERNAL_STATE===CONFIG_WALK_TWEAKS) {
+
+ var thumbClickOffsetX = event.x - minSliderX;
+ var thumbPositionNormalised = thumbClickOffsetX / sliderRangeX;
+ if(thumbPositionNormalised<0) thumbPositionNormalised = 0;
+ if(thumbPositionNormalised>1) thumbPositionNormalised = 1;
+ var sliderX = thumbPositionNormalised * sliderRangeX ; // sets range
+
+ if(movingSliderOne) { // walk speed
+ paused = true; // avoid nasty jittering
+ Overlays.editOverlay(sliderOne, { x: sliderX + minSliderX} );
+ currentAnimation.settings.baseFrequency = thumbPositionNormalised * MAX_WALK_SPEED;
+ }
+ else if(movingSliderTwo) { // take flight speed
+ Overlays.editOverlay(sliderTwo, { x: sliderX + minSliderX} );
+ //currentAnimation.settings.takeFlightVelocity = thumbPositionNormalised * 300;
+ }
+ else if(movingSliderThree) { // hips sway
+ Overlays.editOverlay(sliderThree, { x: sliderX + minSliderX} );
+ currentAnimation.joints[0].sway = thumbPositionNormalised * sliderRanges.joints[0].swayRange;
+ }
+ else if(movingSliderFour) { // hips bob
+ Overlays.editOverlay(sliderFour, { x: sliderX + minSliderX} );
+ currentAnimation.joints[0].bob = thumbPositionNormalised * sliderRanges.joints[0].bobRange;
+ }
+ else if(movingSliderFive) { // hips thrust
+ Overlays.editOverlay(sliderFive, { x: sliderX + minSliderX} );
+ currentAnimation.joints[0].thrust = thumbPositionNormalised * sliderRanges.joints[0].thrustRange;
+ }
+ else if(movingSliderSix) { // legs separation
+ Overlays.editOverlay(sliderSix, { x: sliderX + minSliderX} );
+ currentAnimation.joints[1].rollOffset = (thumbPositionNormalised-0.5) * 2 * sliderRanges.joints[1].rollOffsetRange;
+ }
+ else if(movingSliderSeven) { // stride
+ Overlays.editOverlay(sliderSeven, { x: sliderX + minSliderX} );
+ currentAnimation.joints[1].pitch = thumbPositionNormalised * sliderRanges.joints[1].pitchRange;
+ }
+ else if(movingSliderEight) { // arms swing = upper arms yaw
+ Overlays.editOverlay(sliderEight, { x: sliderX + minSliderX} );
+ currentAnimation.joints[9].yaw = thumbPositionNormalised * sliderRanges.joints[9].yawRange;
+ }
+ else if(movingSliderNine) { // arms out = upper arms pitch offset
+ Overlays.editOverlay(sliderNine, { x: sliderX + minSliderX} );
+ currentAnimation.joints[9].pitchOffset = (thumbPositionNormalised-0.5) * -2 * sliderRanges.joints[9].pitchOffsetRange;
+ }
+ }
+ }
+}
+function mouseReleaseEvent(event) {
+
+ var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
+
+ if(paused) paused = false;
+
+ if(clickedOverlay === offButton) {
+ powerOn = true;
+ Overlays.editOverlay(offButton, { visible: false } );
+ Overlays.editOverlay(onButton, { visible: true } );
+ stand();
+ }
+ else if(clickedOverlay === hideButton || clickedOverlay === hideButtonSelected){
+ Overlays.editOverlay(hideButton, { visible: true } );
+ Overlays.editOverlay(hideButtonSelected, { visible: false } );
+ minimised = true;
+ minimiseDialog();
+ }
+ else if(clickedOverlay === controlsMinimisedTab) {
+ minimised = false;
+ minimiseDialog();
+ }
+ else if(powerOn) {
+
+ if(movingSliderOne) movingSliderOne = false;
+ else if(movingSliderTwo) movingSliderTwo = false;
+ else if(movingSliderThree) movingSliderThree = false;
+ else if(movingSliderFour) movingSliderFour = false;
+ else if(movingSliderFive) movingSliderFive = false;
+ else if(movingSliderSix) movingSliderSix = false;
+ else if(movingSliderSeven) movingSliderSeven = false;
+ else if(movingSliderEight) movingSliderEight = false;
+ else if(movingSliderNine) movingSliderNine = false;
+ else {
+
+ switch(clickedOverlay) {
+
+ case configWalkButtonSelected:
+ case configStandButtonSelected:
+ case configSideStepLeftButtonSelected:
+ case configSideStepRightButtonSelected:
+ case configFlyingButtonSelected:
+ case configFlyingUpButtonSelected:
+ case configFlyingDownButtonSelected:
+ case configWalkStylesButtonSelected:
+ case configWalkTweaksButtonSelected:
+ case configWalkJointsButtonSelected:
+ setInternalState(STANDING);
+ break;
+
+ case onButton:
+ powerOn = false;
+ setInternalState(STANDING);
+ Overlays.editOverlay(offButton, { visible: true } );
+ Overlays.editOverlay(onButton, { visible: false } );
+ resetJoints();
+ break;
+
+ case backButton:
+ case backButtonSelected:
+ Overlays.editOverlay(backButton, { visible: false } );
+ Overlays.editOverlay(backButtonSelected, { visible: false } );
+ setInternalState(STANDING);
+ break;
+
+ case configWalkStylesButton:
+ setInternalState(CONFIG_WALK_STYLES);
+ break;
+
+ case configWalkTweaksButton:
+ setInternalState(CONFIG_WALK_TWEAKS);
+ break;
+
+ case configWalkJointsButton:
+ setInternalState(CONFIG_WALK_JOINTS);
+ break;
+
+ case configWalkButton:
+ setInternalState(CONFIG_WALK_STYLES); // set the default walk adjustment panel here (i.e. first panel shown when Walk button clicked)
+ break;
+
+ case configStandButton:
+ setInternalState(CONFIG_STANDING);
+ break;
+
+ case configSideStepLeftButton:
+ setInternalState(CONFIG_SIDESTEP_LEFT);
+ break;
+
+ case configSideStepRightButton:
+ setInternalState(CONFIG_SIDESTEP_RIGHT);
+ break;
+
+ case configFlyingButton:
+ setInternalState(CONFIG_FLYING);
+ break;
+
+ case configFlyingUpButton:
+ setInternalState(CONFIG_FLYING_UP);
+ break;
+
+ case configFlyingDownButton:
+ setInternalState(CONFIG_FLYING_DOWN);
+ break;
+ }
+ }
+ }
+}
+Controller.mouseMoveEvent.connect(mouseMoveEvent);
+Controller.mousePressEvent.connect(mousePressEvent);
+Controller.mouseReleaseEvent.connect(mouseReleaseEvent);
+
+// Script ending
+Script.scriptEnding.connect(function() {
+
+ // remove the background overlays
+ for(var i in backgroundOverlays) {
+ Overlays.deleteOverlay(backgroundOverlays[i]);
+ }
+ // remove the button overlays
+ for(var i in buttonOverlays) {
+ Overlays.deleteOverlay(buttonOverlays[i]);
+ }
+ // remove the slider thumb overlays
+ for(var i in sliderThumbOverlays) {
+ Overlays.deleteOverlay(sliderThumbOverlays[i]);
+ }
+ // remove the character joint control overlays
+ for(var i in bigButtonOverlays) {
+ Overlays.deleteOverlay(jointsControlOverlays[i]);
+ }
+ // remove the big button overlays
+ for(var i in bigButtonOverlays) {
+ Overlays.deleteOverlay(bigButtonOverlays[i]);
+ }
+ // remove the mimimised tab
+ Overlays.deleteOverlay(controlsMinimisedTab);
+
+ // remove the walk wheel overlays
+ Overlays.deleteOverlay(walkWheelYLine);
+ Overlays.deleteOverlay(walkWheelZLine);
+ Overlays.deleteOverlay(walkWheelStats);
+
+ // remove the debug stats overlays
+ Overlays.deleteOverlay(debugStats);
+ Overlays.deleteOverlay(debugStatsPeriodic);
+});
+
+var sideStep = 0.002; // i.e. 2mm increments whilst sidestepping - JS movement keys don't work well :-(
+function keyPressEvent(event) {
+
+ if (event.text == "q") {
+ // export currentAnimation as json string when q key is pressed. reformat result at http://www.freeformatter.com/json-formatter.html
+ print('\n');
+ print('walk.js dumping animation: '+currentAnimation.name+'\n');
+ print('\n');
+ print(JSON.stringify(currentAnimation), null, '\t');
+ }
+ else if (event.text == "t") {
+ statsOn = !statsOn;
+ Overlays.editOverlay(debugStats, {visible: statsOn});
+ Overlays.editOverlay(debugStatsPeriodic, {visible: statsOn});
+ Overlays.editOverlay(walkWheelStats, {visible: statsOn});
+ Overlays.editOverlay(walkWheelYLine, {visible: statsOn});
+ Overlays.editOverlay(walkWheelZLine, {visible: statsOn});
+ }
+}
+Controller.keyPressEvent.connect(keyPressEvent);
+
+// get the list of joint names
+var jointList = MyAvatar.getJointNames();
+
+// clear the joint data so can calculate hips to feet distance
+for(var i = 0 ; i < 5 ; i++) {
+ MyAvatar.setJointData(i, Quat.fromPitchYawRollDegrees(0,0,0));
+}
+// used to position the visual representation of the walkwheel only
+var hipsToFeetDistance = MyAvatar.getJointPosition("Hips").y - MyAvatar.getJointPosition("RightFoot").y;
+
+// This script is designed around the Finite State Machine (FSM) model, so to start things up we just select the STANDING state.
+setInternalState(STANDING);
\ No newline at end of file
diff --git a/examples/xbox.js b/examples/xbox.js
deleted file mode 100644
index 603e0dbf56..0000000000
--- a/examples/xbox.js
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// xbox.js
-// examples
-//
-// Created by Stephen Birarda on September 23, 2014
-//
-// Copyright 2014 High Fidelity, Inc.
-//
-// Distributed under the Apache License, Version 2.0.
-// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-gamepad = Joysticks.joystickWithName("Wireless 360 Controller");
-
-function reportAxisValue(axis, newValue, oldValue) {
- print("The value for axis " + axis + " has changed to " + newValue + ". It was " + oldValue);
-}
-
-gamepad.axisValueChanged.connect(reportAxisValue);
\ No newline at end of file
diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index e3db679009..c06bb0fc88 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -102,7 +102,7 @@ void IceServer::processDatagrams() {
if (requestingConnections.size() > 0) {
// send a heartbeart response based on the set of connections
qDebug() << "Sending a heartbeat response to" << senderUUID << "who has" << requestingConnections.size()
- << "potential connections";
+ << "potential connections";
sendHeartbeatResponse(sendingSockAddr, requestingConnections);
}
}
@@ -114,6 +114,7 @@ void IceServer::sendHeartbeatResponse(const HifiSockAddr& destinationSockAddr, Q
QByteArray outgoingPacket(MAX_PACKET_SIZE, 0);
int currentPacketSize = populatePacketHeader(outgoingPacket, PacketTypeIceServerHeartbeatResponse, _id);
+ int numHeaderBytes = currentPacketSize;
// go through the connections, sending packets containing connection information for those nodes
while (peerID != connections.end()) {
@@ -142,9 +143,11 @@ void IceServer::sendHeartbeatResponse(const HifiSockAddr& destinationSockAddr, Q
}
}
- // write the last packet
- _serverSocket.writeDatagram(outgoingPacket.data(), currentPacketSize,
- destinationSockAddr.getAddress(), destinationSockAddr.getPort());
+ if (currentPacketSize > numHeaderBytes) {
+ // write the last packet, if there is data in it
+ _serverSocket.writeDatagram(outgoingPacket.data(), currentPacketSize,
+ destinationSockAddr.getAddress(), destinationSockAddr.getPort());
+ }
}
void IceServer::clearInactivePeers() {
diff --git a/images/bg_hr.png b/images/bg_hr.png
deleted file mode 100644
index 7973bd6988..0000000000
Binary files a/images/bg_hr.png and /dev/null differ
diff --git a/images/blacktocat.png b/images/blacktocat.png
deleted file mode 100644
index 6e264fe57a..0000000000
Binary files a/images/blacktocat.png and /dev/null differ
diff --git a/images/body-bg.png b/images/body-bg.png
deleted file mode 100644
index d0618fe749..0000000000
Binary files a/images/body-bg.png and /dev/null differ
diff --git a/images/highlight-bg.jpg b/images/highlight-bg.jpg
deleted file mode 100644
index 4c4a78effb..0000000000
Binary files a/images/highlight-bg.jpg and /dev/null differ
diff --git a/images/hr.png b/images/hr.png
deleted file mode 100644
index 6c723a5602..0000000000
Binary files a/images/hr.png and /dev/null differ
diff --git a/images/icon_download.png b/images/icon_download.png
deleted file mode 100644
index a2a287f642..0000000000
Binary files a/images/icon_download.png and /dev/null differ
diff --git a/images/octocat-icon.png b/images/octocat-icon.png
deleted file mode 100644
index f0ba137d26..0000000000
Binary files a/images/octocat-icon.png and /dev/null differ
diff --git a/images/sprite_download.png b/images/sprite_download.png
deleted file mode 100644
index f2babd575d..0000000000
Binary files a/images/sprite_download.png and /dev/null differ
diff --git a/images/tar-gz-icon.png b/images/tar-gz-icon.png
deleted file mode 100644
index d50f34f6de..0000000000
Binary files a/images/tar-gz-icon.png and /dev/null differ
diff --git a/images/zip-icon.png b/images/zip-icon.png
deleted file mode 100644
index 162c425b43..0000000000
Binary files a/images/zip-icon.png and /dev/null differ
diff --git a/index.html b/index.html
deleted file mode 100644
index 992030cad3..0000000000
--- a/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
- Hifi by highfidelity
-
-
-
-
-
-
-
-
-
- Hifi
- Open, decentralized virtual worlds using sensors to control avatars and dynamically assigned devices as servers. San Francisco based startup, we are hiring: http://highfidelity.io/jobs You can also contribute by doing jobs listed at http://worklist.net -
-
- View the Project on GitHub highfidelity/hifi
-
-
-
-
-
-
-Avatar Documentation
-
-
-
-
-