Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 11:29:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more removal

Browse source
This commit is contained in:
Howard Stearns 2018-11-13 11:05:45 -08:00
parent ad7266062d
commit 938b45d3da
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/fbx/src/OBJReader.cpp
View file

@ -845,7 +845,7 @@ HFMModel::Pointer OBJReader::readOBJ(QByteArray& data, const QVariantHash& mappi
preDefinedMaterial.diffuseColor = glm::vec3(1.0f); preDefinedMaterial.diffuseColor = glm::vec3(1.0f);
QVector<QByteArray> extensions = { "jpg", "jpeg", "png", "tga" }; QVector<QByteArray> extensions = { "jpg", "jpeg", "png", "tga" };
QByteArray base = basename.toUtf8(), textName = ""; QByteArray base = basename.toUtf8(), textName = "";
qCDebug(modelformat) << "OBJ Reader looking for default texture of" << url; qCDebug(modelformat) << "OBJ Reader looking for default texture";
for (int i = 0; i < extensions.count(); i++) { for (int i = 0; i < extensions.count(); i++) {
QByteArray candidateString = base + extensions[i]; QByteArray candidateString = base + extensions[i];
if (isValidTexture(candidateString)) { if (isValidTexture(candidateString)) {
@ -866,7 +866,7 @@ HFMModel::Pointer OBJReader::readOBJ(QByteArray& data, const QVariantHash& mappi
foreach (QString libraryName, librariesSeen.keys()) { foreach (QString libraryName, librariesSeen.keys()) {
// Throw away any path part of libraryName, and merge against original url. // Throw away any path part of libraryName, and merge against original url.
QUrl libraryUrl = _url.resolved(QUrl(libraryName).fileName()); QUrl libraryUrl = _url.resolved(QUrl(libraryName).fileName());
qCDebug(modelformat) << "OBJ Reader material library" << libraryName << "used in" << _url; qCDebug(modelformat) << "OBJ Reader material library" << libraryName;
bool success; bool success;
QByteArray data; QByteArray data;
std::tie<bool, QByteArray>(success, data) = requestData(libraryUrl); std::tie<bool, QByteArray>(success, data) = requestData(libraryUrl);

4
libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
View file

@ -69,12 +69,12 @@ GLTexture* GL41Backend::syncGPUObject(const TexturePointer& texturePointer) {
break; break;
case TextureUsageType::STRICT_RESOURCE: case TextureUsageType::STRICT_RESOURCE:
qCDebug(gpugllogging) << "Strict texture " << texture.source().c_str(); qCDebug(gpugllogging) << "Strict texture";
object = new GL41StrictResourceTexture(shared_from_this(), texture); object = new GL41StrictResourceTexture(shared_from_this(), texture);
break; break;
case TextureUsageType::RESOURCE: case TextureUsageType::RESOURCE:
qCDebug(gpugllogging) << "variable / Strict texture " << texture.source().c_str(); qCDebug(gpugllogging) << "variable / Strict texture";
object = new GL41ResourceTexture(shared_from_this(), texture); object = new GL41ResourceTexture(shared_from_this(), texture);
_textureManagement._transferEngine->addMemoryManagedTexture(texturePointer); _textureManagement._transferEngine->addMemoryManagedTexture(texturePointer);
break; break;