Working on android avatar rendering

.gitignore

@@ -77,4 +77,6 @@ TAGS
 # ignore node files for the console
 node_modules
 npm-debug.log
-*___jb_old___
+*___jb_old___
+android/app/src/main/assets
+

android/build.gradle

@@ -511,13 +511,21 @@ task copyInterfaceAssets() {
         def resourcesDir = new File("${appDir}/../../interface/resources")
         def scriptsDir = new File("${appDir}/../../scripts")
         def assetsDir = new File(appDir, 'src/main/assets')
-        copy {
-            from resourcesDir
-            into new File(assetsDir, "resources")
-        }
-        copy {
-            from scriptsDir
-            into new File(assetsDir, "scripts")
+
+        def assetsList = new File(assetsDir, 'cache_assets.txt');
+        TimeZone.setDefault(TimeZone.getTimeZone('UTC'))
+        assetsList.withWriter { out ->
+            out.println(Long.toString(new Date().getTime()))
+            copy {
+                from resourcesDir
+                into new File(assetsDir, "resources")
+                eachFile { details-> out.println("resources/" + details.path) }
+            }
+            copy {
+                from scriptsDir
+                into new File(assetsDir, "scripts")
+                eachFile { details-> out.println("scripts/" + details.path) }
+            }
         }
     }
 }

interface/resources/meshes/+android/defaultAvatar_full.fst

@@ -0,0 +1,135 @@
+name = being_of_light
+type = body+head
+scale = 1
+filename = being_of_light/being_of_light.fbx
+texdir = being_of_light/textures
+joint = jointRoot = Hips
+joint = jointLeftHand = LeftHand
+joint = jointHead = HeadTop_End
+joint = jointLean = Spine
+joint = jointEyeLeft = LeftEye
+joint = jointRightHand = RightHand
+joint = jointNeck = Head
+joint = jointEyeRight = RightEye
+freeJoint = LeftArm
+freeJoint = LeftForeArm
+freeJoint = RightArm
+freeJoint = RightForeArm
+bs = MouthFrown_L = Frown_Left = 1
+bs = MouthLeft = Midmouth_Left = 1
+bs = BrowsU_R = BrowsUp_Right = 1
+bs = ChinUpperRaise = UpperLipUp_Right = 0.5
+bs = ChinUpperRaise = UpperLipUp_Left = 0.5
+bs = MouthSmile_R = Smile_Right = 1
+bs = MouthDimple_L = Smile_Left = 0.25
+bs = EyeBlink_L = Blink_Left = 1
+bs = BrowsD_L = BrowsDown_Left = 1
+bs = MouthFrown_R = Frown_Right = 1
+bs = MouthDimple_R = Smile_Right = 0.25
+bs = Sneer = Squint_Right = 0.5
+bs = Sneer = Squint_Left = 0.5
+bs = Sneer = NoseScrunch_Right = 0.75
+bs = Sneer = NoseScrunch_Left = 0.75
+bs = EyeSquint_L = Squint_Left = 1
+bs = EyeBlink_R = Blink_Right = 1
+bs = JawLeft = JawRotateY_Left = 0.5
+bs = BrowsD_R = BrowsDown_Right = 1
+bs = EyeSquint_R = Squint_Right = 1
+bs = Puff = CheekPuff_Right = 1
+bs = Puff = CheekPuff_Left = 1
+bs = LipsUpperClose = UpperLipIn = 1
+bs = JawOpen = MouthOpen = 0.69999999999999996
+bs = LipsUpperUp = UpperLipUp_Right = 0.69999999999999996
+bs = LipsUpperUp = UpperLipUp_Left = 0.69999999999999996
+bs = LipsLowerDown = LowerLipDown_Right = 0.69999999999999996
+bs = LipsLowerDown = LowerLipDown_Left = 0.69999999999999996
+bs = LipsLowerOpen = LowerLipOut = 1
+bs = EyeOpen_L = EyesWide_Left = 1
+bs = LipsPucker = MouthNarrow_Right = 1
+bs = LipsPucker = MouthNarrow_Left = 1
+bs = EyeOpen_R = EyesWide_Right = 1
+bs = JawRight = Jaw_Right = 1
+bs = MouthRight = Midmouth_Right = 1
+bs = ChinLowerRaise = Jaw_Up = 1
+bs = LipsUpperOpen = UpperLipOut = 1
+bs = BrowsU_C = BrowsUp_Right = 1
+bs = BrowsU_C = BrowsUp_Left = 1
+bs = JawFwd = JawForeward = 1
+bs = BrowsU_L = BrowsUp_Left = 1
+bs = MouthSmile_L = Smile_Left = 1
+bs = LipsLowerClose = LowerLipIn = 1
+bs = LipsFunnel = TongueUp = 1
+bs = LipsFunnel = MouthWhistle_NarrowAdjust_Right = 0.5
+bs = LipsFunnel = MouthWhistle_NarrowAdjust_Left = 0.5
+bs = LipsFunnel = MouthNarrow_Right = 1
+bs = LipsFunnel = MouthNarrow_Left = 1
+bs = LipsFunnel = Jaw_Down = 0.35999999999999999
+bs = LipsFunnel = JawForeward = 0.39000000000000001
+jointIndex = LeftHandIndex1 = 50
+jointIndex = LeftHandIndex2 = 51
+jointIndex = LeftHandIndex3 = 52
+jointIndex = LeftHandIndex4 = 53
+jointIndex = Spine1 = 12
+jointIndex = Spine2 = 13
+jointIndex = RightHandThumb1 = 18
+jointIndex = RightHandThumb2 = 19
+jointIndex = RightHandThumb3 = 20
+jointIndex = RightHandThumb4 = 21
+jointIndex = LeftFoot = 8
+jointIndex = LeftForeArm = 40
+jointIndex = Neck = 62
+jointIndex = Head = 63
+jointIndex = Hips = 0
+jointIndex = RightHandPinky1 = 30
+jointIndex = RightHandPinky2 = 31
+jointIndex = RightHandPinky3 = 32
+jointIndex = RightHandPinky4 = 33
+jointIndex = RightLeg = 2
+jointIndex = RightForeArm = 16
+jointIndex = LeftHandRing1 = 46
+jointIndex = LeftHandRing2 = 47
+jointIndex = LeftHandRing3 = 48
+jointIndex = LeftHandRing4 = 49
+jointIndex = LeftHandThumb1 = 54
+jointIndex = LeftHandThumb2 = 55
+jointIndex = LeftHandThumb3 = 56
+jointIndex = LeftHandThumb4 = 57
+jointIndex = HeadTop_End = 66
+jointIndex = LeftUpLeg = 6
+jointIndex = LeftToeBase = 9
+jointIndex = LeftHandPinky1 = 42
+jointIndex = LeftHandPinky2 = 43
+jointIndex = LeftHandPinky3 = 44
+jointIndex = LeftHandPinky4 = 45
+jointIndex = LeftLeg = 7
+jointIndex = RightEye = 65
+jointIndex = RightHand = 17
+jointIndex = RightToeBase = 4
+jointIndex = RightUpLeg = 1
+jointIndex = RightArm = 15
+jointIndex = RightHandRing1 = 26
+jointIndex = RightHandRing2 = 27
+jointIndex = RightHandRing3 = 28
+jointIndex = RightHandRing4 = 29
+jointIndex = RightHandIndex1 = 22
+jointIndex = RightHandIndex2 = 23
+jointIndex = RightHandIndex3 = 24
+jointIndex = RightHandIndex4 = 25
+jointIndex = LeftToe_End = 10
+jointIndex = LeftHandMiddle1 = 58
+jointIndex = LeftHandMiddle2 = 59
+jointIndex = LeftHandMiddle3 = 60
+jointIndex = LeftShoulder = 38
+jointIndex = LeftHandMiddle4 = 61
+jointIndex = RightFoot = 3
+jointIndex = LeftHand = 41
+jointIndex = RightHandMiddle1 = 34
+jointIndex = RightHandMiddle2 = 35
+jointIndex = RightHandMiddle3 = 36
+jointIndex = RightShoulder = 14
+jointIndex = LeftEye = 64
+jointIndex = RightHandMiddle4 = 37
+jointIndex = Body = 67
+jointIndex = LeftArm = 39
+jointIndex = RightToe_End = 5
+jointIndex = Spine = 11

interface/src/Application.cpp

@@ -25,6 +25,7 @@
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QMimeData>
 #include <QtCore/QThreadPool>
+#include <QtCore/QFileSelector>
 #include <QtConcurrent/QtConcurrentRun>
 
 #include <QtGui/QScreen>
@@ -240,12 +241,11 @@ extern "C" {
 extern "C" {
  
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnCreate(JNIEnv* env, jobject obj, jobject instance, jobject asset_mgr) {
-    storage::FileStorage::setAssetManager(AAssetManager_fromJava(env, asset_mgr));
     qDebug() << "nativeOnCreate On thread " << QThread::currentThreadId();
 }
 
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnPause(JNIEnv* env, jobject obj) {
-     qDebug() << "nativeOnPause";
+    qDebug() << "nativeOnPause";
 }
 
 JNIEXPORT void Java_io_highfidelity_hifiinterface_InterfaceActivity_nativeOnResume(JNIEnv* env, jobject obj) {
@@ -1823,7 +1823,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         PROFILE_RANGE(render, "Process Default Skybox");
         auto textureCache = DependencyManager::get<TextureCache>();
 
-        auto skyboxUrl = PathUtils::resourcesPath().toStdString() + "images/Default-Sky-9-cubemap.ktx";
+        auto skyboxUrl = QFileSelector().select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx").toStdString();
 
         _defaultSkyboxTexture = gpu::Texture::unserialize(skyboxUrl);
         _defaultSkyboxAmbientTexture = _defaultSkyboxTexture;

interface/src/main.cpp

@@ -31,6 +31,10 @@
 #include "UserActivityLogger.h"
 #include "MainWindow.h"
 
+#if defined(Q_OS_ANDROID)
+#include <android/log.h>
+#endif
+
 #ifdef HAS_BUGSPLAT
 #include <BugSplat.h>
 #include <CrashReporter.h>
@@ -42,6 +46,90 @@ extern "C" {
 }
 #endif
 
+#if defined(Q_OS_ANDROID)
+void tempMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
+    if (!message.isEmpty()) {
+        const char * local=message.toStdString().c_str();
+        switch (type) {
+            case QtDebugMsg:
+                __android_log_write(ANDROID_LOG_DEBUG,"Interface",local);
+                break;
+            case QtInfoMsg:
+                __android_log_write(ANDROID_LOG_INFO,"Interface",local);
+                break;
+            case QtWarningMsg:
+                __android_log_write(ANDROID_LOG_WARN,"Interface",local);
+                break;
+            case QtCriticalMsg:
+                __android_log_write(ANDROID_LOG_ERROR,"Interface",local);
+                break;
+            case QtFatalMsg:
+            default:
+                __android_log_write(ANDROID_LOG_FATAL,"Interface",local);
+                abort();
+        }
+    }
+}
+
+void unpackAndroidAssets() {
+    const QString SOURCE_PREFIX { "assets:/" };
+    const QString DEST_PREFIX = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/";
+    QStringList filesToCopy;
+    QString dateStamp;
+    {
+        QFile file("assets:/cache_assets.txt");
+        if (!file.open(QIODevice::ReadOnly)) {
+            throw std::runtime_error("Failed to open cache file list");
+        }
+        QTextStream in(&file);
+        dateStamp = DEST_PREFIX + "/" + in.readLine();
+        while (!in.atEnd()) {
+            QString line = in.readLine();
+            filesToCopy << line;
+        }
+        file.close();
+    }
+    qDebug() << "Checking date stamp" << dateStamp;
+
+    if (QFileInfo(dateStamp).exists()) {
+        return;
+    }
+
+    auto rootDir = QDir::root();
+    for (const auto& fileToCopy : filesToCopy) {
+        auto sourceFileName = SOURCE_PREFIX + fileToCopy;
+        auto destFileName = DEST_PREFIX + fileToCopy;
+        auto destFolder = QFileInfo(destFileName).absoluteDir();
+        if (!destFolder.exists()) {
+            qDebug() << "Creating folder" << destFolder.absolutePath();
+            if (!rootDir.mkpath(destFolder.absolutePath())) {
+                throw std::runtime_error("Error creating output path");
+            }
+        }
+        if (QFile::exists(destFileName)) {
+            qDebug() << "Removing old file" << destFileName;
+            if (!QFile::remove(destFileName)) {
+                throw std::runtime_error("Failed to remove existing file");
+            }
+        }
+
+        qDebug() << "Copying from" << sourceFileName << "to" << destFileName;
+        if (!QFile(sourceFileName).copy(destFileName)) {
+            throw std::runtime_error("Failed to unpack cache files");
+        }
+    }
+
+    {
+        qDebug() << "Writing date stamp" << dateStamp;
+        QFile file(dateStamp);
+        if (file.open(QIODevice::ReadWrite)) {
+            QTextStream(&file) << "touch" << endl;
+            file.close();
+        }
+    }
+}
+#endif
+
 int main(int argc, const char* argv[]) {
 #if HAS_BUGSPLAT
     static QString BUG_SPLAT_DATABASE = "interface_alpha";
@@ -107,16 +195,10 @@ int main(int argc, const char* argv[]) {
     }
 
 #if defined(Q_OS_ANDROID)
-    std::vector<QString> assetDirs = {
-            "/resources",
-            "/scripts",
-    };
-    QDir dirInfo(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
-    for (std::vector<QString>::iterator it = assetDirs.begin() ; it != assetDirs.end(); ++it) {
-        QString dir = *it;
-        PathUtils::copyDirDeep("assets:" + dir, QUrl::fromLocalFile(dirInfo.canonicalPath() + dir).toLocalFile());
-    }
+    qInstallMessageHandler(tempMessageHandler);
+    unpackAndroidAssets();
 #endif
+
     // this needs to be done here in main, as the mechanism for setting the
     // scripts directory appears not to work.  See the bug report
     // https://highfidelity.fogbugz.com/f/cases/5759/Issues-changing-scripts-directory-in-ScriptsEngine

interface/src/scripting/AssetMappingsScriptingInterface.cpp

@@ -39,9 +39,7 @@ AssetMappingsScriptingInterface::AssetMappingsScriptingInterface() {
 void AssetMappingsScriptingInterface::setMapping(QString path, QString hash, QJSValue callback) {
     auto assetClient = DependencyManager::get<AssetClient>();
     auto request = assetClient->createSetMappingRequest(path, hash);
-#if !defined(Q_OS_ANDROID)
-// TODO: just to make android compile
-    connect(request, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable {
+    connect(request, &SetMappingRequest::finished, this, [callback](SetMappingRequest* request) mutable {
         if (callback.isCallable()) {
             QJSValueList args { request->getErrorString(), request->getPath() };
             callback.call(args);
@@ -49,17 +47,13 @@ void AssetMappingsScriptingInterface::setMapping(QString path, QString hash, QJS
 
         request->deleteLater();
     });
-#endif
-
     request->start();
 }
 
 void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback) {
     auto assetClient = DependencyManager::get<AssetClient>();
     auto request = assetClient->createGetMappingRequest(path);
-#if !defined(Q_OS_ANDROID)
-// TODO: just to make android compile
-    connect(request, &GetMappingRequest::finished, this, [this, callback](GetMappingRequest* request) mutable {
+    connect(request, &GetMappingRequest::finished, this, [callback](GetMappingRequest* request) mutable {
         auto hash = request->getHash();
 
         if (callback.isCallable()) {
@@ -69,7 +63,6 @@ void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback
 
         request->deleteLater();
     });
-#endif
 
     request->start();
 }

interface/src/scripting/LimitlessConnection.h

@@ -12,12 +12,12 @@
 #ifndef hifi_LimitlessConnection_h
 #define hifi_LimitlessConnection_h
 
+#include <QtCore/QObject>
+#include <QtCore/QFuture>
+#include <QtNetwork/QTcpSocket>
+
 #include <AudioClient.h>
-#include <QObject>
-#include <QFuture>
-#if defined(Q_OS_ANDROID)
-#include <QTcpSocket>
-#endif
+
 class LimitlessConnection : public QObject {
     Q_OBJECT
 public:

libraries/gpu-gles/src/gpu/gles/GLESBackendTexture.cpp

@@ -104,44 +104,70 @@ void GLESTexture::generateMips() const {
     (void)CHECK_GL_ERROR();
 }
 
+bool isCompressedFormat(GLenum internalFormat) {
+    switch (internalFormat) {
+        case GL_COMPRESSED_R11_EAC:
+        case GL_COMPRESSED_SIGNED_R11_EAC:
+        case GL_COMPRESSED_RG11_EAC:
+        case GL_COMPRESSED_SIGNED_RG11_EAC:
+        case GL_COMPRESSED_RGB8_ETC2:
+        case GL_COMPRESSED_SRGB8_ETC2:
+        case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+        case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
+        case GL_COMPRESSED_RGBA8_ETC2_EAC:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:
+        case GL_COMPRESSED_RGBA_ASTC_4x4:
+        case GL_COMPRESSED_RGBA_ASTC_5x4:
+        case GL_COMPRESSED_RGBA_ASTC_5x5:
+        case GL_COMPRESSED_RGBA_ASTC_6x5:
+        case GL_COMPRESSED_RGBA_ASTC_6x6:
+        case GL_COMPRESSED_RGBA_ASTC_8x5:
+        case GL_COMPRESSED_RGBA_ASTC_8x6:
+        case GL_COMPRESSED_RGBA_ASTC_8x8:
+        case GL_COMPRESSED_RGBA_ASTC_10x5:
+        case GL_COMPRESSED_RGBA_ASTC_10x6:
+        case GL_COMPRESSED_RGBA_ASTC_10x8:
+        case GL_COMPRESSED_RGBA_ASTC_10x10:
+        case GL_COMPRESSED_RGBA_ASTC_12x10:
+        case GL_COMPRESSED_RGBA_ASTC_12x12:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10:
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12:
+            return true;
+        default:
+            return false;
+    }
+}
+
+
 Size GLESTexture::copyMipFaceLinesFromTexture(uint16_t mip, uint8_t face, const uvec3& size, uint32_t yOffset, GLenum internalFormat, GLenum format, GLenum type, Size sourceSize, const void* sourcePointer) const {
     Size amountCopied = sourceSize;
     if (GL_TEXTURE_2D == _target) {
-        qDebug() << "[UNIMPLEMENTED] GL_TEXTURE_2D internalFormat: " << internalFormat;
-        /*switch (internalFormat) {
-            case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-            case GL_COMPRESSED_RED_RGTC1:
-            case GL_COMPRESSED_RG_RGTC2:
-            case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
-            case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
-                glCompressedTexSubImage2D(_target, mip, 0, yOffset, size.x, size.y, internalFormat,
-                                          static_cast<GLsizei>(sourceSize), sourcePointer);
-                break;
-            default:*/
-                glTexSubImage2D(_target, mip, 0, yOffset, size.x, size.y, format, type, sourcePointer);
-                //break;
-        //}
+        if (isCompressedFormat(internalFormat)) {
+            glCompressedTexSubImage2D(_target, mip, 0, yOffset, size.x, size.y, internalFormat,
+                                      static_cast<GLsizei>(sourceSize), sourcePointer);
+        } else {
+            glTexSubImage2D(_target, mip, 0, yOffset, size.x, size.y, format, type, sourcePointer);
+        }
     } else if (GL_TEXTURE_CUBE_MAP == _target) {
         auto target = GLTexture::CUBE_FACE_LAYOUT[face];
-        qDebug() << "[UNIMPLEMENTED] GL_TEXTURE_CUBE_MAP internalFormat: " << internalFormat;
-
-        /*switch (internalFormat) {
-            case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
-            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-            case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-            case GL_COMPRESSED_RED_RGTC1:
-            case GL_COMPRESSED_RG_RGTC2:
-            case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
-            case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
-                glCompressedTexSubImage2D(target, mip, 0, yOffset, size.x, size.y, internalFormat,
-                                          static_cast<GLsizei>(sourceSize), sourcePointer);
-                break;
-            default:*/
-                glTexSubImage2D(target, mip, 0, yOffset, size.x, size.y, format, type, sourcePointer);
-          //      break;
-        //}
+        if (isCompressedFormat(internalFormat)) {
+            glCompressedTexSubImage2D(target, mip, 0, yOffset, size.x, size.y, internalFormat,
+                                      static_cast<GLsizei>(sourceSize), sourcePointer);
+        } else {
+            glTexSubImage2D(target, mip, 0, yOffset, size.x, size.y, format, type, sourcePointer);
+        }
     } else {
     // TODO: implement for android
         assert(false);

libraries/image/src/image/Image.cpp

@@ -21,7 +21,7 @@
 
 
 #if defined(Q_OS_ANDROID)
-#define CPU_MIPMAPS 0
+#define CPU_MIPMAPS 1
 #else
 #define CPU_MIPMAPS 1
 #include <nvtt/nvtt.h>

libraries/networking/src/FileResourceRequest.cpp

@@ -11,9 +11,9 @@
 
 #include "FileResourceRequest.h"
 
-#include <cstdlib>
-
-#include <QFile>
+#include <QtCore/QFile>
+#include <QtCore/QFileSelector>
+#include <QtCore/QDebug>
 
 #include <StatTracker.h>
 
@@ -29,6 +29,9 @@ void FileResourceRequest::doSend() {
         filename = _url.toString();
     }
 
+    // Allow platform specific versions of files loaded out of a resource cache via file://
+    filename = QFileSelector().select(filename);
+
     if (!_byteRange.isValid()) {
         _result = ResourceRequest::InvalidByteRange;
     } else {

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -11,6 +11,8 @@
 
 #include "DeferredLightingEffect.h"
 
+#include <QtCore/QFileSelector>
+
 #include <GLMHelpers.h>
 #include <PathUtils.h>
 #include <ViewFrustum.h>
@@ -228,6 +230,7 @@ static void loadLightProgram(const char* vertSource, const char* fragSource, boo
 }
 
 #include <shared/Shapes.h>
+#include <QtCore/QFileSelector>
 
 model::MeshPointer DeferredLightingEffect::getPointLightMesh() {
     if (!_pointLightMesh) {
@@ -731,7 +734,7 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) {
                 PROFILE_RANGE(render, "Process Default Skybox");
                 auto textureCache = DependencyManager::get<TextureCache>();
 
-                auto skyboxUrl = PathUtils::resourcesPath().toStdString() + "images/Default-Sky-9-cubemap.ktx";
+                auto skyboxUrl = QFileSelector().select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx").toStdString();
 
                 _defaultSkyboxTexture = gpu::Texture::unserialize(skyboxUrl);
                 _defaultSkyboxAmbientTexture = _defaultSkyboxTexture;

libraries/shared/src/PathUtils.cpp

@@ -33,7 +33,7 @@ const QString& PathUtils::resourcesPath() {
 #ifdef Q_OS_MAC
     static const QString staticResourcePath = QCoreApplication::applicationDirPath() + "/../Resources/";
 #elif defined (ANDROID)
-    static const QString staticResourcePath = "assets:/resources/";
+    static const QString staticResourcePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/resources/";
 #else
     static const QString staticResourcePath = QCoreApplication::applicationDirPath() + "/resources/";
 #endif

libraries/shared/src/shared/Storage.cpp

@@ -47,13 +47,6 @@ MemoryStorage::MemoryStorage(size_t size, const uint8_t* data) {
     }
 }
 
-#if defined(Q_OS_ANDROID)
-static AAssetManager* g_assetManager = nullptr;
-void FileStorage::setAssetManager(AAssetManager* assetManager) {
-    ::g_assetManager = assetManager;
-}
-#endif
-
 StoragePointer FileStorage::create(const QString& filename, size_t size, const uint8_t* data) {
     QFile file(filename);
     if (!file.open(QFile::ReadWrite | QIODevice::Truncate)) {
@@ -76,27 +69,7 @@ StoragePointer FileStorage::create(const QString& filename, size_t size, const u
     return std::make_shared<FileStorage>(filename);
 }
 
-
 FileStorage::FileStorage(const QString& filename) : _file(filename) {
-#if defined(Q_OS_ANDROID)
-    static const QString ASSETS_PREFIX("assets:/");
-    bool isAsset = filename.startsWith(ASSETS_PREFIX);
-    if (isAsset) {
-        _hasWriteAccess = false;
-        std::string strFilename = filename.mid(ASSETS_PREFIX.size()).toStdString();
-        // Load shader from compressed asset
-        _asset = AAssetManager_open(g_assetManager, strFilename.c_str(), AASSET_MODE_BUFFER);
-        if (!_asset) {
-            return;
-        }
-        _size = AAsset_getLength64(_asset);
-        _mapped = (uint8_t*)AAsset_getBuffer(_asset);
-        if (_mapped) {
-            _valid = true;
-        }
-        return;
-    }
-#endif
     bool opened = _file.open(QFile::ReadWrite);
     if (opened) {
         _hasWriteAccess = true;
@@ -106,7 +79,6 @@ FileStorage::FileStorage(const QString& filename) : _file(filename) {
     }
 
     if (opened) {
-        _size = _file.size();
         _mapped = _file.map(0, _file.size());
         if (_mapped) {
             _valid = true;
@@ -119,14 +91,6 @@ FileStorage::FileStorage(const QString& filename) : _file(filename) {
 }
 
 FileStorage::~FileStorage() {
-#if defined(Q_OS_ANDROID)
-    if (_asset) {
-        _mapped = nullptr;
-        AAsset_close(_asset);
-        _asset = nullptr;
-        return;
-    }
-#endif
     if (_mapped) {
         _file.unmap(_mapped);
         _mapped = nullptr;

libraries/shared/src/shared/Storage.h

@@ -13,14 +13,8 @@
 #include <stdint.h>
 #include <vector>
 #include <memory>
-
-#include <QtCore/qtglobal>
-#include <QtCore/QFile>
-#include <QtCore/QString>
-
-#if defined(Q_OS_ANDROID)
-#include <android/asset_manager.h>
-#endif
+#include <QFile>
+#include <QString>
 
 namespace storage {
     class Storage;
@@ -58,9 +52,6 @@ namespace storage {
 
     class FileStorage : public Storage {
     public:
-#if defined(Q_OS_ANDROID)
-        static void setAssetManager(AAssetManager* assetManager);
-#endif
         static StoragePointer create(const QString& filename, size_t size, const uint8_t* data);
         FileStorage(const QString& filename);
         ~FileStorage();
@@ -70,13 +61,10 @@ namespace storage {
 
         const uint8_t* data() const override { return _mapped; }
         uint8_t* mutableData() override { return _hasWriteAccess ? _mapped : nullptr; }
-        size_t size() const override { return _size; }
+        size_t size() const override { return _file.size(); }
         operator bool() const override { return _valid; }
     private:
-#if defined(Q_OS_ANDROID)
-        AAsset* _asset { nullptr };
-#endif
-        size_t _size { 0 };
+
         bool _valid { false };
         bool _hasWriteAccess { false };
         QFile _file;