From 0b4a8d05aace6762ffd24ca6eef4b469d9a920f1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 26 Apr 2017 11:07:29 -0700 Subject: [PATCH] fix references to moved texture type enum --- libraries/image/src/image/Image.h | 3 ++- tools/oven/src/DomainBaker.cpp | 2 +- tools/oven/src/FBXBaker.cpp | 8 ++++---- tools/oven/src/FBXBaker.h | 2 +- tools/oven/src/TextureBaker.cpp | 2 +- tools/oven/src/TextureBaker.h | 6 +++--- tools/oven/src/ui/SkyboxBakeWidget.cpp | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libraries/image/src/image/Image.h b/libraries/image/src/image/Image.h index 3e5aa868d2..fd214daa2c 100644 --- a/libraries/image/src/image/Image.h +++ b/libraries/image/src/image/Image.h @@ -37,7 +37,8 @@ enum Type { CUBE_TEXTURE, OCCLUSION_TEXTURE, SCATTERING_TEXTURE = OCCLUSION_TEXTURE, - LIGHTMAP_TEXTURE + LIGHTMAP_TEXTURE, + UNUSED_TEXTURE }; using TextureLoader = std::function; diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp index 07df9870aa..b93e852daa 100644 --- a/tools/oven/src/DomainBaker.cpp +++ b/tools/oven/src/DomainBaker.cpp @@ -239,7 +239,7 @@ void DomainBaker::bakeSkybox(QUrl skyboxURL, QJsonValueRef entity) { // setup a baker for this skybox QSharedPointer skyboxBaker { - new TextureBaker(skyboxURL, gpu::CUBE_TEXTURE, _contentOutputPath), + new TextureBaker(skyboxURL, image::TextureUsage::CUBE_TEXTURE, _contentOutputPath), &TextureBaker::deleteLater }; diff --git a/tools/oven/src/FBXBaker.cpp b/tools/oven/src/FBXBaker.cpp index c185488760..26aea7a596 100644 --- a/tools/oven/src/FBXBaker.cpp +++ b/tools/oven/src/FBXBaker.cpp @@ -277,8 +277,8 @@ QUrl FBXBaker::getTextureURL(const QFileInfo& textureFileInfo, FbxFileTexture* f return urlToTexture; } -gpu::TextureType textureTypeForMaterialProperty(FbxProperty& property, FbxSurfaceMaterial* material) { - using namespace gpu; +image::TextureUsage::Type textureTypeForMaterialProperty(FbxProperty& property, FbxSurfaceMaterial* material) { + using namespace image::TextureUsage; // this is a property we know has a texture, we need to match it to a High Fidelity known texture type // since that information is passed to the baking process @@ -347,7 +347,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() { // figure out the type of texture from the material property auto textureType = textureTypeForMaterialProperty(property, material); - if (textureType != gpu::UNUSED_TEXTURE) { + if (textureType != image::TextureUsage::UNUSED_TEXTURE) { int numTextures = property.GetSrcObjectCount(); for (int j = 0; j < numTextures; j++) { @@ -393,7 +393,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() { } } -void FBXBaker::bakeTexture(const QUrl& textureURL, gpu::TextureType textureType, const QDir& outputDir) { +void FBXBaker::bakeTexture(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDir) { // start a bake for this texture and add it to our list to keep track of QSharedPointer bakingTexture { new TextureBaker(textureURL, textureType, outputDir), diff --git a/tools/oven/src/FBXBaker.h b/tools/oven/src/FBXBaker.h index 7532d587b6..bcfebbe2a8 100644 --- a/tools/oven/src/FBXBaker.h +++ b/tools/oven/src/FBXBaker.h @@ -74,7 +74,7 @@ private: QString createBakedTextureFileName(const QFileInfo& textureFileInfo); QUrl getTextureURL(const QFileInfo& textureFileInfo, fbxsdk::FbxFileTexture* fileTexture); - void bakeTexture(const QUrl& textureURL, gpu::TextureType textureType, const QDir& outputDir); + void bakeTexture(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDir); QString pathToCopyOfOriginal() const; diff --git a/tools/oven/src/TextureBaker.cpp b/tools/oven/src/TextureBaker.cpp index 02bedeb659..70df511d2c 100644 --- a/tools/oven/src/TextureBaker.cpp +++ b/tools/oven/src/TextureBaker.cpp @@ -25,7 +25,7 @@ const QString BAKED_TEXTURE_EXT = ".ktx"; -TextureBaker::TextureBaker(const QUrl& textureURL, gpu::TextureType textureType, const QDir& outputDirectory) : +TextureBaker::TextureBaker(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDirectory) : _textureURL(textureURL), _textureType(textureType), _outputDirectory(outputDirectory) diff --git a/tools/oven/src/TextureBaker.h b/tools/oven/src/TextureBaker.h index 2bc4ffc607..ee1e968f20 100644 --- a/tools/oven/src/TextureBaker.h +++ b/tools/oven/src/TextureBaker.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include "Baker.h" @@ -26,7 +26,7 @@ class TextureBaker : public Baker { Q_OBJECT public: - TextureBaker(const QUrl& textureURL, gpu::TextureType textureType, const QDir& outputDirectory); + TextureBaker(const QUrl& textureURL, image::TextureUsage::Type textureType, const QDir& outputDirectory); const QByteArray& getOriginalTexture() const { return _originalTexture; } @@ -50,7 +50,7 @@ private: QUrl _textureURL; QByteArray _originalTexture; - gpu::TextureType _textureType; + image::TextureUsage::Type _textureType; QDir _outputDirectory; QString _bakedTextureFileName; diff --git a/tools/oven/src/ui/SkyboxBakeWidget.cpp b/tools/oven/src/ui/SkyboxBakeWidget.cpp index d0da0a98ba..d5c280aebd 100644 --- a/tools/oven/src/ui/SkyboxBakeWidget.cpp +++ b/tools/oven/src/ui/SkyboxBakeWidget.cpp @@ -177,7 +177,7 @@ void SkyboxBakeWidget::bakeButtonClicked() { // everything seems to be in place, kick off a bake for this skybox now auto baker = std::unique_ptr { - new TextureBaker(skyboxToBakeURL, gpu::CUBE_TEXTURE, outputDirectory.absolutePath()) + new TextureBaker(skyboxToBakeURL, image::TextureUsage::CUBE_TEXTURE, outputDirectory.absolutePath()) }; // move the baker to a worker thread