Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into integratedStepping

Browse source
This commit is contained in:
amantley 2018-07-03 11:47:09 -07:00
commit 59dfe80940
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/src/DomainGatekeeper.cpp
View file

@ -412,7 +412,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
} else if (verifyUserSignature(username, usernameSignature, nodeConnection.senderSockAddr)) { } else if (verifyUserSignature(username, usernameSignature, nodeConnection.senderSockAddr)) {
// they sent us a username and the signature verifies it // they sent us a username and the signature verifies it
getGroupMemberships(username); getGroupMemberships(username);
verifiedUsername = username; verifiedUsername = username.toLower();
} else { } else {
// they sent us a username, but it didn't check out // they sent us a username, but it didn't check out
requestUserPublicKey(username); requestUserPublicKey(username);
@ -993,7 +993,7 @@ void DomainGatekeeper::getDomainOwnerFriendsListJSONCallback(QNetworkReply* requ
_domainOwnerFriends.clear(); _domainOwnerFriends.clear();
QJsonArray friends = jsonObject["data"].toObject()["friends"].toArray(); QJsonArray friends = jsonObject["data"].toObject()["friends"].toArray();
for (int i = 0; i < friends.size(); i++) { for (int i = 0; i < friends.size(); i++) {
_domainOwnerFriends += friends.at(i).toString(); _domainOwnerFriends += friends.at(i).toString().toLower();
} }
} else { } else {
qDebug() << "getDomainOwnerFriendsList api call returned:" << QJsonDocument(jsonObject).toJson(QJsonDocument::Compact); qDebug() << "getDomainOwnerFriendsList api call returned:" << QJsonDocument(jsonObject).toJson(QJsonDocument::Compact);

2
interface/src/Application.cpp
View file

@ -2722,7 +2722,7 @@ void Application::initializeDisplayPlugins() {
setDisplayPlugin(defaultDisplayPlugin); setDisplayPlugin(defaultDisplayPlugin);
// Now set the desired plugin if it's not the same as the default plugin // Now set the desired plugin if it's not the same as the default plugin
if (!targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) { if (targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) {
setDisplayPlugin(targetDisplayPlugin); setDisplayPlugin(targetDisplayPlugin);
} }

2
interface/src/avatar/MyAvatar.cpp
View file

@ -3526,7 +3526,7 @@ void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat
if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { if (!isActive(Rotation) && (shouldActivateRotation(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {
activate(Rotation); activate(Rotation);
} }
if (!isActive(Horizontal) && shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix)) { if (!isActive(Horizontal) && (shouldActivateHorizontal(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {
activate(Horizontal); activate(Horizontal);
} }
if (!isActive(Vertical) && (shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) { if (!isActive(Vertical) && (shouldActivateVertical(myAvatar, desiredBodyMatrix, currentBodyMatrix) || hasDriveInput)) {

2
interface/src/avatar/MySkeletonModel.cpp
View file

@ -46,7 +46,7 @@ static AnimPose computeHipsInSensorFrame(MyAvatar* myAvatar, bool isFlying) {
} }
glm::mat4 hipsMat; glm::mat4 hipsMat;
if (myAvatar->getCenterOfGravityModelEnabled()) { if (myAvatar->getCenterOfGravityModelEnabled() && !isFlying) {
// then we use center of gravity model // then we use center of gravity model
hipsMat = myAvatar->deriveBodyUsingCgModel(); hipsMat = myAvatar->deriveBodyUsingCgModel();
} else { } else {

2
libraries/render-utils/src/RenderCommonTask.cpp
View file

@ -60,7 +60,7 @@ void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs&
if (_opaquePass) { if (_opaquePass) {
gpu::doInBatch("DrawOverlay3D::run::clear", args->_context, [&](gpu::Batch& batch){ gpu::doInBatch("DrawOverlay3D::run::clear", args->_context, [&](gpu::Batch& batch){
batch.enableStereo(false); batch.enableStereo(false);
batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTHSTENCIL, glm::vec4(), 1.f, 0, false); batch.clearFramebuffer(gpu::Framebuffer::BUFFER_DEPTH, glm::vec4(), 1.f, 0, false);
}); });
} }

1
scripts/system/controllers/handTouch.js
View file

@ -605,7 +605,6 @@
var finger = fingerKeys[i]; var finger = fingerKeys[i];
var LOOKUP_DISTANCE_MULTIPLIER = 1.5; var LOOKUP_DISTANCE_MULTIPLIER = 1.5;
var dist = LOOKUP_DISTANCE_MULTIPLIER*data.distance; var dist = LOOKUP_DISTANCE_MULTIPLIER*data.distance;
console.log("distance: " + dist);
var checkOffset = { var checkOffset = {
x: data.perpendicular.x * dist, x: data.perpendicular.x * dist,
y: data.perpendicular.y * dist, y: data.perpendicular.y * dist,

16
scripts/system/html/js/SnapshotReview.js
View file

@ -668,6 +668,7 @@ window.onload = function () {
addImage(element, messageOptions.isLoggedIn, idx === 0 && messageOptions.canShare, idx === 1, false, false, false, true); addImage(element, messageOptions.isLoggedIn, idx === 0 && messageOptions.canShare, idx === 1, false, false, false, true);
}); });
document.getElementById("p1").classList.add("processingGif"); document.getElementById("p1").classList.add("processingGif");
document.getElementById("snap-button").disabled = true;
} else { } else {
var gifPath = message.image_data[0].localPath, var gifPath = message.image_data[0].localPath,
p1img = document.getElementById('p1img'); p1img = document.getElementById('p1img');
@ -677,14 +678,15 @@ window.onload = function () {
shareForUrl("p1"); shareForUrl("p1");
appendShareBar("p1", messageOptions.isLoggedIn, messageOptions.canShare, true, false, false, messageOptions.canBlast); appendShareBar("p1", messageOptions.isLoggedIn, messageOptions.canShare, true, false, false, messageOptions.canBlast);
document.getElementById("p1").classList.remove("processingGif"); document.getElementById("p1").classList.remove("processingGif");
document.getElementById("snap-button").disabled = false;
} }
} else { } else {
imageCount = message.image_data.length; imageCount = message.image_data.length;
message.image_data.forEach(function (element) { message.image_data.forEach(function (element) {
addImage(element, messageOptions.isLoggedIn, messageOptions.canShare, false, false, false, false, true); addImage(element, messageOptions.isLoggedIn, messageOptions.canShare, false, false, false, false, true);
}); });
document.getElementById("snap-button").disabled = false;
} }
document.getElementById("snap-button").disabled = false;
break; break;
case 'captureSettings': case 'captureSettings':
handleCaptureSetting(message.setting); handleCaptureSetting(message.setting);
@ -701,7 +703,7 @@ window.onload = function () {
case 'snapshotUploadComplete': case 'snapshotUploadComplete':
var isGif = fileExtensionMatches(message.image_url, "gif"); var isGif = fileExtensionMatches(message.image_url, "gif");
updateShareInfo(isGif ? "p1" : "p0", message.story_id); updateShareInfo(isGif ? "p1" : "p0", message.story_id);
if (isPrintProcessing()) { if (isPrintProcessing()) {
setPrintButtonEnabled(); setPrintButtonEnabled();
} }
break; break;
@ -724,11 +726,11 @@ function snapshotSettings() {
})); }));
} }
function takeSnapshot() { function takeSnapshot() {
document.getElementById("snap-button").disabled = true;
EventBridge.emitWebEvent(JSON.stringify({ EventBridge.emitWebEvent(JSON.stringify({
type: "snapshot", type: "snapshot",
action: "takeSnapshot" action: "takeSnapshot"
})); }));
document.getElementById("snap-button").disabled = true;
} }
function isPrintDisabled() { function isPrintDisabled() {
@ -739,14 +741,14 @@ function isPrintDisabled() {
document.getElementById('print-button').disabled; document.getElementById('print-button').disabled;
} }
function isPrintProcessing() { function isPrintProcessing() {
var printElement = document.getElementById('print-icon'); var printElement = document.getElementById('print-icon');
return printElement.classList.contains("print-icon") && return printElement.classList.contains("print-icon") &&
printElement.classList.contains("print-icon-loading") && printElement.classList.contains("print-icon-loading") &&
document.getElementById('print-button').disabled; document.getElementById('print-button').disabled;
} }
function isPrintEnabled() { function isPrintEnabled() {
var printElement = document.getElementById('print-icon'); var printElement = document.getElementById('print-icon');
return printElement.classList.contains("print-icon") && return printElement.classList.contains("print-icon") &&
printElement.classList.contains("print-icon-default") && printElement.classList.contains("print-icon-default") &&
@ -773,8 +775,8 @@ function requestPrintButtonUpdate() {
})); }));
} }
function printToPolaroid() { function printToPolaroid() {
if (isPrintEnabled()) { if (isPrintEnabled()) {
EventBridge.emitWebEvent(JSON.stringify({ EventBridge.emitWebEvent(JSON.stringify({
type: "snapshot", type: "snapshot",
action: "printToPolaroid" action: "printToPolaroid"