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

Fixing compile warnings

Browse source
This commit is contained in:
Brad Davis 2018-01-30 21:54:29 -08:00
parent 87a41ef176
commit 3e3a585b92
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -64,8 +64,6 @@ static const QUrl HMD_PREVIEW_FRAME_URL("resource://hmdPreviewFrame");
static const float SKYBOX_LOAD_PRIORITY { 10.0f }; // Make sure skybox loads first
static const float HIGH_MIPS_LOAD_PRIORITY { 9.0f }; // Make sure high mips loads after skybox but before models
#pragma optimize("", off)
TextureCache::TextureCache() {
_ktxCache->initialize();
#if defined(DISABLE_KTX_CACHE)

12
tools/ktx-tool/src/main.cpp
View file

@ -7,12 +7,6 @@
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <gli/gli.hpp>
#include <gli/convert.hpp>
#include <gli/generate_mipmaps.hpp>
#include <gli/load.hpp>
#include <gli/save.hpp>
#include <QtGlobal>
#include <QtCore/QTime>
#include <QtCore/QTimer>
@ -56,16 +50,12 @@ void stripKtxKeyValues(const std::string& sourceFile, const std::string& destFil
auto newStorageSize = ktx::KTX::evalStorageSize(ktx->_header, ktx->_images);
storage::FileStorage::create(destFile.c_str(), newStorageSize, nullptr);
storage::FileStorage destStorage(destFile.c_str());
auto writtenSize = ktx::KTX::write(destStorage.mutableData(), newStorageSize, ktx->_header, ktx->_images);
ktx::KTX::write(destStorage.mutableData(), newStorageSize, ktx->_header, ktx->_images);
}
const QDir SOURCE_FOLDER{ PathUtils::projectRootPath() + "/interface/resources/meshes/mannequin" };
const QDir DEST_FOLDER{ PathUtils::projectRootPath() + "/interface/resources/meshes/mannequin/+gles" };
const gli::gl GL(gli::gl::PROFILE_GL33);
void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {