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

Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests

Browse source
This commit is contained in:
NissimHadar 2018-09-22 11:24:20 -07:00
commit 6e538319b2
8 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/avatars/src/AvatarData.cpp
View file

@ -2829,8 +2829,10 @@ void RayToAvatarIntersectionResultFromScriptValue(const QScriptValue& object, Ra
value.extraInfo = object.property("extraInfo").toVariant().toMap(); value.extraInfo = object.property("extraInfo").toVariant().toMap();
} }
// these coefficients can be changed via JS for experimental tuning
// use AvatatManager.setAvatarSortCoefficient("name", value) by a user with domain kick-rights
float AvatarData::_avatarSortCoefficientSize { 8.0f }; float AvatarData::_avatarSortCoefficientSize { 8.0f };
float AvatarData::_avatarSortCoefficientCenter { 4.0f }; float AvatarData::_avatarSortCoefficientCenter { 0.25f };
float AvatarData::_avatarSortCoefficientAge { 1.0f }; float AvatarData::_avatarSortCoefficientAge { 1.0f };
QScriptValue AvatarEntityMapToScriptValue(QScriptEngine* engine, const AvatarEntityMap& value) { QScriptValue AvatarEntityMapToScriptValue(QScriptEngine* engine, const AvatarEntityMap& value) {

2
libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
View file

@ -57,7 +57,7 @@ void GL41Backend::postLinkProgram(ShaderObject& programObject, const Shader& pro
const auto resourceBufferUniforms = ::gl::Uniform::loadByName(glprogram, program.getResourceBuffers().getNames()); const auto resourceBufferUniforms = ::gl::Uniform::loadByName(glprogram, program.getResourceBuffers().getNames());
for (const auto& resourceBuffer : resourceBufferUniforms) { for (const auto& resourceBuffer : resourceBufferUniforms) {
const auto& targetBinding = expectedResourceBuffers.at(resourceBuffer.name); const auto& targetBinding = expectedResourceBuffers.at(resourceBuffer.name);
glProgramUniform1i(glprogram, resourceBuffer.binding, targetBinding); glProgramUniform1i(glprogram, resourceBuffer.binding, targetBinding + GL41Backend::RESOURCE_BUFFER_SLOT0_TEX_UNIT);
} }
} }

7
libraries/networking/src/AccountManager.cpp
View file

@ -538,7 +538,6 @@ void AccountManager::requestAccessToken(const QString& login, const QString& pas
QNetworkReply* requestReply = networkAccessManager.post(request, postData); QNetworkReply* requestReply = networkAccessManager.post(request, postData);
connect(requestReply, &QNetworkReply::finished, this, &AccountManager::requestAccessTokenFinished); connect(requestReply, &QNetworkReply::finished, this, &AccountManager::requestAccessTokenFinished);
connect(requestReply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(requestAccessTokenError(QNetworkReply::NetworkError)));
} }
void AccountManager::requestAccessTokenWithSteam(QByteArray authSessionTicket) { void AccountManager::requestAccessTokenWithSteam(QByteArray authSessionTicket) {
@ -633,12 +632,6 @@ void AccountManager::requestAccessTokenFinished() {
} }
} }
void AccountManager::requestAccessTokenError(QNetworkReply::NetworkError error) {
// TODO: error handling
qCDebug(networking) << "AccountManager: failed to fetch access token - " << error;
emit loginFailed();
}
void AccountManager::refreshAccessTokenFinished() { void AccountManager::refreshAccessTokenFinished() {
QNetworkReply* requestReply = reinterpret_cast<QNetworkReply*>(sender()); QNetworkReply* requestReply = reinterpret_cast<QNetworkReply*>(sender());

1
libraries/networking/src/AccountManager.h
View file

@ -106,7 +106,6 @@ public slots:
void requestAccessTokenFinished(); void requestAccessTokenFinished();
void refreshAccessTokenFinished(); void refreshAccessTokenFinished();
void requestProfileFinished(); void requestProfileFinished();
void requestAccessTokenError(QNetworkReply::NetworkError error);
void refreshAccessTokenError(QNetworkReply::NetworkError error); void refreshAccessTokenError(QNetworkReply::NetworkError error);
void requestProfileError(QNetworkReply::NetworkError error); void requestProfileError(QNetworkReply::NetworkError error);
void logout(); void logout();

2
libraries/render-utils/src/Highlight.slh
View file

@ -15,7 +15,7 @@
<@include Highlight_shared.slh@> <@include Highlight_shared.slh@>
layout(binding=RENDER_UTILS_BUFFER_HIGHLIGHT_PARAMS) uniform highlightParamsBuffer { layout(std140, binding=RENDER_UTILS_BUFFER_HIGHLIGHT_PARAMS) uniform highlightParamsBuffer {
HighlightParameters params; HighlightParameters params;
}; };

2
libraries/render-utils/src/Highlight_aabox.slv
View file

@ -45,7 +45,7 @@ struct HighlightParameters {
vec2 outlineWidth; vec2 outlineWidth;
}; };
layout(binding=0) uniform parametersBuffer { layout(std140, binding=0) uniform parametersBuffer {
HighlightParameters _parameters; HighlightParameters _parameters;
}; };

41
scripts/system/html/js/entityList.js
View file

@ -27,8 +27,11 @@ const COMPARE_ASCENDING = function(a, b) {
return -1; return -1;
} else if (va > vb) { } else if (va > vb) {
return 1; return 1;
} else if (a.id < b.id) {
return -1;
} }
return 0;
return 1;
} }
const COMPARE_DESCENDING = function(a, b) { const COMPARE_DESCENDING = function(a, b) {
return COMPARE_ASCENDING(b, a); return COMPARE_ASCENDING(b, a);
@ -223,15 +226,15 @@ function loaded() {
type: type, type: type,
url: filename, url: filename,
fullUrl: entity.url, fullUrl: entity.url,
locked: entity.locked ? LOCKED_GLYPH : null, locked: entity.locked,
visible: entity.visible ? VISIBLE_GLYPH : null, visible: entity.visible,
verticesCount: displayIfNonZero(entity.verticesCount), verticesCount: entity.verticesCount,
texturesCount: displayIfNonZero(entity.texturesCount), texturesCount: entity.texturesCount,
texturesSize: decimalMegabytes(entity.texturesSize), texturesSize: entity.texturesSize,
hasTransparent: entity.hasTransparent ? TRANSPARENCY_GLYPH : null, hasTransparent: entity.hasTransparent,
isBaked: entity.isBaked ? BAKED_GLYPH : null, isBaked: entity.isBaked,
drawCalls: displayIfNonZero(entity.drawCalls), drawCalls: entity.drawCalls,
hasScript: entity.hasScript ? SCRIPT_GLYPH : null, hasScript: entity.hasScript,
} }
entities.push(entityData); entities.push(entityData);
@ -259,15 +262,15 @@ function loaded() {
addColumn('type', entity.type); addColumn('type', entity.type);
addColumn('name', entity.name); addColumn('name', entity.name);
addColumn('url', entity.url); addColumn('url', entity.url);
addColumnHTML('locked glyph', entity.locked); addColumnHTML('locked glyph', entity.locked ? LOCKED_GLYPH : null);
addColumnHTML('visible glyph', entity.visible); addColumnHTML('visible glyph', entity.visible ? VISIBLE_GLYPH : null);
addColumn('verticesCount', entity.verticesCount); addColumn('verticesCount', displayIfNonZero(entity.verticesCount));
addColumn('texturesCount', entity.texturesCount); addColumn('texturesCount', displayIfNonZero(entity.texturesCount));
addColumn('texturesSize', entity.texturesSize); addColumn('texturesSize', decimalMegabytes(entity.texturesSize));
addColumnHTML('hasTransparent glyph', entity.hasTransparent); addColumnHTML('hasTransparent glyph', entity.hasTransparent ? TRANSPARENCY_GLYPH : null);
addColumnHTML('isBaked glyph', entity.isBaked); addColumnHTML('isBaked glyph', entity.isBaked ? BAKED_GLYPH : null);
addColumn('drawCalls', entity.drawCalls); addColumn('drawCalls', displayIfNonZero(entity.drawCalls));
addColumn('hasScript glyph', entity.hasScript); addColumn('hasScript glyph', entity.hasScript ? SCRIPT_GLYPH : null);
row.addEventListener('click', onRowClicked); row.addEventListener('click', onRowClicked);
row.addEventListener('dblclick', onRowDoubleClicked); row.addEventListener('dblclick', onRowDoubleClicked);

1
scripts/system/interstitialPage.js
View file

@ -140,7 +140,6 @@
localPosition: { x: 0.0 , y: -1.5, z: -0.3 }, localPosition: { x: 0.0 , y: -1.5, z: -0.3 },
url: Script.resourcesPath() + "images/interstitialPage/goTo_button.png", url: Script.resourcesPath() + "images/interstitialPage/goTo_button.png",
alpha: 1, alpha: 1,
dimensions: { x: 1.5, y: 1.0 },
visible: isVisible, visible: isVisible,
emissive: true, emissive: true,
ignoreRayIntersection: false, ignoreRayIntersection: false,