PR feedback

cmake/macros/TargetNvtt.cmake

@@ -1,6 +1,3 @@
-if (NOT ANDROID)
-endif()
-
 #
 #  Copyright 2015 High Fidelity, Inc.
 #  Created by Bradley Austin Davis on 2015/10/10

libraries/render-utils/src/forward_model.slf

@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  forward_model_specular_map.frag
+//  forward_model.frag
 //  fragment shader
 //
 //  Created by Sam Gateau on 2/15/2016.

libraries/render-utils/src/forward_model_normal_map.slf

@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  forward_model_normal_specular_map.frag
+//  forward_model_normal_map.frag
 //  fragment shader
 //
 //  Created by Sam Gateau on 2/15/2016.

libraries/render-utils/src/model_fade.slf

@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_specular_map_fade.frag
+//  model_fade.frag
 //  fragment shader
 //
 //  Created by Olivier Prat on 06/05/17.

libraries/render-utils/src/model_lightmap_fade.slf

@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_lightmap_specular_map_fade.frag
+//  model_lightmap_fade.frag
 //  fragment shader
 //
 //  Created by Olivier Prat on 06/05/17.

libraries/render-utils/src/model_lightmap_normal_map.slf

@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_lightmap_normal_specular_map.frag
+//  model_lightmap_normal_map.frag
 //  fragment shader
 //
 //  Created by Samuel Gateau on 11/19/14.

libraries/render-utils/src/model_lightmap_normal_map_fade.slf

@@ -2,7 +2,7 @@
 <$VERSION_HEADER$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  model_lightmap_normal_specular_map_fade.frag
+//  model_lightmap_normal_map_fade.frag
 //  fragment shader
 //
 //  Created by Olivier Prat on 06/05/17.

libraries/ui/src/QmlFragmentClass.cpp

@@ -20,9 +20,8 @@
 std::mutex QmlFragmentClass::_mutex;
 std::map<QString, QScriptValue> QmlFragmentClass::_fragments;
 
-QmlFragmentClass::QmlFragmentClass(QString id) : 
+QmlFragmentClass::QmlFragmentClass(QString id) : qml(id) { }
-    qml(id) {
+
-}
 // Method called by Qt scripts to create a new bottom menu bar in Android
 QScriptValue QmlFragmentClass::constructor(QScriptContext* context, QScriptEngine* engine) {
 

tools/ktx-tool/src/main.cpp

@@ -94,77 +94,6 @@ void processKtxFile(const QFileInfo& inputFileInfo) {
     auto outputStorage = outputKtx->getStorage();
 
     storage::FileStorage::create(finalFilename, outputStorage->size(), outputStorage->data());
-#if 0
-    const auto& header = inputKtx->getHeader();
-
-
-    detexTexture **input_textures;
-    int nu_levels;
-    if (!detexLoadTextureFileWithMipmaps(inputFileName.toStdString().c_str(), 32, &input_textures, &nu_levels)) {
-        return;
-        //throw std::runtime_error(detexGetErrorMessage());
-    }
-
-    switch (header.glInternalFormat) {
-        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-        case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-            outputHeader.glFormat = GL_RGBA;
-            outputHeader.glInternalFormat = GL_RGBA8;
-            break;
-
-        case GL_COMPRESSED_RED_GREEN_RGTC2_EXT:
-            outputHeader.glFormat = GL_RG;
-            outputHeader.glInternalFormat = GL_RG8;
-            qWarning() << "Unsupported";
-            return;
-            break;
-
-        case GL_COMPRESSED_RED_RGTC1_EXT:
-            outputHeader.glFormat = GL_RED;
-            outputHeader.glInternalFormat = GL_R8;
-            qWarning() << "Unsupported";
-            return;
-            break;
-
-        default:
-            qWarning() << "Unsupported";
-            return;
-    }
-
-
-    auto outputKtx = ktx::KTX::createBare(outputHeader, ktx->_keyValues);
-    auto outputDescriptor = outputKtx->toDescriptor();
-    auto outputStorage = outputKtx->getStorage();
-    auto outputPointer = outputStorage->mutableData();
-    auto outputSize = outputStorage->size();
-
-    glm::uvec2 dimensions{ header.pixelWidth, header.pixelHeight };
-    for (uint16_t mip = 0; mip < header.numberOfMipmapLevels; ++mip) {
-        auto mipDimensions = evalMipDimension(mip, dimensions);
-
-        for (uint8_t face = 0; face < header.numberOfFaces; ++face) {
-            auto faceSize = outputDescriptor.getMipFaceTexelsSize(mip, face);
-            auto faceOffset = outputDescriptor.getMipFaceTexelsOffset(mip, face);
-            assert(faceOffset + faceSize <= outputSize);
-            auto mipFace = ktx->getMipFaceTexelsData(mip, face);
-            auto outputMipFace = outputKtx->getMipFaceTexelsData();
-            if (header.glInternalFormat == GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT) {
-                BlockDecompressImageDXT5(mipDimensions.x, mipDimensions.y, mipFace->data(), (unsigned long*)(outputPointer + faceOffset));
-            } else if (header.glInternalFormat == GL_COMPRESSED_SRGB_S3TC_DXT1_EXT) {
-                BlockDecompressImageDXT1(mipDimensions.x, mipDimensions.y, mipFace->data(), (unsigned long*)(outputPointer + faceOffset));
-            } else {
-                qWarning() << "Unsupported";
-                return;
-            }
-        }
-    }
-
-    storage::FileStorage::create(outputFileName, outputStorage->size(), outputStorage->data());
-#endif
-    //if (gliTexture.empty()) {
-    //    throw std::runtime_error("Unable to load texture using GLI");
-    //}
-    //gli::texture2d gliTextureConverted = gli::convert(gliTexture, gli::FORMAT_RGBA8_UNORM_PACK8);
 }
 
 void scanDir(const QDir& dir) {