Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Remove bundled assets reader.

Browse Source 
It was no longer being used or linked, so it just meant the assets were missing.
With this removed, the assets (lang inis, shaders, etc.) are available again.

Fixes #9831 - likely broken since #9061, which stopped using the qrc.
This commit is contained in:
Unknown W. Brackets 2018-06-09 10:35:40 -07:00
parent d1b06bbd41
commit a676721683
5 changed files with 2 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -763,7 +763,7 @@ elseif(USING_QT_UI)
Qt/mainwindow.h
)
add_definitions(-DUSING_QT_UI)
include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt Qt/Debugger)
include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt)
set(nativeExtraLibs ${nativeExtraLibs} Qt5::OpenGL Qt5::Gui Qt5::Core)
set(TargetBin PPSSPPQt)

16
Qt/desktop_assets.qrc
View File

@ -1,16 +0,0 @@
<RCC>
<qresource prefix="/">
<file alias="assets/ui_atlas.zim">../assets/ui_atlas.zim</file>
<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
<file alias="assets/lang">../assets/lang</file>
<file alias="assets/compat.ini">../assets/compat.ini</file>
<file alias="assets/langregion.ini">../assets/langregion.ini</file>
<file alias="assets/unknown.png">../assets/unknown.png</file>
<file alias="assets/rargray.png">../assets/rargray.png</file>
<file alias="assets/zip.png">../assets/zip.png</file>
<file alias="assets/shaders">../assets/shaders</file>
<file alias="assets/flash0/font">../flash0/font</file>
<file>resources/breakpointDisable.ico</file>
<file>resources/breakpoint.ico</file>
</qresource>
</RCC>

4
UI/NativeApp.cpp
View File

@ -360,9 +360,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
#endif
// We want this to be FIRST.
#ifdef USING_QT_UI
VFSRegister("", new AssetsAssetReader());
#elif defined(IOS)
#if defined(IOS)
// Packed assets are included in app
VFSRegister("", new DirectoryAssetReader(external_dir));
#endif

57
ext/native/file/zip_read.cpp
View File

@ -3,11 +3,6 @@
#include <set>
#include <stdio.h>
#ifdef USING_QT_UI
#include <QFileInfo>
#include <QDir>
#endif
#ifdef __ANDROID__
#include <zip.h>
#endif
@ -66,58 +61,6 @@ uint8_t *ReadLocalFile(const char *filename, size_t *size) {
return contents;
}
#ifdef USING_QT_UI
uint8_t *AssetsAssetReader::ReadAsset(const char *path, size_t *size) {
QFile asset(QString(":/assets/") + path);
if (!asset.open(QIODevice::ReadOnly))
return 0;
uint8_t *contents = new uint8_t[asset.size()+1];
memcpy(contents, (uint8_t*)asset.readAll().data(), asset.size());
contents[asset.size()] = 0;
*size = asset.size();
asset.close();
return contents;
}
bool AssetsAssetReader::GetFileListing(const char *path, std::vector<FileInfo> *listing, const char *filter = 0)
{
QDir assetDir(QString(":/assets/") + path);
QStringList filters = QString(filter).split(':', QString::SkipEmptyParts);
for (int i = 0; i < filters.count(); i++)
filters[i].prepend("*.");
QFileInfoList infoList = assetDir.entryInfoList(filters, QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Files, QDir::Name);
foreach(QFileInfo qinfo, infoList) {
FileInfo info;
info.name = qinfo.fileName().toStdString();
info.fullName = qinfo.absoluteFilePath().remove(":/assets/").toStdString();
info.exists = true;
info.isWritable = false;
info.isDirectory = qinfo.isDir();
listing->push_back(info);
}
return true;
}
bool AssetsAssetReader::GetFileInfo(const char *path, FileInfo *info) {
QFileInfo qinfo(QString(":/assets/") + path);
if (!qinfo.exists()) {
info->exists = false;
info->size = 0;
return false;
}
info->fullName = path;
info->exists = true;
info->isWritable = false;
info->isDirectory = qinfo.isDir();
info->size = qinfo.size();
return true;
}
#endif
#ifdef __ANDROID__
ZipAssetReader::ZipAssetReader(const char *zip_file, const char *in_zip_path) {

15
ext/native/file/zip_read.h
View File

@ -26,21 +26,6 @@ public:
virtual std::string toString() const = 0;
};
#ifdef USING_QT_UI
class AssetsAssetReader : public AssetReader {
public:
AssetsAssetReader() {}
~AssetsAssetReader() {}
// use delete[]
virtual uint8_t *ReadAsset(const char *path, size_t *size);
virtual bool GetFileListing(const char *path, std::vector<FileInfo> *listing, const char *filter);
virtual bool GetFileInfo(const char *path, FileInfo *info);
virtual std::string toString() const {
return ":assets/";
}
};
#endif
#ifdef __ANDROID__
uint8_t *ReadFromZip(zip *archive, const char* filename, size_t *size);
class ZipAssetReader : public AssetReader {