diff --git a/CMakeLists.txt b/CMakeLists.txt index 2daab5c16f..0a7699f8c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,6 +455,12 @@ add_library(Common STATIC Common/Data/Format/JSONReader.cpp Common/Data/Format/JSONWriter.h Common/Data/Format/JSONWriter.cpp + Common/Data/Format/PNGLoad.cpp + Common/Data/Format/PNGLoad.h + Common/Data/Format/ZIMLoad.cpp + Common/Data/Format/ZIMLoad.h + Common/Data/Format/ZIMSave.cpp + Common/Data/Format/ZIMSave.h Common/Data/Hash/Hash.cpp Common/Data/Hash/Hash.h Common/Data/Text/I18n.cpp @@ -472,6 +478,12 @@ add_library(Common STATIC Common/File/DiskFree.cpp Common/File/PathBrowser.h Common/File/PathBrowser.cpp + Common/File/FileUtil.cpp + Common/File/FileUtil.h + Common/File/DirListing.cpp + Common/File/DirListing.h + Common/File/FileDescriptor.cpp + Common/File/FileDescriptor.h Common/Input/GestureDetector.cpp Common/Input/GestureDetector.h Common/Input/KeyCodes.h @@ -491,6 +503,20 @@ add_library(Common STATIC Common/Math/lin/vec3.h Common/Math/math_util.cpp Common/Math/math_util.h + Common/Net/HTTPClient.cpp + Common/Net/HTTPClient.h + Common/Net/HTTPHeaders.cpp + Common/Net/HTTPHeaders.h + Common/Net/HTTPServer.cpp + Common/Net/HTTPServer.h + Common/Net/Resolve.cpp + Common/Net/Resolve.h + Common/Net/Sinks.cpp + Common/Net/Sinks.h + Common/Net/URL.cpp + Common/Net/URL.h + Common/Net/WebsocketServer.cpp + Common/Net/WebsocketServer.h Common/Profiler/Profiler.cpp Common/Profiler/Profiler.h Common/System/Display.cpp @@ -503,6 +529,22 @@ add_library(Common STATIC Common/Thread/ThreadUtil.h Common/Thread/ThreadPool.cpp Common/Thread/ThreadPool.h + Common/UI/Root.cpp + Common/UI/Root.h + Common/UI/Screen.cpp + Common/UI/Screen.h + Common/UI/UI.cpp + Common/UI/UI.h + Common/UI/Context.cpp + Common/UI/Context.h + Common/UI/UIScreen.cpp + Common/UI/UIScreen.h + Common/UI/Tween.cpp + Common/UI/Tween.h + Common/UI/View.cpp + Common/UI/View.h + Common/UI/ViewGroup.cpp + Common/UI/ViewGroup.h Common/BitScan.h Common/BitSet.h Common/Buffer.h @@ -520,8 +562,6 @@ add_library(Common STATIC Common/FixedSizeQueue.h Common/ExceptionHandlerSetup.cpp Common/ExceptionHandlerSetup.h - Common/FileUtil.cpp - Common/FileUtil.h Common/Hashmaps.h Common/Log.h Common/Log.cpp @@ -1011,10 +1051,6 @@ endif() add_library(native STATIC ${nativeExtra} - ext/native/file/fd_util.cpp - ext/native/file/fd_util.h - ext/native/file/file_util.cpp - ext/native/file/file_util.h ext/native/gfx/gl_common.h ext/native/gfx/gl_debug_log.cpp ext/native/gfx/gl_debug_log.h @@ -1040,46 +1076,10 @@ add_library(native STATIC ext/native/gfx_es2/glsl_program.h ext/native/gfx_es2/gl3stub.c ext/native/gfx_es2/gl3stub.h - ext/native/image/png_load.cpp - ext/native/image/png_load.h - ext/native/image/zim_load.cpp - ext/native/image/zim_load.h - ext/native/image/zim_save.cpp - ext/native/image/zim_save.h - ext/native/net/http_client.cpp - ext/native/net/http_client.h - ext/native/net/http_headers.cpp - ext/native/net/http_headers.h - ext/native/net/http_server.cpp - ext/native/net/http_server.h - ext/native/net/resolve.cpp - ext/native/net/resolve.h - ext/native/net/sinks.cpp - ext/native/net/sinks.h - ext/native/net/url.cpp - ext/native/net/url.h - ext/native/net/websocket_server.cpp - ext/native/net/websocket_server.h ext/native/thin3d/thin3d.cpp ext/native/thin3d/thin3d.h ext/native/thin3d/thin3d_create.h ${THIN3D_PLATFORMS} - ext/native/ui/root.cpp - ext/native/ui/root.h - ext/native/ui/screen.cpp - ext/native/ui/screen.h - ext/native/ui/ui.cpp - ext/native/ui/ui.h - ext/native/ui/ui_context.cpp - ext/native/ui/ui_context.h - ext/native/ui/ui_screen.cpp - ext/native/ui/ui_screen.h - ext/native/ui/ui_tween.cpp - ext/native/ui/ui_tween.h - ext/native/ui/view.cpp - ext/native/ui/view.h - ext/native/ui/viewgroup.cpp - ext/native/ui/viewgroup.h ext/jpge/jpgd.cpp ext/jpge/jpgd.h ext/jpge/jpge.cpp diff --git a/Common/ArmCPUDetect.cpp b/Common/ArmCPUDetect.cpp index 5a1d53fc4a..540f7d7b0c 100644 --- a/Common/ArmCPUDetect.cpp +++ b/Common/ArmCPUDetect.cpp @@ -22,10 +22,11 @@ #if PPSSPP_ARCH(ARM) || PPSSPP_ARCH(ARM64) #include -#include "Common.h" -#include "CPUDetect.h" -#include "StringUtils.h" -#include "FileUtil.h" + +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/StringUtils.h" +#include "Common/File/FileUtil.h" #include "Common/Data/Encoding/Utf8.h" #if PPSSPP_PLATFORM(WINDOWS) diff --git a/Common/Buffer.cpp b/Common/Buffer.cpp index 78302f60fe..423c2cfb3c 100644 --- a/Common/Buffer.cpp +++ b/Common/Buffer.cpp @@ -17,8 +17,7 @@ #define MSG_NOSIGNAL 0x00 #endif -#include "file/fd_util.h" - +#include "Common/File/FileDescriptor.h" #include "Common/TimeUtil.h" #include "Common/Buffer.h" #include "Common/Log.h" diff --git a/Common/CPUDetect.cpp b/Common/CPUDetect.cpp index 1acbb1c680..9910f651cc 100644 --- a/Common/CPUDetect.cpp +++ b/Common/CPUDetect.cpp @@ -29,11 +29,9 @@ #include #include -#include "file/file_util.h" - #include "Common/Common.h" #include "Common/CPUDetect.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #if defined(_WIN32) && !defined(__MINGW32__) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index e319b38ae2..385b483e56 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -136,7 +136,7 @@ _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_M_IX86=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) Common/DbgNew.h MultiThreadedDebug - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. StreamingSIMDExtensions2 Precise true @@ -158,7 +158,7 @@ Common/DbgNew.h MultiThreadedDebug _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. NotSet Precise false @@ -181,7 +181,7 @@ Common/DbgNew.h MultiThreadedDebug _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. NotSet Precise false @@ -205,7 +205,7 @@ MultiThreadedDebug _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. NotSet Precise false @@ -234,7 +234,7 @@ false StreamingSIMDExtensions2 Precise - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. Speed true false @@ -260,7 +260,7 @@ USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_M_X64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. false NotSet Precise @@ -291,7 +291,7 @@ USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. false NotSet Precise @@ -322,7 +322,7 @@ USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) - ../ext/native;../ext/snappy;../ext/glslang;../ext;../ext/zlib;.. + ../ext/native;../ext/snappy;../ext/glslang;../ext/libpng17;../ext;../ext/zlib;.. false NotSet Precise @@ -371,14 +371,20 @@ + + + + + + @@ -393,6 +399,13 @@ + + + + + + + @@ -413,7 +426,6 @@ - @@ -463,6 +475,14 @@ + + + + + + + + @@ -655,12 +675,18 @@ + + + + + + @@ -675,6 +701,13 @@ + + + + + + + @@ -684,7 +717,6 @@ - true true @@ -734,6 +766,14 @@ + + + + + + + + diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 397028e32a..04386e630e 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -7,7 +7,6 @@ - @@ -238,12 +237,74 @@ System + + File + + + File + + + File + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Data\Format + + + Data\Format + + + Data\Format + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + - @@ -451,6 +512,69 @@ System + + File + + + File + + + File + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Data\Format + + + Data\Format + + + Data\Format + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + @@ -528,6 +652,12 @@ {89ddf0bd-3fc4-4a69-87a7-b82cfc412e0a} + + {b338dd13-cdae-4ef4-b122-b22967ae9bcb} + + + {6a61d762-e71c-4428-8cef-c7ddda405ba5} + diff --git a/Common/Data/Format/JSONReader.cpp b/Common/Data/Format/JSONReader.cpp index 125a136258..4f299eab4a 100644 --- a/Common/Data/Format/JSONReader.cpp +++ b/Common/Data/Format/JSONReader.cpp @@ -1,4 +1,5 @@ #include "Common/File/VFS/VFS.h" +#include "Common/File/FileUtil.h" #include "Common/Data/Format/JSONReader.h" namespace json { diff --git a/Common/Data/Format/PNGLoad.cpp b/Common/Data/Format/PNGLoad.cpp new file mode 100644 index 0000000000..7c5baf0e75 --- /dev/null +++ b/Common/Data/Format/PNGLoad.cpp @@ -0,0 +1,58 @@ +#include +#include +#include +#include + +#include "Common/Data/Format/PNGLoad.h" +#include "Common/Log.h" + +// *image_data_ptr should be deleted with free() +// return value of 1 == success. +int pngLoad(const char *file, int *pwidth, int *pheight, unsigned char **image_data_ptr) { + png_image png; + memset(&png, 0, sizeof(png)); + png.version = PNG_IMAGE_VERSION; + + png_image_begin_read_from_file(&png, file); + + if (PNG_IMAGE_FAILED(png)) + { + ERROR_LOG(IO, "pngLoad: %s", png.message); + return 0; + } + *pwidth = png.width; + *pheight = png.height; + png.format = PNG_FORMAT_RGBA; + + int stride = PNG_IMAGE_ROW_STRIDE(png); + *image_data_ptr = (unsigned char *)malloc(PNG_IMAGE_SIZE(png)); + png_image_finish_read(&png, NULL, *image_data_ptr, stride, NULL); + return 1; +} + +int pngLoadPtr(const unsigned char *input_ptr, size_t input_len, int *pwidth, int *pheight, unsigned char **image_data_ptr) { + png_image png{}; + png.version = PNG_IMAGE_VERSION; + + png_image_begin_read_from_memory(&png, input_ptr, input_len); + + if (PNG_IMAGE_FAILED(png)) { + ERROR_LOG(IO, "pngLoad: %s", png.message); + return 0; + } + *pwidth = png.width; + *pheight = png.height; + png.format = PNG_FORMAT_RGBA; + + int stride = PNG_IMAGE_ROW_STRIDE(png); + + size_t size = PNG_IMAGE_SIZE(png); + if (!size) { + ERROR_LOG(IO, "pngLoad: empty image"); + return 0; + } + + *image_data_ptr = (unsigned char *)malloc(size); + png_image_finish_read(&png, NULL, *image_data_ptr, stride, NULL); + return 1; +} diff --git a/ext/native/image/png_load.h b/Common/Data/Format/PNGLoad.h similarity index 65% rename from ext/native/image/png_load.h rename to Common/Data/Format/PNGLoad.h index bae14c210e..48eaf6a1db 100644 --- a/ext/native/image/png_load.h +++ b/Common/Data/Format/PNGLoad.h @@ -4,9 +4,9 @@ // *image_data_ptr should be deleted with free() // return value of 1 == success. int pngLoad(const char *file, int *pwidth, - int *pheight, unsigned char **image_data_ptr, bool flip); + int *pheight, unsigned char **image_data_ptr); int pngLoadPtr(const unsigned char *input_ptr, size_t input_len, int *pwidth, - int *pheight, unsigned char **image_data_ptr, bool flip); + int *pheight, unsigned char **image_data_ptr); #endif // _PNG_LOAD_H diff --git a/ext/native/image/zim_load.cpp b/Common/Data/Format/ZIMLoad.cpp similarity index 97% rename from ext/native/image/zim_load.cpp rename to Common/Data/Format/ZIMLoad.cpp index 80ed88d3c2..45f23e2857 100644 --- a/ext/native/image/zim_load.cpp +++ b/Common/Data/Format/ZIMLoad.cpp @@ -1,13 +1,13 @@ -#include -#include -#include +#include +#include +#include #include "zlib.h" -#include "image/zim_load.h" -#include "Common/Math/math_util.h" -#include "Common/File/VFS/VFS.h" #include "Common/Log.h" +#include "Common/Data/Format/ZIMLoad.h" +#include "Common/Math/math_util.h" +#include "Common/File/VFS/VFS.h" int ezuncompress(unsigned char* pDest, long* pnDestLen, const unsigned char* pSrc, long nSrcLen) { z_stream stream; diff --git a/ext/native/image/zim_load.h b/Common/Data/Format/ZIMLoad.h similarity index 100% rename from ext/native/image/zim_load.h rename to Common/Data/Format/ZIMLoad.h diff --git a/ext/native/image/zim_save.cpp b/Common/Data/Format/ZIMSave.cpp similarity index 98% rename from ext/native/image/zim_save.cpp rename to Common/Data/Format/ZIMSave.cpp index f46ca72ef7..4f5fb230c6 100644 --- a/ext/native/image/zim_save.cpp +++ b/Common/Data/Format/ZIMSave.cpp @@ -2,11 +2,11 @@ #include #include -#include "image/zim_load.h" -#include "image/zim_save.h" #include "zlib.h" #include "Common/Log.h" +#include "Common/Data/Format/ZIMLoad.h" +#include "Common/Data/Format/ZIMSave.h" static const char magic[5] = "ZIMG"; diff --git a/ext/native/image/zim_save.h b/Common/Data/Format/ZIMSave.h similarity index 90% rename from ext/native/image/zim_save.h rename to Common/Data/Format/ZIMSave.h index c8938a91e9..90158d3d55 100644 --- a/ext/native/image/zim_save.h +++ b/Common/Data/Format/ZIMSave.h @@ -4,7 +4,7 @@ #include // For the type enums etc. -#include "zim_load.h" +#include "Common/Data/Format/ZIMLoad.h" // SaveZIM's responsibility: // * Write the ZIM format diff --git a/ext/native/file/file_util.cpp b/Common/File/DirListing.cpp similarity index 64% rename from ext/native/file/file_util.cpp rename to Common/File/DirListing.cpp index 55c31bb677..89c30e35b7 100644 --- a/ext/native/file/file_util.cpp +++ b/Common/File/DirListing.cpp @@ -18,10 +18,9 @@ #include #include -#include "file/file_util.h" #include "Common/Data/Encoding/Utf8.h" - #include "Common/StringUtils.h" +#include "Common/File/DirListing.h" #if !defined(__linux__) && !defined(_WIN32) && !defined(__QNX__) #define stat64 stat @@ -34,134 +33,14 @@ #define fileno #endif // HAVE_LIBNX -FILE *openCFile(const std::string &filename, const char *mode) -{ -#if defined(_WIN32) && defined(UNICODE) - return _wfopen(ConvertUTF8ToWString(filename).c_str(), ConvertUTF8ToWString(mode).c_str()); -#else - return fopen(filename.c_str(), mode); -#endif -} - -bool writeStringToFile(bool text_file, const std::string &str, const char *filename) -{ - FILE *f = openCFile(filename, text_file ? "w" : "wb"); - if (!f) - return false; - size_t len = str.size(); - if (len != fwrite(str.data(), 1, str.size(), f)) - { - fclose(f); - return false; - } - fclose(f); - return true; -} - -bool writeDataToFile(bool text_file, const void* data, const unsigned int size, const char *filename) -{ - FILE *f = openCFile(filename, text_file ? "w" : "wb"); - if (!f) - return false; - size_t len = size; - if (len != fwrite(data, 1, len, f)) - { - fclose(f); - return false; - } - fclose(f); - return true; -} - -uint64_t GetSize(FILE *f) -{ - // This will only support 64-bit when large file support is available. - // That won't be the case on some versions of Android, at least. -#if defined(__ANDROID__) || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS < 64) - int fd = fileno(f); - - off64_t pos = lseek64(fd, 0, SEEK_CUR); - off64_t size = lseek64(fd, 0, SEEK_END); - if (size != pos && lseek64(fd, pos, SEEK_SET) != pos) { - // Should error here. - return 0; - } - return size; -#else -#ifdef _WIN32 - uint64_t pos = _ftelli64(f); -#else - uint64_t pos = ftello(f); -#endif - if (fseek(f, 0, SEEK_END) != 0) { - return 0; - } -#ifdef _WIN32 - uint64_t size = _ftelli64(f); - // Reset the seek position to where it was when we started. - if (size != pos && _fseeki64(f, pos, SEEK_SET) != 0) { -#else - uint64_t size = ftello(f); - // Reset the seek position to where it was when we started. - if (size != pos && fseeko(f, pos, SEEK_SET) != 0) { -#endif - // Should error here. - return 0; - } - return size; -#endif -} - -bool readFileToString(bool text_file, const char *filename, std::string &str) -{ - FILE *f = openCFile(filename, text_file ? "r" : "rb"); - if (!f) - return false; - size_t len = (size_t)GetSize(f); - char *buf = new char[len + 1]; - buf[fread(buf, 1, len, f)] = 0; - str = std::string(buf, len); - fclose(f); - delete [] buf; - return true; -} - -uint8_t *ReadLocalFile(const char *filename, size_t *size) { - FILE *file = openCFile(filename, "rb"); - if (!file) { - *size = 0; - return nullptr; - } - fseek(file, 0, SEEK_END); - size_t f_size = ftell(file); - if ((long)f_size < 0) { - *size = 0; - fclose(file); - return nullptr; - } - fseek(file, 0, SEEK_SET); - uint8_t *contents = new uint8_t[f_size + 1]; - if (fread(contents, 1, f_size, file) != f_size) { - delete[] contents; - contents = nullptr; - *size = 0; - } else { - contents[f_size] = 0; - *size = f_size; - } - fclose(file); - return contents; -} - - // Returns true if filename is a directory -bool isDirectory(const std::string &filename) { +bool isDirectory(const std::string & filename) { FileInfo info; getFileInfo(filename.c_str(), &info); return info.isDirectory; } -bool getFileInfo(const char *path, FileInfo *fileInfo) { +bool getFileInfo(const char *path, FileInfo * fileInfo) { // TODO: Expand relative paths? fileInfo->fullName = path; @@ -204,17 +83,17 @@ bool getFileInfo(const char *path, FileInfo *fileInfo) { return true; } -std::string getFileExtension(const std::string &fn) { +std::string getFileExtension(const std::string & fn) { int pos = (int)fn.rfind("."); if (pos < 0) return ""; - std::string ext = fn.substr(pos+1); + std::string ext = fn.substr(pos + 1); for (size_t i = 0; i < ext.size(); i++) { ext[i] = tolower(ext[i]); } return ext; } -bool FileInfo::operator <(const FileInfo &other) const { +bool FileInfo::operator <(const FileInfo & other) const { if (isDirectory && !other.isDirectory) return true; else if (!isDirectory && other.isDirectory) @@ -225,7 +104,7 @@ bool FileInfo::operator <(const FileInfo &other) const { return false; } -size_t getFilesInDir(const char *directory, std::vector *files, const char *filter, int flags) { +size_t getFilesInDir(const char *directory, std::vector * files, const char *filter, int flags) { size_t foundEntries = 0; std::set filters; if (filter) { @@ -320,7 +199,7 @@ size_t getFilesInDir(const char *directory, std::vector *files, const return foundEntries; } -int64_t getDirectoryRecursiveSize(const std::string &path, const char *filter, int flags) { +int64_t getDirectoryRecursiveSize(const std::string & path, const char *filter, int flags) { std::vector fileInfo; getFilesInDir(path.c_str(), &fileInfo, filter, flags); int64_t sizeSum = 0; @@ -356,7 +235,7 @@ std::vector getWindowsDrives() str.pop_back(); // we don't want the final backslash str += "/"; drives.push_back(str); - + // advance to next drive while (*drive++) {} } diff --git a/ext/native/file/file_util.h b/Common/File/DirListing.h similarity index 67% rename from ext/native/file/file_util.h rename to Common/File/DirListing.h index 3b2fb8ac6a..965ca5d6bf 100644 --- a/ext/native/file/file_util.h +++ b/Common/File/DirListing.h @@ -7,14 +7,6 @@ #include -// Whole-file reading/writing -bool writeStringToFile(bool text_file, const std::string &str, const char *filename); -bool writeDataToFile(bool text_file, const void* data, const unsigned int size, const char *filename); - -bool readFileToString(bool text_file, const char *filename, std::string &str); -// Return value must be delete[]-d. -uint8_t *ReadLocalFile(const char *filename, size_t *size); - // Beginnings of a directory utility system. TODO: Improve. struct FileInfo { diff --git a/ext/native/file/fd_util.cpp b/Common/File/FileDescriptor.cpp similarity index 99% rename from ext/native/file/fd_util.cpp rename to Common/File/FileDescriptor.cpp index 9851d655b6..0c40ee1da7 100644 --- a/ext/native/file/fd_util.cpp +++ b/Common/File/FileDescriptor.cpp @@ -1,5 +1,4 @@ #include "ppsspp_config.h" -#include "file/fd_util.h" #include #include @@ -20,6 +19,7 @@ #include "Common/Common.h" #include "Common/Log.h" +#include "Common/File/FileDescriptor.h" namespace fd_util { diff --git a/ext/native/file/fd_util.h b/Common/File/FileDescriptor.h similarity index 100% rename from ext/native/file/fd_util.h rename to Common/File/FileDescriptor.h diff --git a/Common/FileUtil.cpp b/Common/File/FileUtil.cpp similarity index 90% rename from Common/FileUtil.cpp rename to Common/File/FileUtil.cpp index 54c6f8da85..05af060d95 100644 --- a/Common/FileUtil.cpp +++ b/Common/File/FileUtil.cpp @@ -28,12 +28,12 @@ #include #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Common/SysError.h" #ifdef _WIN32 -#include "CommonWindows.h" +#include "Common/CommonWindows.h" #include #include // for SHGetFolderPath #include @@ -618,20 +618,43 @@ uint64_t GetFileSize(const std::string &filename) { #endif } -// Overloaded GetSize, accepts FILE* -uint64_t GetFileSize(FILE *f) { - // can't use off_t here because it can be 32-bit - uint64_t pos = ftello(f); - if (fseeko(f, 0, SEEK_END) != 0) { - ERROR_LOG(COMMON, "GetSize: seek failed %p: %s", f, GetLastErrorMsg().c_str()); - return 0; - } - uint64_t size = ftello(f); - if ((size != pos) && (fseeko(f, pos, SEEK_SET) != 0)) { - ERROR_LOG(COMMON, "GetSize: seek failed %p: %s", f, GetLastErrorMsg().c_str()); +uint64_t GetFileSize(FILE *f) +{ + // This will only support 64-bit when large file support is available. + // That won't be the case on some versions of Android, at least. +#if defined(__ANDROID__) || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS < 64) + int fd = fileno(f); + + off64_t pos = lseek64(fd, 0, SEEK_CUR); + off64_t size = lseek64(fd, 0, SEEK_END); + if (size != pos && lseek64(fd, pos, SEEK_SET) != pos) { + // Should error here. return 0; } return size; +#else +#ifdef _WIN32 + uint64_t pos = _ftelli64(f); +#else + uint64_t pos = ftello(f); +#endif + if (fseek(f, 0, SEEK_END) != 0) { + return 0; + } +#ifdef _WIN32 + uint64_t size = _ftelli64(f); + // Reset the seek position to where it was when we started. + if (size != pos && _fseeki64(f, pos, SEEK_SET) != 0) { +#else + uint64_t size = ftello(f); + // Reset the seek position to where it was when we started. + if (size != pos && fseeko(f, pos, SEEK_SET) != 0) { +#endif + // Should error here. + return 0; + } + return size; +#endif } // creates an empty file filename, returns true on success @@ -955,3 +978,74 @@ bool IOFile::Resize(uint64_t size) } } // namespace + +bool readFileToString(bool text_file, const char *filename, std::string & str) +{ + FILE *f = File::OpenCFile(filename, text_file ? "r" : "rb"); + if (!f) + return false; + size_t len = (size_t)File::GetFileSize(f); + char *buf = new char[len + 1]; + buf[fread(buf, 1, len, f)] = 0; + str = std::string(buf, len); + fclose(f); + delete[] buf; + return true; +} + +uint8_t *ReadLocalFile(const char *filename, size_t * size) { + FILE *file = File::OpenCFile(filename, "rb"); + if (!file) { + *size = 0; + return nullptr; + } + fseek(file, 0, SEEK_END); + size_t f_size = ftell(file); + if ((long)f_size < 0) { + *size = 0; + fclose(file); + return nullptr; + } + fseek(file, 0, SEEK_SET); + uint8_t *contents = new uint8_t[f_size + 1]; + if (fread(contents, 1, f_size, file) != f_size) { + delete[] contents; + contents = nullptr; + *size = 0; + } else { + contents[f_size] = 0; + *size = f_size; + } + fclose(file); + return contents; +} + +bool writeStringToFile(bool text_file, const std::string &str, const char *filename) +{ + FILE *f = File::OpenCFile(filename, text_file ? "w" : "wb"); + if (!f) + return false; + size_t len = str.size(); + if (len != fwrite(str.data(), 1, str.size(), f)) + { + fclose(f); + return false; + } + fclose(f); + return true; +} + +bool writeDataToFile(bool text_file, const void* data, const unsigned int size, const char *filename) +{ + FILE *f = File::OpenCFile(filename, text_file ? "w" : "wb"); + if (!f) + return false; + size_t len = size; + if (len != fwrite(data, 1, len, f)) + { + fclose(f); + return false; + } + fclose(f); + return true; +} diff --git a/Common/FileUtil.h b/Common/File/FileUtil.h similarity index 91% rename from Common/FileUtil.h rename to Common/File/FileUtil.h index 08f1c42615..a191f554eb 100644 --- a/Common/FileUtil.h +++ b/Common/File/FileUtil.h @@ -24,7 +24,7 @@ #include #include -#include "Common.h" +#include "Common/Common.h" #ifdef _MSC_VER inline struct tm* localtime_r(const time_t *clock, struct tm *result) { @@ -192,3 +192,13 @@ private: }; } // namespace + +// TODO: Refactor, this was moved from the old file_util.cpp. + +// Whole-file reading/writing +bool writeStringToFile(bool text_file, const std::string &str, const char *filename); +bool writeDataToFile(bool text_file, const void* data, const unsigned int size, const char *filename); + +bool readFileToString(bool text_file, const char *filename, std::string &str); +// Return value must be delete[]-d. +uint8_t *ReadLocalFile(const char *filename, size_t *size); diff --git a/Common/File/PathBrowser.cpp b/Common/File/PathBrowser.cpp index a57390d447..712e5a95e6 100644 --- a/Common/File/PathBrowser.cpp +++ b/Common/File/PathBrowser.cpp @@ -2,8 +2,8 @@ #include #include -#include "net/http_client.h" -#include "net/url.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/URL.h" #include "Common/File/PathBrowser.h" #include "Common/StringUtils.h" diff --git a/Common/File/PathBrowser.h b/Common/File/PathBrowser.h index bdbce21250..01da52e89f 100644 --- a/Common/File/PathBrowser.h +++ b/Common/File/PathBrowser.h @@ -6,9 +6,9 @@ #include #include #include -#include +#include -#include "file/file_util.h" +#include "Common/File/DirListing.h" // Abstraction above path that lets you navigate easily. // "/" is a special path that means the root of the file system. On Windows, diff --git a/Common/File/VFS/AssetReader.h b/Common/File/VFS/AssetReader.h index 76b5a31439..5dcf98efc8 100644 --- a/Common/File/VFS/AssetReader.h +++ b/Common/File/VFS/AssetReader.h @@ -9,7 +9,6 @@ #include #include "Common/File/VFS/VFS.h" -#include "file/file_util.h" // Direct readers. deallocate using delete []. uint8_t *ReadLocalFile(const char *filename, size_t *size); diff --git a/Common/File/VFS/VFS.h b/Common/File/VFS/VFS.h index b823519865..693e8fbc1d 100644 --- a/Common/File/VFS/VFS.h +++ b/Common/File/VFS/VFS.h @@ -1,7 +1,8 @@ #pragma once #include -#include "file/file_util.h" + +#include "Common/File/DirListing.h" // Basic virtual file system. Used to manage assets on Android, where we have to // read them manually out of the APK zipfile, while being able to run on other diff --git a/Common/LogManager.cpp b/Common/LogManager.cpp index 66c85c70b8..1ecea857e8 100644 --- a/Common/LogManager.cpp +++ b/Common/LogManager.cpp @@ -25,7 +25,7 @@ #include "Common/LogManager.h" #include "Common/ConsoleListener.h" #include "Common/Timer.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" // Don't need to savestate this. diff --git a/Common/MemArenaDarwin.cpp b/Common/MemArenaDarwin.cpp index 4d197c1f85..d35fb7f84d 100644 --- a/Common/MemArenaDarwin.cpp +++ b/Common/MemArenaDarwin.cpp @@ -21,12 +21,6 @@ #include #include - -#include "Common/Log.h" -#include "Common/FileUtil.h" -#include "Common/MemoryUtil.h" -#include "Common/MemArena.h" - #include #include #include @@ -36,6 +30,11 @@ #include #include +#include "Common/Log.h" +#include "Common/File/FileUtil.h" +#include "Common/MemoryUtil.h" +#include "Common/MemArena.h" + size_t MemArena::roundup(size_t x) { return x; } diff --git a/Common/MemArenaPosix.cpp b/Common/MemArenaPosix.cpp index 016be57ce5..65a812001b 100644 --- a/Common/MemArenaPosix.cpp +++ b/Common/MemArenaPosix.cpp @@ -19,18 +19,17 @@ #if !defined(_WIN32) && !defined(ANDROID) && !defined(__APPLE__) -#include - -#include "Common/FileUtil.h" -#include "Common/MemoryUtil.h" -#include "Common/MemArena.h" -#include "Common/Log.h" - #include #include #include #include #include +#include + +#include "Common/Log.h" +#include "Common/File/FileUtil.h" +#include "Common/MemoryUtil.h" +#include "Common/MemArena.h" static const std::string tmpfs_location = "/dev/shm"; static const std::string tmpfs_ram_temp_file = "/dev/shm/gc_mem.tmp"; diff --git a/ext/native/net/http_client.cpp b/Common/Net/HTTPClient.cpp similarity index 99% rename from ext/native/net/http_client.cpp rename to Common/Net/HTTPClient.cpp index 60c1ca8a90..41cf350625 100644 --- a/ext/native/net/http_client.cpp +++ b/Common/Net/HTTPClient.cpp @@ -1,4 +1,4 @@ -#include "net/http_client.h" +#include "Common/Net/HTTPClient.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" @@ -20,10 +20,10 @@ #include #include -#include "file/fd_util.h" -#include "net/resolve.h" -#include "net/url.h" +#include "Common/Net/Resolve.h" +#include "Common/Net/URL.h" +#include "Common/File/FileDescriptor.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Compression.h" #include "Common/Buffer.h" diff --git a/ext/native/net/http_client.h b/Common/Net/HTTPClient.h similarity index 99% rename from ext/native/net/http_client.h rename to Common/Net/HTTPClient.h index 32490dc40b..731ff75dd5 100644 --- a/ext/native/net/http_client.h +++ b/Common/Net/HTTPClient.h @@ -5,7 +5,7 @@ #include #include -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #ifdef _WIN32 #ifndef NOMINMAX diff --git a/ext/native/net/http_headers.cpp b/Common/Net/HTTPHeaders.cpp similarity index 97% rename from ext/native/net/http_headers.cpp rename to Common/Net/HTTPHeaders.cpp index ca370dad9c..acb554ee70 100644 --- a/ext/native/net/http_headers.cpp +++ b/Common/Net/HTTPHeaders.cpp @@ -1,13 +1,13 @@ -#include "net/http_headers.h" +#include "Common/Net/HTTPHeaders.h" #include #include #include -#include "file/fd_util.h" -#include "net/sinks.h" +#include "Common/Net/Sinks.h" #include "Common/Log.h" +#include "Common/File/FileDescriptor.h" #include "Common/StringUtils.h" namespace http { diff --git a/ext/native/net/http_headers.h b/Common/Net/HTTPHeaders.h similarity index 100% rename from ext/native/net/http_headers.h rename to Common/Net/HTTPHeaders.h diff --git a/ext/native/net/http_server.cpp b/Common/Net/HTTPServer.cpp similarity index 98% rename from ext/native/net/http_server.cpp rename to Common/Net/HTTPServer.cpp index 5569923cd3..da114da85a 100644 --- a/ext/native/net/http_server.cpp +++ b/Common/Net/HTTPServer.cpp @@ -34,9 +34,9 @@ #include #include -#include "file/fd_util.h" -#include "net/http_server.h" -#include "net/sinks.h" +#include "Common/Net/HTTPServer.h" +#include "Common/Net/Sinks.h" +#include "Common/File/FileDescriptor.h" #include "Common/Thread/Executor.h" #include "Common/Buffer.h" diff --git a/ext/native/net/http_server.h b/Common/Net/HTTPServer.h similarity index 97% rename from ext/native/net/http_server.h rename to Common/Net/HTTPServer.h index 7102f963b2..9cfdf2fc1e 100644 --- a/ext/native/net/http_server.h +++ b/Common/Net/HTTPServer.h @@ -3,8 +3,8 @@ #include #include -#include "net/http_headers.h" -#include "net/resolve.h" +#include "Common/Net/HTTPHeaders.h" +#include "Common/Net/Resolve.h" #include "Common/Thread/Executor.h" namespace net { diff --git a/ext/native/net/resolve.cpp b/Common/Net/Resolve.cpp similarity index 99% rename from ext/native/net/resolve.cpp rename to Common/Net/Resolve.cpp index a6e07c0635..aac2cdb6fd 100644 --- a/ext/native/net/resolve.cpp +++ b/Common/Net/Resolve.cpp @@ -1,5 +1,5 @@ #include "ppsspp_config.h" -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include #include diff --git a/ext/native/net/resolve.h b/Common/Net/Resolve.h similarity index 100% rename from ext/native/net/resolve.h rename to Common/Net/Resolve.h diff --git a/ext/native/net/sinks.cpp b/Common/Net/Sinks.cpp similarity index 99% rename from ext/native/net/sinks.cpp rename to Common/Net/Sinks.cpp index dbfa8643df..2d15de15cf 100644 --- a/ext/native/net/sinks.cpp +++ b/Common/Net/Sinks.cpp @@ -24,10 +24,10 @@ #include #include -#include "net/sinks.h" -#include "file/fd_util.h" +#include "Common/Net/Sinks.h" #include "Common/Log.h" +#include "Common/File/FileDescriptor.h" #ifndef MSG_NOSIGNAL // Default value to 0x00 (do nothing) in systems where it's not supported diff --git a/ext/native/net/sinks.h b/Common/Net/Sinks.h similarity index 100% rename from ext/native/net/sinks.h rename to Common/Net/Sinks.h diff --git a/ext/native/net/url.cpp b/Common/Net/URL.cpp similarity index 99% rename from ext/native/net/url.cpp rename to Common/Net/URL.cpp index b3aa5ff25d..681fc45ff2 100644 --- a/ext/native/net/url.cpp +++ b/Common/Net/URL.cpp @@ -1,7 +1,6 @@ -#include "net/url.h" - #include "Common/Log.h" #include "Common/StringUtils.h" +#include "Common/Net/URL.h" const char *UrlEncoder::unreservedChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~"; const char *UrlEncoder::hexChars = "0123456789ABCDEF"; diff --git a/ext/native/net/url.h b/Common/Net/URL.h similarity index 100% rename from ext/native/net/url.h rename to Common/Net/URL.h diff --git a/ext/native/net/websocket_server.cpp b/Common/Net/WebsocketServer.cpp similarity index 99% rename from ext/native/net/websocket_server.cpp rename to Common/Net/WebsocketServer.cpp index 60f41c2290..5af6bf2bdb 100644 --- a/ext/native/net/websocket_server.cpp +++ b/Common/Net/WebsocketServer.cpp @@ -16,9 +16,9 @@ #endif #include "Common/Data/Encoding/Base64.h" -#include "net/http_server.h" -#include "net/sinks.h" -#include "net/websocket_server.h" +#include "Common/Net/HTTPServer.h" +#include "Common/Net/Sinks.h" +#include "Common/Net/WebsocketServer.h" #include "Common/Crypto/sha1.h" #include "Common/Log.h" diff --git a/ext/native/net/websocket_server.h b/Common/Net/WebsocketServer.h similarity index 97% rename from ext/native/net/websocket_server.h rename to Common/Net/WebsocketServer.h index 2c4c59739e..7a05b0f03a 100644 --- a/ext/native/net/websocket_server.h +++ b/Common/Net/WebsocketServer.h @@ -2,8 +2,9 @@ #include #include -#include "net/http_server.h" -#include "net/sinks.h" + +#include "Common/Net/HTTPServer.h" +#include "Common/Net/Sinks.h" namespace net { diff --git a/Common/Serialize/Serializer.cpp b/Common/Serialize/Serializer.cpp index c2eca8731e..4738b829f3 100644 --- a/Common/Serialize/Serializer.cpp +++ b/Common/Serialize/Serializer.cpp @@ -21,7 +21,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" PointerWrapSection PointerWrap::Section(const char *title, int ver) { diff --git a/ext/native/ui/ui_context.cpp b/Common/UI/Context.cpp similarity index 99% rename from ext/native/ui/ui_context.cpp rename to Common/UI/Context.cpp index 68feedb298..d8f45b5737 100644 --- a/ext/native/ui/ui_context.cpp +++ b/Common/UI/Context.cpp @@ -4,9 +4,9 @@ #include "Common/System/Display.h" #include "Common/System/System.h" -#include "ui/ui.h" -#include "ui/view.h" -#include "ui/ui_context.h" +#include "Common/UI/UI.h" +#include "Common/UI/View.h" +#include "Common/UI/Context.h" #include "gfx_es2/draw_buffer.h" #include "gfx_es2/draw_text.h" diff --git a/ext/native/ui/ui_context.h b/Common/UI/Context.h similarity index 100% rename from ext/native/ui/ui_context.h rename to Common/UI/Context.h diff --git a/ext/native/ui/root.cpp b/Common/UI/Root.cpp similarity index 99% rename from ext/native/ui/root.cpp rename to Common/UI/Root.cpp index 394ee2aa28..73cca79888 100644 --- a/ext/native/ui/root.cpp +++ b/Common/UI/Root.cpp @@ -3,8 +3,8 @@ #include "ppsspp_config.h" -#include "ui/root.h" -#include "ui/viewgroup.h" +#include "Common/UI/Root.h" +#include "Common/UI/ViewGroup.h" #include "Common/Log.h" #include "Common/TimeUtil.h" diff --git a/ext/native/ui/root.h b/Common/UI/Root.h similarity index 97% rename from ext/native/ui/root.h rename to Common/UI/Root.h index 052ced4f33..c19dc44acc 100644 --- a/ext/native/ui/root.h +++ b/Common/UI/Root.h @@ -2,7 +2,7 @@ #include -#include "ui/ui_context.h" +#include "Common/UI/Context.h" #include "Common/Input/InputState.h" namespace UI { diff --git a/ext/native/ui/screen.cpp b/Common/UI/Screen.cpp similarity index 98% rename from ext/native/ui/screen.cpp rename to Common/UI/Screen.cpp index 97f5f2c567..f8f4cd10dc 100644 --- a/ext/native/ui/screen.cpp +++ b/Common/UI/Screen.cpp @@ -1,9 +1,9 @@ #include "Common/System/Display.h" #include "Common/Input/InputState.h" -#include "ui/root.h" -#include "ui/screen.h" -#include "ui/ui.h" -#include "ui/view.h" +#include "Common/UI/Root.h" +#include "Common/UI/Screen.h" +#include "Common/UI/UI.h" +#include "Common/UI/View.h" #include "Common/Log.h" #include "Common/TimeUtil.h" diff --git a/ext/native/ui/screen.h b/Common/UI/Screen.h similarity index 100% rename from ext/native/ui/screen.h rename to Common/UI/Screen.h diff --git a/ext/native/ui/ui_tween.cpp b/Common/UI/Tween.cpp similarity index 96% rename from ext/native/ui/ui_tween.cpp rename to Common/UI/Tween.cpp index 3263c0da70..d06601cb71 100644 --- a/ext/native/ui/ui_tween.cpp +++ b/Common/UI/Tween.cpp @@ -1,7 +1,7 @@ #include "Common/Data/Color/RGBAUtil.h" -#include "ui/ui_tween.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/Tween.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" namespace UI { diff --git a/ext/native/ui/ui_tween.h b/Common/UI/Tween.h similarity index 99% rename from ext/native/ui/ui_tween.h rename to Common/UI/Tween.h index 67d353d074..2786963d55 100644 --- a/ext/native/ui/ui_tween.h +++ b/Common/UI/Tween.h @@ -4,7 +4,7 @@ #include #include #include "Common/TimeUtil.h" -#include "ui/view.h" +#include "Common/UI/View.h" namespace UI { diff --git a/ext/native/ui/ui.cpp b/Common/UI/UI.cpp similarity index 89% rename from ext/native/ui/ui.cpp rename to Common/UI/UI.cpp index 659aa5af5d..3148a0de57 100644 --- a/ext/native/ui/ui.cpp +++ b/Common/UI/UI.cpp @@ -6,8 +6,8 @@ #include #include "Common/Data/Color/RGBAUtil.h" -#include "ui/ui.h" -#include "ui/ui_context.h" +#include "Common/UI/UI.h" +#include "Common/UI/Context.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" diff --git a/ext/native/ui/ui.h b/Common/UI/UI.h similarity index 100% rename from ext/native/ui/ui.h rename to Common/UI/UI.h diff --git a/ext/native/ui/ui_screen.cpp b/Common/UI/UIScreen.cpp similarity index 99% rename from ext/native/ui/ui_screen.cpp rename to Common/UI/UIScreen.cpp index 8ba6eb2bb0..14f793d1e5 100644 --- a/ext/native/ui/ui_screen.cpp +++ b/Common/UI/UIScreen.cpp @@ -6,10 +6,10 @@ #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "Common/Math/curves.h" -#include "ui/ui_screen.h" -#include "ui/ui_context.h" -#include "ui/screen.h" -#include "ui/root.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/Context.h" +#include "Common/UI/Screen.h" +#include "Common/UI/Root.h" #include "Common/Data/Text/I18n.h" #include "gfx_es2/draw_buffer.h" diff --git a/ext/native/ui/ui_screen.h b/Common/UI/UIScreen.h similarity index 99% rename from ext/native/ui/ui_screen.h rename to Common/UI/UIScreen.h index 3184b03d09..aa660b0084 100644 --- a/ext/native/ui/ui_screen.h +++ b/Common/UI/UIScreen.h @@ -3,8 +3,8 @@ #include #include "Common/Math/lin/vec3.h" -#include "ui/screen.h" -#include "ui/viewgroup.h" +#include "Common/UI/Screen.h" +#include "Common/UI/ViewGroup.h" using namespace Lin; diff --git a/ext/native/ui/view.cpp b/Common/UI/View.cpp similarity index 99% rename from ext/native/ui/view.cpp rename to Common/UI/View.cpp index d0182622ca..ece140377b 100644 --- a/ext/native/ui/view.cpp +++ b/Common/UI/View.cpp @@ -6,11 +6,11 @@ #include "gfx_es2/draw_buffer.h" #include "gfx/texture_atlas.h" #include "Common/Data/Encoding/Utf8.h" -#include "ui/ui.h" -#include "ui/view.h" -#include "ui/ui_context.h" -#include "ui/ui_tween.h" -#include "ui/root.h" +#include "Common/UI/UI.h" +#include "Common/UI/View.h" +#include "Common/UI/Context.h" +#include "Common/UI/Tween.h" +#include "Common/UI/Root.h" #include "thin3d/thin3d.h" #include "Common/System/System.h" #include "Common/TimeUtil.h" diff --git a/ext/native/ui/view.h b/Common/UI/View.h similarity index 100% rename from ext/native/ui/view.h rename to Common/UI/View.h diff --git a/ext/native/ui/viewgroup.cpp b/Common/UI/ViewGroup.cpp similarity index 99% rename from ext/native/ui/viewgroup.cpp rename to Common/UI/ViewGroup.cpp index c48f1d22f2..ddd6153548 100644 --- a/ext/native/ui/viewgroup.cpp +++ b/Common/UI/ViewGroup.cpp @@ -5,11 +5,11 @@ #include "Common/Input/KeyCodes.h" #include "Common/Math/curves.h" -#include "ui/ui_context.h" -#include "ui/ui_tween.h" -#include "ui/root.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/Context.h" +#include "Common/UI/Tween.h" +#include "Common/UI/Root.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "gfx_es2/draw_buffer.h" #include "Common/Log.h" diff --git a/ext/native/ui/viewgroup.h b/Common/UI/ViewGroup.h similarity index 99% rename from ext/native/ui/viewgroup.h rename to Common/UI/ViewGroup.h index 7b2ec02fb0..0d17642617 100644 --- a/ext/native/ui/viewgroup.h +++ b/Common/UI/ViewGroup.h @@ -7,7 +7,7 @@ #include "Common/Math/geom2d.h" #include "Common/Input/GestureDetector.h" -#include "ui/view.h" +#include "Common/UI/View.h" namespace UI { diff --git a/Core/AVIDump.cpp b/Core/AVIDump.cpp index fd25806e51..19cbcf1227 100644 --- a/Core/AVIDump.cpp +++ b/Core/AVIDump.cpp @@ -23,7 +23,7 @@ extern "C" { #endif -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/ColorConv.h" #include "Core/Config.h" diff --git a/Core/Config.cpp b/Core/Config.cpp index 3a98ae836f..7264f38859 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -25,8 +25,8 @@ #include "ppsspp_config.h" #include "gfx_es2/gpu_features.h" -#include "net/http_client.h" -#include "net/url.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/URL.h" #include "Common/Log.h" #include "Common/Data/Format/IniFile.h" @@ -34,7 +34,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/Data/Text/Parsers.h" #include "Common/CPUDetect.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/LogManager.h" #include "Common/OSVersion.h" #include "Common/System/Display.h" diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp index 5feb26a353..be1edd7a23 100644 --- a/Core/CwCheat.cpp +++ b/Core/CwCheat.cpp @@ -5,7 +5,7 @@ #include "Common/StringUtils.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Core/CoreTiming.h" #include "Core/CoreParameter.h" #include "Core/CwCheat.h" diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp index 4ca7bec75e..0efd301b0e 100644 --- a/Core/Debugger/SymbolMap.cpp +++ b/Core/Debugger/SymbolMap.cpp @@ -36,7 +36,7 @@ #include "Common/CommonTypes.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Core/MemMap.h" #include "Core/Debugger/SymbolMap.h" diff --git a/Core/Debugger/WebSocket/GPURecordSubscriber.cpp b/Core/Debugger/WebSocket/GPURecordSubscriber.cpp index 7e62ef4700..4ed21fbbcf 100644 --- a/Core/Debugger/WebSocket/GPURecordSubscriber.cpp +++ b/Core/Debugger/WebSocket/GPURecordSubscriber.cpp @@ -16,7 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Common/Data/Encoding/Base64.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Core/Debugger/WebSocket/GPURecordSubscriber.h" #include "Core/Debugger/WebSocket/WebSocketUtils.h" #include "Core/System.h" diff --git a/Core/Debugger/WebSocket/WebSocketUtils.h b/Core/Debugger/WebSocket/WebSocketUtils.h index 24752274f2..5caa28adaf 100644 --- a/Core/Debugger/WebSocket/WebSocketUtils.h +++ b/Core/Debugger/WebSocket/WebSocketUtils.h @@ -21,11 +21,10 @@ #include -#include "net/websocket_server.h" - #include "Common/Log.h" #include "Common/Data/Format/JSONReader.h" #include "Common/Data/Format/JSONWriter.h" +#include "Common/Net/WebsocketServer.h" #if PPSSPP_PLATFORM(UWP) // Enum name overlapped with UWP macro, quick hack to disable it diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index a75308a35f..0266cd0d4a 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -24,7 +24,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/Thread/ThreadUtil.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index a734fc7d69..269eb3a33f 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -15,8 +15,9 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "Common/Data/Text/I18n.h" #include "Common/Log.h" +#include "Common/Data/Text/I18n.h" +#include "Common/Data/Format/ZIMLoad.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" @@ -34,8 +35,6 @@ #include "Core/HW/MemoryStick.h" #include "Core/Util/PPGeDraw.h" -#include "image/png_load.h" - #include static const std::string ICON0_FILENAME = "ICON0.PNG"; diff --git a/Core/ELF/PBPReader.cpp b/Core/ELF/PBPReader.cpp index 41653bfcba..de9c4452bd 100644 --- a/Core/ELF/PBPReader.cpp +++ b/Core/ELF/PBPReader.cpp @@ -20,7 +20,7 @@ #include #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Core/Loaders.h" #include "Core/ELF/PBPReader.h" diff --git a/Core/FileLoaders/DiskCachingFileLoader.cpp b/Core/FileLoaders/DiskCachingFileLoader.cpp index e8a940b7d0..412f409a84 100644 --- a/Core/FileLoaders/DiskCachingFileLoader.cpp +++ b/Core/FileLoaders/DiskCachingFileLoader.cpp @@ -15,17 +15,18 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +#include "ppsspp_config.h" + #include #include #include #include #include -#include "ppsspp_config.h" -#include "file/file_util.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/File/DiskFree.h" -#include "Common/FileUtil.h" +#include "Common/File/DirListing.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Common/CommonWindows.h" #include "Core/FileLoaders/DiskCachingFileLoader.h" diff --git a/Core/FileLoaders/HTTPFileLoader.h b/Core/FileLoaders/HTTPFileLoader.h index cf3441df9c..d8cb6f3c47 100644 --- a/Core/FileLoaders/HTTPFileLoader.h +++ b/Core/FileLoaders/HTTPFileLoader.h @@ -20,9 +20,9 @@ #include #include -#include "net/http_client.h" -#include "net/resolve.h" -#include "net/url.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/Resolve.h" +#include "Common/Net/URL.h" #include "Common/CommonTypes.h" #include "Core/Loaders.h" diff --git a/Core/FileLoaders/LocalFileLoader.cpp b/Core/FileLoaders/LocalFileLoader.cpp index f01eaffdda..1a6205bfab 100644 --- a/Core/FileLoaders/LocalFileLoader.cpp +++ b/Core/FileLoaders/LocalFileLoader.cpp @@ -19,10 +19,10 @@ #include "ppsspp_config.h" -#include "file/file_util.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" +#include "Common/File/DirListing.h" #include "Core/FileLoaders/LocalFileLoader.h" #ifdef _WIN32 diff --git a/Core/FileSystems/BlockDevices.cpp b/Core/FileSystems/BlockDevices.cpp index 368d78a296..9d4f85ee6a 100644 --- a/Core/FileSystems/BlockDevices.cpp +++ b/Core/FileSystems/BlockDevices.cpp @@ -20,7 +20,7 @@ #include #include "Common/Data/Text/I18n.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Common/Swap.h" #include "Core/Loaders.h" diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index 0389244e0f..d6594ee52e 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -25,7 +25,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/File/DiskFree.h" #include "Common/File/VFS/VFS.h" #include "Core/FileSystems/DirectoryFileSystem.h" diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp index 7aaef4327c..fde9808d8c 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.cpp +++ b/Core/FileSystems/VirtualDiscFileSystem.cpp @@ -17,7 +17,7 @@ #include "ppsspp_config.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" diff --git a/Core/HLE/Plugins.cpp b/Core/HLE/Plugins.cpp index 9572d6e5ea..95e6c0efa5 100644 --- a/Core/HLE/Plugins.cpp +++ b/Core/HLE/Plugins.cpp @@ -16,9 +16,10 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include -#include "file/file_util.h" + #include "Common/Data/Format/IniFile.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" +#include "Common/File/DirListing.h" #include "Common/Serialize/SerializeFuncs.h" #include "Core/Config.h" #include "Core/MemMap.h" diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h index 53348b115c..4aea8e9822 100644 --- a/Core/HLE/proAdhoc.h +++ b/Core/HLE/proAdhoc.h @@ -41,7 +41,7 @@ #include #include -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include "Common/Serialize/Serializer.h" #include "Core/Config.h" diff --git a/Core/HLE/proAdhocServer.cpp b/Core/HLE/proAdhocServer.cpp index 52b84febb1..d9ea077054 100644 --- a/Core/HLE/proAdhocServer.cpp +++ b/Core/HLE/proAdhocServer.cpp @@ -52,7 +52,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/Thread/ThreadUtil.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Core/Util/PortManager.h" #include "Core/Core.h" diff --git a/Core/HLE/sceHttp.cpp b/Core/HLE/sceHttp.cpp index e592ef6178..6d13b6f1f2 100644 --- a/Core/HLE/sceHttp.cpp +++ b/Core/HLE/sceHttp.cpp @@ -19,7 +19,7 @@ #include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceHttp.h" -#include "net/http_client.h" +#include "Common/Net/HTTPClient.h" // If http isn't loaded (seems unlikely), most functions should return SCE_KERNEL_ERROR_LIBRARY_NOTFOUND diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index bdd93d5179..a12ba039f9 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -22,7 +22,7 @@ #include "Common/Thread/ThreadUtil.h" #include "Common/Profiler/Profiler.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeMap.h" #include "Common/Serialize/SerializeSet.h" diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 601b01f166..4952f9be31 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -24,7 +24,7 @@ #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeSet.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/Core.h" diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp index 629a9766c8..74d01aa789 100644 --- a/Core/HLE/sceNet.cpp +++ b/Core/HLE/sceNet.cpp @@ -22,7 +22,7 @@ #include #endif -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include "Common/Data/Text/Parsers.h" #include "Common/Serialize/Serializer.h" diff --git a/Core/HLE/scePauth.cpp b/Core/HLE/scePauth.cpp index 84d92ec126..ceba0710fb 100644 --- a/Core/HLE/scePauth.cpp +++ b/Core/HLE/scePauth.cpp @@ -25,7 +25,7 @@ #include "Core/HLE/scePauth.h" #include "Core/HLE/HLE.h" #include "Core/HLE/FunctionWrappers.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" static int scePauth_F7AA47F6(u32 srcPtr, int srcLength, u32 destLengthPtr, u32 workArea) { diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index 9ff737f1b5..5cb209c6c4 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -17,8 +17,6 @@ #include -#include "file/file_util.h" - #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeMap.h" diff --git a/Core/Loaders.cpp b/Core/Loaders.cpp index 6054eed875..77c2fafae0 100644 --- a/Core/Loaders.cpp +++ b/Core/Loaders.cpp @@ -18,10 +18,8 @@ #include #include -#include "file/file_util.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" - #include "Core/FileLoaders/CachingFileLoader.h" #include "Core/FileLoaders/DiskCachingFileLoader.h" #include "Core/FileLoaders/HTTPFileLoader.h" diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp index b38211c0a0..1a39988abc 100644 --- a/Core/MIPS/MIPSAnalyst.cpp +++ b/Core/MIPS/MIPSAnalyst.cpp @@ -24,7 +24,7 @@ #include "ext/cityhash/city.h" #include "ext/xxhash.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Common/TimeUtil.h" #include "Core/Config.h" diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp index 09eabf4dc3..51a8758843 100644 --- a/Core/PSPLoaders.cpp +++ b/Core/PSPLoaders.cpp @@ -17,11 +17,10 @@ #include -#include "file/file_util.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/Thread/ThreadUtil.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #ifdef _WIN32 #include "Common/CommonWindows.h" diff --git a/Core/Replay.cpp b/Core/Replay.cpp index bc188fcb31..fb03eeea4a 100644 --- a/Core/Replay.cpp +++ b/Core/Replay.cpp @@ -21,7 +21,7 @@ #include "Common/Common.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Core/Replay.h" #include "Core/FileSystems/FileSystem.h" diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index 449070cf6a..be0248dff7 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -26,7 +26,7 @@ #include "Core/Reporting.h" #include "Common/File/VFS/VFS.h" #include "Common/CPUDetect.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" #include "Core/Core.h" @@ -44,10 +44,9 @@ #include "Core/ELF/ParamSFO.h" #include "GPU/GPUInterface.h" #include "GPU/GPUState.h" -#include "net/http_client.h" -#include "net/resolve.h" -#include "net/url.h" -#include "file/file_util.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/Resolve.h" +#include "Common/Net/URL.h" #include "Common/Thread/ThreadUtil.h" namespace Reporting diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp index e354cdc3f7..d0388bb362 100644 --- a/Core/SaveState.cpp +++ b/Core/SaveState.cpp @@ -24,7 +24,7 @@ #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Text/Parsers.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" diff --git a/Core/Screenshot.cpp b/Core/Screenshot.cpp index f1d714d7e7..0e4066bdbf 100644 --- a/Core/Screenshot.cpp +++ b/Core/Screenshot.cpp @@ -26,7 +26,7 @@ #endif #include "Common/ColorConv.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Core/Config.h" #include "Core/Screenshot.h" diff --git a/Core/System.cpp b/Core/System.cpp index 48e22b6f5e..736499a7f4 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -37,7 +37,7 @@ #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Utf8.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Common/GraphicsContext.h" #include "Core/MemFault.h" diff --git a/Core/TextureReplacer.cpp b/Core/TextureReplacer.cpp index c2f8a15533..98c6102280 100644 --- a/Core/TextureReplacer.cpp +++ b/Core/TextureReplacer.cpp @@ -28,7 +28,7 @@ #include "Common/Data/Format/IniFile.h" #include "Common/Data/Text/Parsers.h" #include "Common/ColorConv.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/Host.h" diff --git a/Core/Util/GameManager.cpp b/Core/Util/GameManager.cpp index c0e6b5eb0e..17b2e75751 100644 --- a/Core/Util/GameManager.cpp +++ b/Core/Util/GameManager.cpp @@ -23,7 +23,6 @@ #include #include -#include "file/file_util.h" #ifdef SHARED_LIBZIP #include #else @@ -31,9 +30,8 @@ #endif #include "Common/Data/Encoding/Utf8.h" #include "Common/Data/Format/IniFile.h" - #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Core/Config.h" #include "Core/Loaders.h" diff --git a/Core/Util/GameManager.h b/Core/Util/GameManager.h index 81d1368273..63460f66d7 100644 --- a/Core/Util/GameManager.h +++ b/Core/Util/GameManager.h @@ -23,7 +23,7 @@ #pragma once #include -#include "net/http_client.h" +#include "Common/Net/HTTPClient.h" enum class GameManagerState { IDLE, diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index 61507801cb..4f33737351 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -17,14 +17,14 @@ #include -#include "Common/Data/Color/RGBAUtil.h" -#include "Common/File/VFS/VFS.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_text.h" -#include "image/zim_load.h" -#include "image/png_load.h" -#include "Common/Data/Encoding/Utf8.h" +#include "Common/Data/Color/RGBAUtil.h" +#include "Common/File/VFS/VFS.h" +#include "Common/Data/Format/ZIMLoad.h" +#include "Common/Data/Format/PNGLoad.h" +#include "Common/Data/Encoding/Utf8.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/StringUtils.h" @@ -1202,7 +1202,7 @@ bool PPGeImage::Load() { unsigned char *textureData; int success; if (filename_.empty()) { - success = pngLoadPtr(Memory::GetPointer(png_), size_, &width_, &height_, &textureData, false); + success = pngLoadPtr(Memory::GetPointer(png_), size_, &width_, &height_, &textureData); } else { std::vector pngData; if (pspFileSystem.ReadEntireFile(filename_, pngData) < 0) { @@ -1210,7 +1210,7 @@ bool PPGeImage::Load() { return false; } - success = pngLoadPtr((const unsigned char *)&pngData[0], pngData.size(), &width_, &height_, &textureData, false); + success = pngLoadPtr((const unsigned char *)&pngData[0], pngData.size(), &width_, &height_, &textureData); } if (!success) { WARN_LOG(SCEGE, "Bad PPGeImage - not a valid png"); diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp index 63bfd5baa7..3c4b808502 100644 --- a/Core/Util/PortManager.cpp +++ b/Core/Util/PortManager.cpp @@ -31,7 +31,7 @@ #include #include "Common/TimeUtil.h" #include "Common/Data/Text/I18n.h" -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Log.h" #include "Core/System.h" diff --git a/Core/WaveFile.h b/Core/WaveFile.h index 4366cd936c..3ef3f09b4c 100644 --- a/Core/WaveFile.h +++ b/Core/WaveFile.h @@ -16,7 +16,7 @@ #include #include -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" class WaveFileWriter { diff --git a/Core/WebServer.cpp b/Core/WebServer.cpp index ce7519a47c..9e96baf9f8 100644 --- a/Core/WebServer.cpp +++ b/Core/WebServer.cpp @@ -19,13 +19,13 @@ #include #include -#include "file/fd_util.h" -#include "net/http_client.h" -#include "net/http_server.h" -#include "net/sinks.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/HTTPServer.h" +#include "Common/Net/Sinks.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" +#include "Common/File/FileDescriptor.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" #include "Core/Config.h" diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp index 1e650b9db1..a1c030dd3a 100644 --- a/GPU/Common/PostShader.cpp +++ b/GPU/Common/PostShader.cpp @@ -23,7 +23,8 @@ #include #include "Common/Data/Format/IniFile.h" -#include "file/file_util.h" +#include "Common/File/FileUtil.h" +#include "Common/File/DirListing.h" #include "Common/File/VFS/VFS.h" #include "gfx_es2/gpu_features.h" diff --git a/GPU/Debugger/Record.cpp b/GPU/Debugger/Record.cpp index 05ad3b2ff1..4fdc32b29f 100644 --- a/GPU/Debugger/Record.cpp +++ b/GPU/Debugger/Record.cpp @@ -23,7 +23,7 @@ #include #include "Common/Common.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Common/StringUtils.h" diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 8fb872cc98..acbd172dfa 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -20,7 +20,7 @@ #include "Common/Log.h" #include "Common/Serialize/Serializer.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/GraphicsContext.h" #include "Core/Config.h" diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index d1ffc3fecc..d61d2adf76 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -34,7 +34,7 @@ #include "thin3d/GLRenderManager.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/Host.h" diff --git a/GPU/Vulkan/DebugVisVulkan.cpp b/GPU/Vulkan/DebugVisVulkan.cpp index 023e840d56..7b55caa41c 100644 --- a/GPU/Vulkan/DebugVisVulkan.cpp +++ b/GPU/Vulkan/DebugVisVulkan.cpp @@ -17,8 +17,8 @@ #include "gfx_es2/draw_buffer.h" #include "thin3d/thin3d.h" -#include "ui/ui_context.h" -#include "ui/view.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" #include "DebugVisVulkan.h" #include "Common/Vulkan/VulkanMemory.h" diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 96e4212ec8..447f1b184c 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -21,7 +21,7 @@ #include "Common/Profiler/Profiler.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/GraphicsContext.h" #include "Common/Serialize/Serializer.h" #include "Common/TimeUtil.h" diff --git a/Qt/QtMain.h b/Qt/QtMain.h index cd33b61765..9c7589b6c2 100644 --- a/Qt/QtMain.h +++ b/Qt/QtMain.h @@ -31,7 +31,7 @@ QTM_USE_NAMESPACE #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "thin3d/thin3d.h" -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include "NKCodeFromQt.h" #include "Common/GraphicsContext.h" diff --git a/SDL/SDLJoystick.cpp b/SDL/SDLJoystick.cpp index 50793957e1..3ffe815c31 100644 --- a/SDL/SDLJoystick.cpp +++ b/SDL/SDLJoystick.cpp @@ -5,7 +5,7 @@ #include "Common/System/System.h" #include "Common/File/VFS/VFS.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Core/Config.h" #include "SDL/SDLJoystick.h" diff --git a/SDL/SDLJoystick.h b/SDL/SDLJoystick.h index ea14076d64..057e332b25 100644 --- a/SDL/SDLJoystick.h +++ b/SDL/SDLJoystick.h @@ -9,7 +9,7 @@ #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" -#include "net/resolve.h" +#include "Common/Net/Resolve.h" class SDLJoystick{ public: diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 78eef5170e..923c569029 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -24,8 +24,8 @@ SDLJoystick *joystick = NULL; #include "Common/System/System.h" #include "Common/System/NativeApp.h" #include "ext/glslang/glslang/Public/ShaderLang.h" -#include "image/png_load.h" -#include "net/resolve.h" +#include "Common/Data/Format/PNGLoad.h" +#include "Common/Net/Resolve.h" #include "NKCodeFromSDL.h" #include "Common/Math/math_util.h" #include "thin3d/GLRenderManager.h" @@ -693,7 +693,7 @@ int main(int argc, char *argv[]) { snprintf(iconPath, PATH_MAX, "%sassets/icon_regular_72.png", SDL_GetBasePath() ? SDL_GetBasePath() : ""); int width = 0, height = 0; unsigned char *imageData; - if (pngLoad(iconPath, &width, &height, &imageData, false) == 1) { + if (pngLoad(iconPath, &width, &height, &imageData) == 1) { SDL_Surface *surface = SDL_CreateRGBSurface(0, width, height, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000); memcpy(surface->pixels, imageData, width*height*4); diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index 4d60afcaa3..272fb706dc 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -2,7 +2,7 @@ #include #include "Common/File/VFS/VFS.h" -#include "ui/root.h" +#include "Common/UI/Root.h" #include "Common/CommonTypes.h" #include "Common/Data/Format/RIFF.h" diff --git a/UI/BackgroundAudio.h b/UI/BackgroundAudio.h index a0c154411e..fb572f52a7 100644 --- a/UI/BackgroundAudio.h +++ b/UI/BackgroundAudio.h @@ -4,7 +4,7 @@ #include #include -#include "ui/root.h" +#include "Common/UI/Root.h" class AT3PlusReader; diff --git a/UI/ChatScreen.cpp b/UI/ChatScreen.cpp index 3283d86bf8..c09d92708a 100644 --- a/UI/ChatScreen.cpp +++ b/UI/ChatScreen.cpp @@ -1,11 +1,11 @@ #include #include "ppsspp_config.h" -#include "ui/root.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" -#include "ui/ui.h" +#include "Common/UI/Root.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" +#include "Common/UI/UI.h" #include "Common/Data/Text/I18n.h" #include "Common/Data/Encoding/Utf8.h" diff --git a/UI/ChatScreen.h b/UI/ChatScreen.h index ff67d8ce2c..48fe7165f1 100644 --- a/UI/ChatScreen.h +++ b/UI/ChatScreen.h @@ -1,8 +1,7 @@ #pragma once #include "ppsspp_config.h" -#include "file/file_util.h" -#include "ui/ui_screen.h" +#include "Common/UI/UIScreen.h" class ChatMenu : public PopupScreen { public: diff --git a/UI/ComboKeyMappingScreen.cpp b/UI/ComboKeyMappingScreen.cpp index 672b760df8..f56847bf85 100644 --- a/UI/ComboKeyMappingScreen.cpp +++ b/UI/ComboKeyMappingScreen.cpp @@ -18,9 +18,9 @@ #include "Common/System/Display.h" #include "gfx_es2/draw_buffer.h" #include "gfx/texture_atlas.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "Common/Data/Text/I18n.h" #include "Common/Data/Color/RGBAUtil.h" diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index da64c785f2..74320bf165 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -20,11 +20,11 @@ #include #include "gfx/texture_atlas.h" -#include "ui/root.h" -#include "ui/ui.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/Root.h" +#include "Common/UI/UI.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "Common/Log.h" #include "Common/Data/Color/RGBAUtil.h" diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h index 3f548c2f66..d9f7776fd4 100644 --- a/UI/ControlMappingScreen.h +++ b/UI/ControlMappingScreen.h @@ -22,8 +22,8 @@ #include #include -#include "ui/view.h" -#include "ui/ui_screen.h" +#include "Common/UI/View.h" +#include "Common/UI/UIScreen.h" #include "Common/Data/Text/I18n.h" #include "UI/MiscScreens.h" diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index c92f7b838d..a13ef059d8 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -16,11 +16,11 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "ext/xxhash.h" -#include "ui/ui.h" +#include "Common/UI/UI.h" #include "Common/Data/Text/I18n.h" #include "Common/Data/Encoding/Utf8.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Common/System/System.h" #include "Core/Core.h" diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h index c1bc827c68..c36704ef20 100644 --- a/UI/CwCheatScreen.h +++ b/UI/CwCheatScreen.h @@ -18,9 +18,9 @@ #include #include -#include "ui/view.h" -#include "ui/ui_screen.h" -#include "ui/ui_context.h" +#include "Common/UI/View.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/Context.h" #include "UI/MiscScreens.h" struct CheatFileInfo; diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 530b0d31ed..6e50950000 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -23,10 +23,10 @@ #include "Common/System/System.h" #include "gfx_es2/gpu_features.h" #include "Common/Data/Text/I18n.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" -#include "ui/ui.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" +#include "Common/UI/UI.h" #include "Common/Profiler/Profiler.h" #include "Common/LogManager.h" diff --git a/UI/DevScreens.h b/UI/DevScreens.h index 0d32460d4e..28e8c38bda 100644 --- a/UI/DevScreens.h +++ b/UI/DevScreens.h @@ -23,9 +23,8 @@ #include #include -#include "file/file_util.h" #include "Common/Data/Text/I18n.h" -#include "ui/ui_screen.h" +#include "Common/UI/UIScreen.h" #include "UI/MiscScreens.h" #include "GPU/Common/ShaderCommon.h" diff --git a/UI/DisplayLayoutEditor.cpp b/UI/DisplayLayoutEditor.cpp index 6c3e6e1f5a..f6556ca39a 100644 --- a/UI/DisplayLayoutEditor.cpp +++ b/UI/DisplayLayoutEditor.cpp @@ -17,7 +17,7 @@ #include -#include "ui/ui_context.h" +#include "Common/UI/Context.h" #include "UI/DisplayLayoutEditor.h" void MultiTouchDisplay::GetContentDimensions(const UIContext &dc, float &w, float &h) const { diff --git a/UI/DisplayLayoutEditor.h b/UI/DisplayLayoutEditor.h index 6cdd7a454d..394762a6a9 100644 --- a/UI/DisplayLayoutEditor.h +++ b/UI/DisplayLayoutEditor.h @@ -19,8 +19,8 @@ #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" class MultiTouchDisplay : public UI::View { public: diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 8694bbd8bb..0c8ddde7cd 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -22,8 +22,8 @@ #include "Common/System/System.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" -#include "ui/ui_context.h" -#include "ui/view.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" #include "Common/Data/Color/RGBAUtil.h" #include "Common/Data/Text/I18n.h" diff --git a/UI/DisplayLayoutScreen.h b/UI/DisplayLayoutScreen.h index 1a38ea706f..9db82c612c 100644 --- a/UI/DisplayLayoutScreen.h +++ b/UI/DisplayLayoutScreen.h @@ -17,8 +17,8 @@ #pragma once -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "MiscScreens.h" #include diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index f6c6cda45e..61042fc14b 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -23,11 +23,11 @@ #include "gfx_es2/gpu_features.h" #include "gfx_es2/draw_text.h" -#include "ui/root.h" -#include "ui/ui.h" -#include "ui/ui_context.h" -#include "ui/ui_tween.h" -#include "ui/view.h" +#include "Common/UI/Root.h" +#include "Common/UI/UI.h" +#include "Common/UI/Context.h" +#include "Common/UI/Tween.h" +#include "Common/UI/View.h" #include "Common/Data/Text/I18n.h" #include "Common/Input/InputState.h" diff --git a/UI/EmuScreen.h b/UI/EmuScreen.h index 0f2c33563d..77a072f433 100644 --- a/UI/EmuScreen.h +++ b/UI/EmuScreen.h @@ -22,10 +22,10 @@ #include #include "Common/Input/KeyCodes.h" +#include "Common/UI/Screen.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/Tween.h" #include "Core/KeyMap.h" -#include "ui/screen.h" -#include "ui/ui_screen.h" -#include "ui/ui_tween.h" struct AxisInput; diff --git a/UI/GPUDriverTestScreen.cpp b/UI/GPUDriverTestScreen.cpp index c23517066b..56547cd8b9 100644 --- a/UI/GPUDriverTestScreen.cpp +++ b/UI/GPUDriverTestScreen.cpp @@ -1,6 +1,6 @@ #include "GPUDriverTestScreen.h" #include "Common/Data/Text/I18n.h" -#include "ui/view.h" +#include "Common/UI/View.h" static const std::vector fsDiscard = { {Draw::ShaderLanguage::GLSL_ES_200, diff --git a/UI/GPUDriverTestScreen.h b/UI/GPUDriverTestScreen.h index 0f5de4a8b0..64a20d4c74 100644 --- a/UI/GPUDriverTestScreen.h +++ b/UI/GPUDriverTestScreen.h @@ -1,10 +1,10 @@ #pragma once #include "Common/System/Display.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" -#include "ui/ui.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" +#include "Common/UI/UI.h" #include "Common/LogManager.h" #include "UI/MiscScreens.h" diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index c297ca6125..afcc507e56 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -22,11 +22,10 @@ #include #include -#include "file/file_util.h" #include "thin3d/thin3d.h" #include "Common/Thread/PrioritizedWorkQueue.h" #include "Common/File/VFS/VFS.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/StringUtils.h" #include "Common/TimeUtil.h" #include "Core/FileSystems/ISOFileSystem.h" diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h index 565331c14a..8563d111f9 100644 --- a/UI/GameInfoCache.h +++ b/UI/GameInfoCache.h @@ -23,7 +23,6 @@ #include #include -#include "file/file_util.h" #include "Core/ELF/ParamSFO.h" #include "UI/TextureUtil.h" diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index 9404173d19..a4eecc132f 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -20,13 +20,13 @@ #include "ppsspp_config.h" #include "gfx_es2/draw_buffer.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "Common/Data/Text/I18n.h" #include "Common/Data/Encoding/Utf8.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/System/System.h" #include "Common/System/NativeApp.h" #include "Core/Host.h" diff --git a/UI/GameScreen.h b/UI/GameScreen.h index b68c7f28c2..2e7fa3f596 100644 --- a/UI/GameScreen.h +++ b/UI/GameScreen.h @@ -20,7 +20,7 @@ #include #include "UI/MiscScreens.h" -#include "ui/ui_screen.h" +#include "Common/UI/UIScreen.h" // Game screen: Allows you to start a game, delete saves, delete the game, // set game specific settings, etc. diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 8788263d2b..3a90ec8b6f 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -19,13 +19,13 @@ #include -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include "gfx_es2/gpu_features.h" #include "gfx_es2/draw_buffer.h" -#include "ui/root.h" -#include "ui/view.h" -#include "ui/viewgroup.h" -#include "ui/ui_context.h" +#include "Common/UI/Root.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" +#include "Common/UI/Context.h" #include "Common/System/Display.h" // Only to check screen aspect ratio with pixel_yres/pixel_xres #include "Common/System/System.h" @@ -51,7 +51,7 @@ #include "UI/ComboKeyMappingScreen.h" #include "UI/GPUDriverTestScreen.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/OSVersion.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" diff --git a/UI/GameSettingsScreen.h b/UI/GameSettingsScreen.h index 00697f6f86..8eae42a72f 100644 --- a/UI/GameSettingsScreen.h +++ b/UI/GameSettingsScreen.h @@ -21,7 +21,7 @@ #include #include #include -#include "ui/ui_screen.h" +#include "Common/UI/UIScreen.h" #include "UI/MiscScreens.h" class SettingInfoMessage; diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp index 8337c83d1c..add209e3f2 100644 --- a/UI/GamepadEmu.cpp +++ b/UI/GamepadEmu.cpp @@ -22,7 +22,7 @@ #include "Common/System/System.h" #include "gfx/texture_atlas.h" #include "Common/Math/math_util.h" -#include "ui/ui_context.h" +#include "Common/UI/Context.h" #include "Common/Log.h" #include "Common/TimeUtil.h" diff --git a/UI/GamepadEmu.h b/UI/GamepadEmu.h index fd2fe9c7d3..8b3dd53809 100644 --- a/UI/GamepadEmu.h +++ b/UI/GamepadEmu.h @@ -20,8 +20,8 @@ #include "Common/Input/InputState.h" #include "gfx_es2/draw_buffer.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "Core/CoreParameter.h" class GamepadView : public UI::View { diff --git a/UI/InstallZipScreen.cpp b/UI/InstallZipScreen.cpp index a8fc7f5038..0f5f79551d 100644 --- a/UI/InstallZipScreen.cpp +++ b/UI/InstallZipScreen.cpp @@ -15,13 +15,12 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "Common/Data/Text/I18n.h" -#include "ui/ui.h" -#include "ui/view.h" -#include "ui/viewgroup.h" -#include "file/file_util.h" +#include "Common/UI/UI.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "Common/StringUtils.h" +#include "Common/Data/Text/I18n.h" #include "Core/Util/GameManager.h" #include "UI/InstallZipScreen.h" #include "UI/MainScreen.h" diff --git a/UI/InstallZipScreen.h b/UI/InstallZipScreen.h index e8015fdfa5..e8e8d05701 100644 --- a/UI/InstallZipScreen.h +++ b/UI/InstallZipScreen.h @@ -19,8 +19,8 @@ #include -#include "ui/view.h" -#include "ui/ui_screen.h" +#include "Common/UI/View.h" +#include "Common/UI/UIScreen.h" #include "UI/MiscScreens.h" diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index 6439628258..a46a28e153 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -24,16 +24,16 @@ #include "Common/System/System.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" -#include "ui/root.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/Root.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "Common/Data/Color/RGBAUtil.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/File/PathBrowser.h" #include "Common/Math/curves.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" #include "Core/System.h" diff --git a/UI/MainScreen.h b/UI/MainScreen.h index a4aed944d4..e1297cb8d8 100644 --- a/UI/MainScreen.h +++ b/UI/MainScreen.h @@ -19,8 +19,8 @@ #include -#include "ui/ui_screen.h" -#include "ui/viewgroup.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/ViewGroup.h" #include "UI/MiscScreens.h" #include "Common/File/PathBrowser.h" diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index b19f59bdaf..56007c863b 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -21,10 +21,10 @@ #include #include "gfx_es2/draw_buffer.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" -#include "ui/ui.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" +#include "Common/UI/UI.h" #include "Common/System/Display.h" #include "Common/System/NativeApp.h" @@ -36,7 +36,7 @@ #include "Common/Data/Text/I18n.h" #include "Common/Data/Random/Rng.h" #include "Common/TimeUtil.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Core/Config.h" #include "Core/Host.h" #include "Core/System.h" diff --git a/UI/MiscScreens.h b/UI/MiscScreens.h index d920fc77fe..e62363823f 100644 --- a/UI/MiscScreens.h +++ b/UI/MiscScreens.h @@ -22,8 +22,8 @@ #include #include -#include "file/file_util.h" -#include "ui/ui_screen.h" +#include "Common/UI/UIScreen.h" +#include "Common/File/DirListing.h" struct ShaderInfo; struct TextureShaderInfo; diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index f0da507d1a..133ca5a7ab 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -43,16 +43,16 @@ #include "Windows/CaptureDevice.h" #endif -#include "net/http_client.h" -#include "net/resolve.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/Resolve.h" #include "gfx/texture_atlas.h" #include "gfx_es2/draw_text.h" #include "gfx_es2/gpu_features.h" #include "thin3d/thin3d.h" -#include "ui/ui.h" -#include "ui/screen.h" -#include "ui/ui_context.h" -#include "ui/view.h" +#include "Common/UI/UI.h" +#include "Common/UI/Screen.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" #include "android/jni/app-android.h" #include "Common/System/Display.h" @@ -68,7 +68,7 @@ #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" #include "Common/CPUDetect.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" #include "Common/LogManager.h" diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp index 38f8549e7b..17dc3222b4 100644 --- a/UI/OnScreenDisplay.cpp +++ b/UI/OnScreenDisplay.cpp @@ -4,7 +4,7 @@ #include "gfx/texture_atlas.h" #include "gfx_es2/draw_buffer.h" -#include "ui/ui_context.h" +#include "Common/UI/Context.h" #include "Common/TimeUtil.h" diff --git a/UI/OnScreenDisplay.h b/UI/OnScreenDisplay.h index 381fcf274e..6cb83aa877 100644 --- a/UI/OnScreenDisplay.h +++ b/UI/OnScreenDisplay.h @@ -5,7 +5,7 @@ #include #include "Common/Math/geom2d.h" -#include "ui/view.h" +#include "Common/UI/View.h" class DrawBuffer; diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 620e5c1fc1..92e5f178e4 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -19,10 +19,10 @@ #include #include "gfx_es2/draw_buffer.h" -#include "ui/view.h" -#include "ui/viewgroup.h" -#include "ui/ui_context.h" -#include "ui/ui_screen.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" +#include "Common/UI/Context.h" +#include "Common/UI/UIScreen.h" #include "thin3d/thin3d.h" #include "Common/Data/Text/I18n.h" diff --git a/UI/PauseScreen.h b/UI/PauseScreen.h index 8e951ffaf0..69c84d53af 100644 --- a/UI/PauseScreen.h +++ b/UI/PauseScreen.h @@ -20,8 +20,8 @@ #include #include -#include "ui/ui_screen.h" -#include "ui/viewgroup.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/ViewGroup.h" #include "UI/MiscScreens.h" #include "UI/TextureUtil.h" diff --git a/UI/ProfilerDraw.cpp b/UI/ProfilerDraw.cpp index 8b8ce6838e..95792f3800 100644 --- a/UI/ProfilerDraw.cpp +++ b/UI/ProfilerDraw.cpp @@ -19,8 +19,8 @@ #include #include "gfx_es2/draw_buffer.h" -#include "ui/ui_context.h" -#include "ui/view.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" #include "Common/Profiler/Profiler.h" static const uint32_t nice_colors[] = { diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp index 0e6ae604c9..a4663399cb 100644 --- a/UI/RemoteISOScreen.cpp +++ b/UI/RemoteISOScreen.cpp @@ -27,9 +27,9 @@ // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" -#include "net/http_client.h" -#include "net/resolve.h" -#include "net/url.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/Resolve.h" +#include "Common/Net/URL.h" #include "Common/File/PathBrowser.h" #include "Common/Data/Format/JSONReader.h" diff --git a/UI/RemoteISOScreen.h b/UI/RemoteISOScreen.h index a294969259..7eab2270e0 100644 --- a/UI/RemoteISOScreen.h +++ b/UI/RemoteISOScreen.h @@ -20,8 +20,8 @@ #include #include -#include "ui/ui_screen.h" -#include "ui/viewgroup.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/ViewGroup.h" #include "UI/MiscScreens.h" #include "UI/MainScreen.h" diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index 480ad5a9f6..9842549f1c 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -20,12 +20,12 @@ // TODO: For text align flags, probably shouldn't be in gfx_es2/... #include "gfx_es2/draw_buffer.h" #include "thin3d/thin3d.h" -#include "ui/ui_context.h" +#include "Common/UI/Context.h" #include "UI/PauseScreen.h" #include "UI/ReportScreen.h" #include "Common/Data/Text/I18n.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Common/StringUtils.h" #include "Common/System/Display.h" diff --git a/UI/ReportScreen.h b/UI/ReportScreen.h index e3992170ac..b77f8a082f 100644 --- a/UI/ReportScreen.h +++ b/UI/ReportScreen.h @@ -19,8 +19,8 @@ #include -#include "ui/ui_screen.h" -#include "ui/viewgroup.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/ViewGroup.h" #include "UI/MiscScreens.h" enum class ReportingOverallScore : int { diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 0069f73ae8..41bd742893 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -24,15 +24,15 @@ #include "Common/Math/curves.h" #include "Common/Thread/PrioritizedWorkQueue.h" #include "Common/Data/Encoding/Utf8.h" -#include "ui/ui_context.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/Context.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "UI/SavedataScreen.h" #include "UI/MainScreen.h" #include "UI/GameInfoCache.h" #include "UI/PauseScreen.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Common/StringUtils.h" #include "Core/Host.h" diff --git a/UI/SavedataScreen.h b/UI/SavedataScreen.h index 49da370483..9e02f8c9cb 100644 --- a/UI/SavedataScreen.h +++ b/UI/SavedataScreen.h @@ -20,9 +20,9 @@ #include #include -#include "ui/ui_screen.h" -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "UI/MiscScreens.h" diff --git a/UI/Store.cpp b/UI/Store.cpp index 040decc9bc..ceff7c02ec 100644 --- a/UI/Store.cpp +++ b/UI/Store.cpp @@ -17,9 +17,9 @@ #include -#include "ui/screen.h" -#include "ui/ui_context.h" -#include "ui/viewgroup.h" +#include "Common/UI/Screen.h" +#include "Common/UI/Context.h" +#include "Common/UI/ViewGroup.h" #include "gfx_es2/draw_buffer.h" #include "Common/Common.h" diff --git a/UI/Store.h b/UI/Store.h index c935bcb042..b8cc7aefd0 100644 --- a/UI/Store.h +++ b/UI/Store.h @@ -19,9 +19,9 @@ #include -#include "ui/ui_screen.h" -#include "ui/viewgroup.h" -#include "net/http_client.h" +#include "Common/UI/UIScreen.h" +#include "Common/UI/ViewGroup.h" +#include "Common/Net/HTTPClient.h" #include "UI/MiscScreens.h" diff --git a/UI/TextureUtil.cpp b/UI/TextureUtil.cpp index c05be29263..b52ea1bcbb 100644 --- a/UI/TextureUtil.cpp +++ b/UI/TextureUtil.cpp @@ -1,17 +1,17 @@ #include -#include "Common/Data/Color/RGBAUtil.h" #include "thin3d/thin3d.h" -#include "image/zim_load.h" -#include "image/png_load.h" +#include "ext/jpge/jpgd.h" +#include "Common/UI/View.h" +#include "Common/UI/Context.h" +#include "gfx_es2/draw_buffer.h" + +#include "Common/Data/Color/RGBAUtil.h" +#include "Common/Data/Format/ZIMLoad.h" +#include "Common/Data/Format/PNGLoad.h" #include "Common/Math/math_util.h" #include "Common/Math/curves.h" #include "Common/File/VFS/VFS.h" -#include "ext/jpge/jpgd.h" -#include "ui/view.h" -#include "ui/ui_context.h" -#include "gfx_es2/draw_buffer.h" - #include "Common/Log.h" #include "Common/TimeUtil.h" #include "UI/TextureUtil.h" @@ -63,7 +63,7 @@ static bool LoadTextureLevels(const uint8_t *data, size_t size, ImageFileType ty break; case PNG: - if (1 == pngLoadPtr((const unsigned char *)data, size, &width[0], &height[0], &image[0], false)) { + if (1 == pngLoadPtr((const unsigned char *)data, size, &width[0], &height[0], &image[0])) { *num_levels = 1; *fmt = Draw::DataFormat::R8G8B8A8_UNORM; if (!image[0]) { diff --git a/UI/TextureUtil.h b/UI/TextureUtil.h index d5ebca8a5c..3ed46f71fd 100644 --- a/UI/TextureUtil.h +++ b/UI/TextureUtil.h @@ -3,7 +3,7 @@ #include #include "thin3d/thin3d.h" -#include "ui/view.h" +#include "Common/UI/View.h" enum ImageFileType { PNG, diff --git a/UI/TiltAnalogSettingsScreen.h b/UI/TiltAnalogSettingsScreen.h index 172675c2c6..41692bb46f 100644 --- a/UI/TiltAnalogSettingsScreen.h +++ b/UI/TiltAnalogSettingsScreen.h @@ -19,7 +19,7 @@ #include -#include "ui/view.h" +#include "Common/UI/View.h" #include "MiscScreens.h" class TiltAnalogSettingsScreen : public UIDialogScreenWithBackground { diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index fd06719aad..c2d5740a21 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -22,7 +22,7 @@ #include "gfx_es2/draw_buffer.h" #include "Common/Data/Text/I18n.h" #include "Common/Math/math_util.h" -#include "ui/ui_context.h" +#include "Common/UI/Context.h" #include "Common/Common.h" #include "Common/Log.h" diff --git a/UI/TouchControlLayoutScreen.h b/UI/TouchControlLayoutScreen.h index c21c24116d..89305ab7d6 100644 --- a/UI/TouchControlLayoutScreen.h +++ b/UI/TouchControlLayoutScreen.h @@ -20,8 +20,8 @@ #include #include -#include "ui/view.h" -#include "ui/viewgroup.h" +#include "Common/UI/View.h" +#include "Common/UI/ViewGroup.h" #include "MiscScreens.h" class ControlLayoutView; diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj index d1b6b551bc..b7440d5ba5 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj +++ b/UWP/CommonUWP/CommonUWP.vcxproj @@ -203,7 +203,7 @@ false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) NotUsing @@ -217,7 +217,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h NotUsing @@ -232,7 +232,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h NotUsing @@ -248,7 +248,7 @@ false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) NotUsing @@ -263,7 +263,7 @@ false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) NotUsing @@ -277,7 +277,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h NotUsing @@ -292,7 +292,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h NotUsing @@ -307,7 +307,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h NotUsing @@ -322,7 +322,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) pch.h NotUsing @@ -338,7 +338,7 @@ false true pch.h - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) NotUsing @@ -352,7 +352,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h NotUsing @@ -367,7 +367,7 @@ false true - ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext/native;../../ext/snappy;../../ext/glslang;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_UNICODE;UNICODE;%(PreprocessorDefinitions) pch.h NotUsing @@ -398,13 +398,19 @@ + + + + + + @@ -419,6 +425,13 @@ + + + + + + + @@ -440,7 +453,6 @@ - @@ -465,6 +477,14 @@ + + + + + + + + @@ -490,12 +510,18 @@ + + + + + + @@ -509,6 +535,13 @@ + + + + + + + @@ -519,7 +552,6 @@ - @@ -541,6 +573,14 @@ + + + + + + + + diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters index 22b87aec1e..725a3526f1 100644 --- a/UWP/CommonUWP/CommonUWP.vcxproj.filters +++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters @@ -64,6 +64,12 @@ {661f7d9d-5922-48d6-88ea-2f24bb57419f} + + {c0424523-60b1-4886-a15d-68eda99ff01b} + + + {8e12d2c0-157a-4625-a970-665e1ec9a425} + @@ -76,7 +82,6 @@ - @@ -252,6 +257,69 @@ System + + File + + + File + + + File + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Data\Format + + + Data\Format + + + Data\Format + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + @@ -273,7 +341,6 @@ - @@ -452,6 +519,69 @@ System + + File + + + File + + + File + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Net + + + Data\Format + + + Data\Format + + + Data\Format + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + + + UI + diff --git a/UWP/NativeUWP/NativeUWP.vcxproj b/UWP/NativeUWP/NativeUWP.vcxproj index ced0674db9..3e504d2853 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj +++ b/UWP/NativeUWP/NativeUWP.vcxproj @@ -204,7 +204,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -219,7 +219,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -234,7 +234,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -249,7 +249,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -264,7 +264,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -279,7 +279,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -294,7 +294,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -309,7 +309,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -324,7 +324,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) @@ -339,7 +339,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -354,7 +354,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -369,7 +369,7 @@ false true pch.h - ../..;../../ext;../..;../../ext/native;../../ext/zlib;../../ext/libpng17;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ../..;../../ext;../..;../../ext/native;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -379,61 +379,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create Create diff --git a/UWP/NativeUWP/NativeUWP.vcxproj.filters b/UWP/NativeUWP/NativeUWP.vcxproj.filters index 9cade1425a..4257fc1baa 100644 --- a/UWP/NativeUWP/NativeUWP.vcxproj.filters +++ b/UWP/NativeUWP/NativeUWP.vcxproj.filters @@ -7,18 +7,6 @@ {8a254b8c-46f2-4ff1-bc53-deea7e614276} - - {244992ec-8dcf-49f4-b63c-cae6ac437c58} - - - {9d02a269-6cdd-4726-ab58-34c012e37d37} - - - {d8c0dd74-7ad2-440a-a3e0-5dbf3435a2fc} - - - {96ac6deb-ad00-4ee4-9f0d-515d78d1886b} - @@ -34,69 +22,12 @@ gfx - - file - - - file - - - ui - - - ui - - - ui - - - ui - - - ui - - - ui - - - ui - - - ui - - - net - - - net - - - net - - - net - - - net - - - net - gfx - - image - - - image - gfx - - net - gfx @@ -113,69 +44,12 @@ gfx - - file - - - file - - - ui - - - ui - - - ui - - - ui - - - ui - - - ui - - - ui - - - ui - - - net - - - net - - - net - - - net - - - net - - - net - gfx - - image - - - image - gfx - - net - gfx diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp index 54c9b1a73e..30eb175017 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp @@ -3,9 +3,9 @@ #include -#include "file/file_util.h" -#include "net/http_client.h" -#include "net/resolve.h" +#include "Common/File/FileUtil.h" +#include "Common/Net/HTTPClient.h" +#include "Common/Net/Resolve.h" #include "thin3d/thin3d_create.h" #include "Common/Common.h" @@ -15,7 +15,7 @@ #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Utf8.h" #include "Common/DirectXHelper.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Common/LogManager.h" #include "Common/TimeUtil.h" diff --git a/UWP/StorageFileLoader.cpp b/UWP/StorageFileLoader.cpp index 2797e9fe2c..3dfced89de 100644 --- a/UWP/StorageFileLoader.cpp +++ b/UWP/StorageFileLoader.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include "ppltasks.h" -#include "file/file_util.h" +#include "Common/File/FileUtil.h" +#include "Common/File/DirListing.h" #include "Common/Thread/ThreadUtil.h" #include "StorageFileLoader.h" #include "Common/Log.h" diff --git a/UWP/UWPHost.cpp b/UWP/UWPHost.cpp index be3f93d826..d16b730192 100644 --- a/UWP/UWPHost.cpp +++ b/UWP/UWPHost.cpp @@ -19,7 +19,7 @@ #include -#include "file/file_util.h" +#include "Common/File/DirListing.h" #include "Common/System/NativeApp.h" #include "Common/System/System.h" #include "Common/Input/InputState.h" diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index 6cbf136fc5..56d3fb720b 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -13,7 +13,7 @@ #include "Common/Data/Encoding/Utf8.h" #include "Common/System/System.h" #include "Common/System/NativeApp.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Common/LogManager.h" #include "Common/ConsoleListener.h" diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index d337085dbd..210344033f 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -34,12 +34,12 @@ // native stuff #include "Common/System/Display.h" #include "Common/System/NativeApp.h" -#include "file/file_util.h" #include "Common/Input/InputState.h" #include "Common/Input/KeyCodes.h" #include "Common/Data/Encoding/Utf8.h" - +#include "Common/File/DirListing.h" #include "Common/StringUtils.h" + #include "Core/Core.h" #include "Core/Config.h" #include "Core/ConfigValues.h" diff --git a/Windows/main.cpp b/Windows/main.cpp index 6043e099ca..1143938f8c 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -21,7 +21,7 @@ #include #include "Common/CommonWindows.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/OSVersion.h" #include "Common/Vulkan/VulkanLoader.h" #include "ppsspp_config.h" @@ -40,7 +40,7 @@ #include "Common/Profiler/Profiler.h" #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Encoding/Utf8.h" -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include "Core/Config.h" #include "Core/ConfigValues.h" diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 2277a40f41..69bae6d39c 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -102,15 +102,6 @@ ARCH_FILES := \ endif NATIVE_FILES :=\ - $(SRC)/ext/native/file/fd_util.cpp \ - $(SRC)/ext/native/file/file_util.cpp \ - $(SRC)/ext/native/net/http_client.cpp \ - $(SRC)/ext/native/net/http_server.cpp \ - $(SRC)/ext/native/net/http_headers.cpp \ - $(SRC)/ext/native/net/resolve.cpp \ - $(SRC)/ext/native/net/sinks.cpp \ - $(SRC)/ext/native/net/url.cpp \ - $(SRC)/ext/native/net/websocket_server.cpp \ $(SRC)/ext/native/gfx_es2/glsl_program.cpp \ $(SRC)/ext/native/gfx_es2/gpu_features.cpp \ $(SRC)/ext/native/gfx_es2/gl3stub.c \ @@ -119,9 +110,6 @@ NATIVE_FILES :=\ $(SRC)/ext/native/gfx_es2/draw_text_android.cpp.arm \ $(SRC)/ext/native/gfx/gl_debug_log.cpp \ $(SRC)/ext/native/gfx/texture_atlas.cpp \ - $(SRC)/ext/native/image/zim_load.cpp \ - $(SRC)/ext/native/image/zim_save.cpp \ - $(SRC)/ext/native/image/png_load.cpp \ $(SRC)/ext/native/thin3d/thin3d.cpp \ $(SRC)/ext/native/thin3d/thin3d_gl.cpp \ $(SRC)/ext/native/thin3d/thin3d_vulkan.cpp \ @@ -129,15 +117,7 @@ NATIVE_FILES :=\ $(SRC)/ext/native/thin3d/GLQueueRunner.cpp \ $(SRC)/ext/native/thin3d/VulkanRenderManager.cpp \ $(SRC)/ext/native/thin3d/VulkanQueueRunner.cpp \ - $(SRC)/ext/native/thin3d/DataFormatGL.cpp \ - $(SRC)/ext/native/ui/root.cpp \ - $(SRC)/ext/native/ui/view.cpp \ - $(SRC)/ext/native/ui/viewgroup.cpp \ - $(SRC)/ext/native/ui/ui.cpp \ - $(SRC)/ext/native/ui/ui_screen.cpp \ - $(SRC)/ext/native/ui/ui_tween.cpp \ - $(SRC)/ext/native/ui/ui_context.cpp \ - $(SRC)/ext/native/ui/screen.cpp + $(SRC)/ext/native/thin3d/DataFormatGL.cpp EGL_FILES := \ $(SRC)/Common/GL/GLInterface/EGL.cpp \ @@ -261,6 +241,12 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Data/Format/IniFile.cpp \ $(SRC)/Common/Data/Format/JSONReader.cpp \ $(SRC)/Common/Data/Format/JSONWriter.cpp \ + $(SRC)/Common/Data/Format/PNGLoad.cpp \ + $(SRC)/Common/Data/Format/PNGLoad.h \ + $(SRC)/Common/Data/Format/ZIMLoad.cpp \ + $(SRC)/Common/Data/Format/ZIMLoad.h \ + $(SRC)/Common/Data/Format/ZIMSave.cpp \ + $(SRC)/Common/Data/Format/ZIMSave.h \ $(SRC)/Common/Data/Hash/Hash.cpp \ $(SRC)/Common/Data/Text/I18n.cpp \ $(SRC)/Common/Data/Text/Parsers.cpp \ @@ -269,6 +255,11 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/File/VFS/AssetReader.cpp \ $(SRC)/Common/File/DiskFree.cpp \ $(SRC)/Common/File/PathBrowser.cpp \ + $(SRC)/Common/File/FileUtil.cpp \ + $(SRC)/Common/File/DirListing.cpp \ + $(SRC)/Common/File/FileDescriptor.cpp \ + $(SRC)/Common/Input/GestureDetector.cpp \ + $(SRC)/Common/Input/InputState.cpp \ $(SRC)/Common/Math/fast/fast_math.c \ $(SRC)/Common/Math/fast/fast_matrix.c \ $(SRC)/Common/Math/math_util.cpp \ @@ -276,14 +267,27 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/Math/expression_parser.cpp \ $(SRC)/Common/Math/lin/vec3.cpp.arm \ $(SRC)/Common/Math/lin/matrix4x4.cpp.arm \ + $(SRC)/Common/Net/HTTPClient.cpp \ + $(SRC)/Common/Net/HTTPHeaders.cpp \ + $(SRC)/Common/Net/HTTPServer.cpp \ + $(SRC)/Common/Net/Resolve.cpp \ + $(SRC)/Common/Net/Sinks.cpp \ + $(SRC)/Common/Net/URL.cpp \ + $(SRC)/Common/Net/WebsocketServer.cpp \ $(SRC)/Common/Profiler/Profiler.cpp \ $(SRC)/Common/System/Display.cpp \ $(SRC)/Common/Thread/Executor.cpp \ $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \ $(SRC)/Common/Thread/ThreadPool.cpp \ $(SRC)/Common/Thread/ThreadUtil.cpp \ - $(SRC)/Common/Input/GestureDetector.cpp \ - $(SRC)/Common/Input/InputState.cpp \ + $(SRC)/Common/UI/Root.cpp \ + $(SRC)/Common/UI/Screen.cpp \ + $(SRC)/Common/UI/UI.cpp \ + $(SRC)/Common/UI/Context.cpp \ + $(SRC)/Common/UI/UIScreen.cpp \ + $(SRC)/Common/UI/Tween.cpp \ + $(SRC)/Common/UI/View.cpp \ + $(SRC)/Common/UI/ViewGroup.cpp \ $(SRC)/Common/Serialize/Serializer.cpp \ $(SRC)/Common/ColorConv.cpp \ $(SRC)/Common/ExceptionHandlerSetup.cpp \ @@ -294,7 +298,6 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Common/MemArenaWin32.cpp \ $(SRC)/Common/MemArenaPosix.cpp \ $(SRC)/Common/MemoryUtil.cpp \ - $(SRC)/Common/FileUtil.cpp \ $(SRC)/Common/StringUtils.cpp \ $(SRC)/Common/SysError.cpp \ $(SRC)/Common/ThreadPools.cpp \ diff --git a/android/jni/TestRunner.cpp b/android/jni/TestRunner.cpp index 8bc9809d7b..e5489fd0c1 100644 --- a/android/jni/TestRunner.cpp +++ b/android/jni/TestRunner.cpp @@ -28,7 +28,7 @@ #include "ppsspp_config.h" #include "Common/System/Display.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Core/Core.h" #include "Core/System.h" diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index e81381aa6a..3e6c859210 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -49,7 +49,7 @@ struct JNIEnv {}; #define JNI_VERSION_1_6 16 #endif -#include "net/resolve.h" +#include "Common/Net/Resolve.h" #include "android/jni/AndroidAudio.h" #include "gfx/gl_common.h" #include "gfx_es2/gpu_features.h" diff --git a/ext/native/gfx_es2/draw_text.h b/ext/native/gfx_es2/draw_text.h index 7ee06aad5f..ed582845b9 100644 --- a/ext/native/gfx_es2/draw_text.h +++ b/ext/native/gfx_es2/draw_text.h @@ -21,10 +21,6 @@ namespace Draw { class Texture; } -#ifdef USING_QT_UI -#include -#endif - struct TextStringEntry { Draw::Texture *texture; int width; diff --git a/ext/native/gfx_es2/draw_text_qt.h b/ext/native/gfx_es2/draw_text_qt.h index c75cd51ca0..e8c01cd118 100644 --- a/ext/native/gfx_es2/draw_text_qt.h +++ b/ext/native/gfx_es2/draw_text_qt.h @@ -7,6 +7,8 @@ #if defined(USING_QT_UI) +#include + class TextDrawerQt : public TextDrawer { public: TextDrawerQt(Draw::DrawContext *draw); diff --git a/ext/native/gfx_es2/glsl_program.cpp b/ext/native/gfx_es2/glsl_program.cpp index 0578cd2cfe..a0bc2a376e 100644 --- a/ext/native/gfx_es2/glsl_program.cpp +++ b/ext/native/gfx_es2/glsl_program.cpp @@ -1,11 +1,11 @@ #include -#include -#include +#include +#include #include #include "Common/File/VFS/VFS.h" -//#include "file/zip_read.h" +#include "Common/File/FileUtil.h" #include "glsl_program.h" #include "Common/Log.h" diff --git a/ext/native/image/png_load.cpp b/ext/native/image/png_load.cpp deleted file mode 100644 index b8a273c17e..0000000000 --- a/ext/native/image/png_load.cpp +++ /dev/null @@ -1,114 +0,0 @@ -#include -#include -#include - -#ifdef USING_QT_UI -#include -#else -#include -#endif - -#include "png_load.h" - -#include "Common/Log.h" - -// *image_data_ptr should be deleted with free() -// return value of 1 == success. -int pngLoad(const char *file, int *pwidth, int *pheight, unsigned char **image_data_ptr, bool flip) { -#ifdef USING_QT_UI - QImage image(file, "PNG"); - if (image.isNull()) { - ERROR_LOG(IO, "pngLoad: Error loading image %s", file); - return 0; - } - - if (flip) - image = image.mirrored(); - *pwidth = image.width(); - *pheight = image.height(); - image = image.convertToFormat(QImage::Format_ARGB32); - *image_data_ptr = (unsigned char *)malloc(image.byteCount()); - uint32_t *src = (uint32_t*) image.bits(); - uint32_t *dest = (uint32_t*) *image_data_ptr; - // Qt4 does not support RGBA - for (size_t sz = 0; sz < (size_t)image.byteCount(); sz+=4, ++src, ++dest) { - const uint32_t v = *src; - *dest = (v & 0xFF00FF00) | ((v & 0xFF) << 16) | (( v >> 16 ) & 0xFF); // ARGB -> RGBA - } -#else - if (flip) - ERROR_LOG(IO, "pngLoad: flip flag not supported, image will be loaded upside down"); - png_image png; - memset(&png, 0, sizeof(png)); - png.version = PNG_IMAGE_VERSION; - - png_image_begin_read_from_file(&png, file); - - if (PNG_IMAGE_FAILED(png)) - { - ERROR_LOG(IO, "pngLoad: %s", png.message); - return 0; - } - *pwidth = png.width; - *pheight = png.height; - png.format = PNG_FORMAT_RGBA; - - int stride = PNG_IMAGE_ROW_STRIDE(png); - *image_data_ptr = (unsigned char *)malloc(PNG_IMAGE_SIZE(png)); - png_image_finish_read(&png, NULL, *image_data_ptr, stride, NULL); -#endif - - return 1; -} - -int pngLoadPtr(const unsigned char *input_ptr, size_t input_len, int *pwidth, int *pheight, unsigned char **image_data_ptr, - bool flip) { -#ifdef USING_QT_UI - QImage image; - if (!image.loadFromData(input_ptr, input_len, "PNG")) { - ERROR_LOG(IO, "pngLoad: Error loading image"); - return 0; - } - if (flip) - image = image.mirrored(); - *pwidth = image.width(); - *pheight = image.height(); - image = image.convertToFormat(QImage::Format_ARGB32); - *image_data_ptr = (unsigned char *)malloc(image.byteCount()); - uint32_t *src = (uint32_t*) image.bits(); - uint32_t *dest = (uint32_t*) *image_data_ptr; - // Qt4 does not support RGBA - for (size_t sz = 0; sz < (size_t)image.byteCount(); sz+=4, ++src, ++dest) { - const uint32_t v = *src; - *dest = (v & 0xFF00FF00) | ((v & 0xFF) << 16) | (( v >> 16 ) & 0xFF); // convert it! - } -#else - if (flip) - ERROR_LOG(IO, "pngLoad: flip flag not supported, image will be loaded upside down"); - png_image png{}; - png.version = PNG_IMAGE_VERSION; - - png_image_begin_read_from_memory(&png, input_ptr, input_len); - - if (PNG_IMAGE_FAILED(png)) { - ERROR_LOG(IO, "pngLoad: %s", png.message); - return 0; - } - *pwidth = png.width; - *pheight = png.height; - png.format = PNG_FORMAT_RGBA; - - int stride = PNG_IMAGE_ROW_STRIDE(png); - - size_t size = PNG_IMAGE_SIZE(png); - if (!size) { - ERROR_LOG(IO, "pngLoad: empty image"); - return 0; - } - - *image_data_ptr = (unsigned char *)malloc(size); - png_image_finish_read(&png, NULL, *image_data_ptr, stride, NULL); -#endif - - return 1; -} diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index f708266706..dd6381f71e 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -156,7 +156,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -178,7 +178,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -201,7 +201,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -224,7 +224,7 @@ Level3 _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) true false false @@ -251,7 +251,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) StreamingSIMDExtensions2 Precise true @@ -279,7 +279,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) NotSet Precise true @@ -309,7 +309,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) Precise true false @@ -338,7 +338,7 @@ true true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\libpng17;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;%(AdditionalIncludeDirectories) NotSet Precise true @@ -360,12 +360,9 @@ - - - @@ -375,7 +372,6 @@ - @@ -385,34 +381,15 @@ - - - - - - - - - - - - - - - - - - - @@ -421,7 +398,6 @@ - @@ -430,7 +406,6 @@ - @@ -445,27 +420,11 @@ - - - - - - - - - - - - - - - - diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters index b670b9fdb1..9befbb1243 100644 --- a/ext/native/native.vcxproj.filters +++ b/ext/native/native.vcxproj.filters @@ -1,7 +1,6 @@  - tools @@ -10,15 +9,6 @@ gfx - - image - - - image - - - image - gfx @@ -28,42 +18,9 @@ gfx - - file - - - ui - - - net - - - file - - - net - - - ui - - - ui - gfx - - ui - - - ui - - - net - - - ui - gfx @@ -76,18 +33,9 @@ thin3d - - net - - - net - gfx - - net - gfx @@ -115,9 +63,6 @@ thin3d - - ui - thin3d @@ -130,15 +75,9 @@ thin3d - - net - thin3d - - ui - gfx @@ -147,15 +86,6 @@ gfx - - image - - - image - - - image - gfx @@ -165,42 +95,9 @@ gfx - - file - - - ui - - - net - - - file - - - net - - - ui - - - ui - gfx - - ui - - - ui - - - net - - - ui - gfx @@ -219,18 +116,9 @@ thin3d - - net - - - net - thin3d - - net - thin3d @@ -258,9 +146,6 @@ thin3d - - ui - thin3d @@ -270,15 +155,9 @@ thin3d - - net - thin3d - - ui - gfx @@ -287,18 +166,6 @@ {9da89505-72a1-40e6-86e5-705372db1608} - - {828bddaf-63e5-4311-985b-bf377f86ff00} - - - {49afd06e-eb44-41ac-b038-e109e444a834} - - - {d738c2d1-749d-4b60-b98f-f3da0bbbf40c} - - - {6a548b3d-3a4c-4114-aa2f-0b42bf7bf2ce} - {4515306f-4664-46bf-a89b-abfec5520a15} diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 2060f2d978..5d691c64ca 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -21,7 +21,6 @@ #include #include "Common/System/Display.h" -#include "image/zim_load.h" #include "Common/Math/lin/matrix4x4.h" #include "Common/Data/Convert/SmallDataConvert.h" #include "thin3d/thin3d.h" diff --git a/ext/native/tools/atlastool.cpp b/ext/native/tools/atlastool.cpp index 7207fcc093..079c994cf3 100644 --- a/ext/native/tools/atlastool.cpp +++ b/ext/native/tools/atlastool.cpp @@ -31,8 +31,8 @@ #include "gfx/texture_atlas.h" -#include "image/png_load.h" -#include "image/zim_save.h" +#include "Common/Data/Format/PNGLoad.h" +#include "Common/Data/Format/ZIMSave.h" #include "kanjifilter.h" // extracted only JIS Kanji on the CJK Unified Ideographs of UCS2. Cannot reading BlockAllocator. (texture size over) @@ -152,7 +152,7 @@ struct Image { bool LoadPNG(const char *png_name) { unsigned char *img_data; int w, h; - if (1 != pngLoad(png_name, &w, &h, &img_data, false)) { + if (1 != pngLoad(png_name, &w, &h, &img_data)) { printf("Failed to load %s\n", png_name); exit(1); return false; diff --git a/ext/native/tools/zimtool.cpp b/ext/native/tools/zimtool.cpp index 9e3fe3b813..88f9e9da16 100644 --- a/ext/native/tools/zimtool.cpp +++ b/ext/native/tools/zimtool.cpp @@ -2,16 +2,14 @@ #include #include -#include "image/png_load.h" -#include "image/zim_load.h" -#include "image/zim_save.h" +#include "Common/Data/Format/PNGLoad.h" +#include "Common/Data/Format/ZIMLoad.h" +#include "Common/Data/Format/ZIMSave.h" #include "Common/Common.h" char magic[5] = "ZIMG"; -bool FLAGS_flip = false; - const char *format_strings[4] = { "8888", "4444", "565", "ETC1" }; int formats[3] = { ZIM_RGBA8888, ZIM_RGBA4444, ZIM_RGB565 }; @@ -82,7 +80,7 @@ int main(int argc, char **argv) { uint8_t *image_data; int width, height; - if (1 != pngLoad(FLAGS_infile, &width, &height, &image_data, FLAGS_flip)) { + if (1 != pngLoad(FLAGS_infile, &width, &height, &image_data)) { fprintf(stderr, "Input not a PNG file\n"); printusage(); return 1; diff --git a/headless/Compare.cpp b/headless/Compare.cpp index ba35b93c90..8036090001 100644 --- a/headless/Compare.cpp +++ b/headless/Compare.cpp @@ -16,10 +16,9 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "headless/Compare.h" -#include "file/file_util.h" #include "Common/ColorConv.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Core/Host.h" #include "GPU/GPUState.h" diff --git a/headless/Headless.cpp b/headless/Headless.cpp index bd6735e4fe..299cdd2cf0 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -15,7 +15,7 @@ #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/GraphicsContext.h" #include "Common/TimeUtil.h" #include "Core/Config.h" diff --git a/headless/SDLHeadlessHost.cpp b/headless/SDLHeadlessHost.cpp index f3652e03af..8e5799dd03 100644 --- a/headless/SDLHeadlessHost.cpp +++ b/headless/SDLHeadlessHost.cpp @@ -29,7 +29,7 @@ #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/GraphicsContext.h" #include "Common/TimeUtil.h" diff --git a/headless/StubHost.cpp b/headless/StubHost.cpp index a555a07816..1219d42365 100644 --- a/headless/StubHost.cpp +++ b/headless/StubHost.cpp @@ -15,7 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Log.h" #include "Core/CoreParameter.h" #include "Core/System.h" diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp index 64d22cc57b..2f9d06aa1f 100644 --- a/headless/WindowsHeadlessHost.cpp +++ b/headless/WindowsHeadlessHost.cpp @@ -26,7 +26,7 @@ #include "Common/CommonWindows.h" #include "Common/Log.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/TimeUtil.h" #include "Core/CoreParameter.h" diff --git a/ios/PPSSPPUIApplication.mm b/ios/PPSSPPUIApplication.mm index eb66aa202b..a9075cd6ac 100644 --- a/ios/PPSSPPUIApplication.mm +++ b/ios/PPSSPPUIApplication.mm @@ -19,8 +19,8 @@ #include "Common/File/VFS/VFS.h" #include "Common/File/VFS/AssetReader.h" #include "Common/Input/InputState.h" -#include "net/resolve.h" -#include "ui/screen.h" +#include "Common/Net/Resolve.h" +#include "Common/UI/Screen.h" #include "thin3d/thin3d.h" #include "Common/Input/KeyCodes.h" #include "gfx_es2/gpu_features.h" diff --git a/ios/ViewController.mm b/ios/ViewController.mm index a6be65bedd..82f4ddf00a 100644 --- a/ios/ViewController.mm +++ b/ios/ViewController.mm @@ -12,8 +12,8 @@ #import #include -#include "net/resolve.h" -#include "ui/screen.h" +#include "Common/Net/Resolve.h" +#include "Common/UI/Screen.h" #include "thin3d/thin3d.h" #include "thin3d/thin3d_create.h" #include "thin3d/GLRenderManager.h" diff --git a/libretro/Makefile.common b/libretro/Makefile.common index d0a534c6c9..ff977d5000 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -152,6 +152,12 @@ SOURCES_CXX += \ $(COMMONDIR)/Data/Format/IniFile.cpp \ $(COMMONDIR)/Data/Format/JSONReader.cpp \ $(COMMONDIR)/Data/Format/JSONWriter.cpp \ + $(COMMONDIR)/Data/Format/PNGLoad.cpp \ + $(COMMONDIR)/Data/Format/PNGLoad.h \ + $(COMMONDIR)/Data/Format/ZIMLoad.cpp \ + $(COMMONDIR)/Data/Format/ZIMLoad.h \ + $(COMMONDIR)/Data/Format/ZIMSave.cpp \ + $(COMMONDIR)/Data/Format/ZIMSave.h \ $(COMMONDIR)/Data/Hash/Hash.cpp \ $(COMMONDIR)/Data/Text/I18n.cpp \ $(COMMONDIR)/Data/Text/Parsers.cpp \ @@ -160,23 +166,40 @@ SOURCES_CXX += \ $(COMMONDIR)/File/VFS/AssetReader.cpp \ $(COMMONDIR)/File/DiskFree.cpp \ $(COMMONDIR)/File/PathBrowser.cpp \ + $(COMMONDIR)/File/FileUtil.cpp \ + $(COMMONDIR)/File/FileDescriptor.cpp \ + $(COMMONDIR)/File/DirListing.cpp \ + $(COMMONDIR)/Input/GestureDetector.cpp \ + $(COMMONDIR)/Input/InputState.cpp \ $(COMMONDIR)/Math/curves.cpp \ $(COMMONDIR)/Math/expression_parser.cpp \ $(COMMONDIR)/Math/math_util.cpp \ $(COMMONDIR)/Math/lin/vec3.cpp \ $(COMMONDIR)/Math/lin/matrix4x4.cpp \ + $(COMMONDIR)/Net/HTTPClient.cpp \ + $(COMMONDIR)/Net/HTTPHeaders.cpp \ + $(COMMONDIR)/Net/HTTPServer.cpp \ + $(COMMONDIR)/Net/Resolve.cpp \ + $(COMMONDIR)/Net/Sinks.cpp \ + $(COMMONDIR)/Net/URL.cpp \ + $(COMMONDIR)/Net/WebsocketServer.cpp \ $(COMMONDIR)/Serialize/Serializer.cpp \ $(COMMONDIR)/Thread/Executor.cpp \ $(COMMONDIR)/Thread/ThreadUtil.cpp \ $(COMMONDIR)/Thread/ThreadPool.cpp \ $(COMMONDIR)/Thread/PrioritizedWorkQueue.cpp \ + $(COMMONDIR)/UI/Root.cpp \ + $(COMMONDIR)/UI/Screen.cpp \ + $(COMMONDIR)/UI/UI.cpp \ + $(COMMONDIR)/UI/Context.cpp \ + $(COMMONDIR)/UI/UIScreen.cpp \ + $(COMMONDIR)/UI/Tween.cpp \ + $(COMMONDIR)/UI/View.cpp \ + $(COMMONDIR)/UI/ViewGroup.cpp \ $(COMMONDIR)/System/Display.cpp \ - $(COMMONDIR)/Input/GestureDetector.cpp \ - $(COMMONDIR)/Input/InputState.cpp \ $(COMMONDIR)/Buffer.cpp \ $(COMMONDIR)/ConsoleListener.cpp \ $(COMMONDIR)/ExceptionHandlerSetup.cpp \ - $(COMMONDIR)/FileUtil.cpp \ $(COMMONDIR)/KeyMap.cpp \ $(COMMONDIR)/Log.cpp \ $(COMMONDIR)/LogManager.cpp \ @@ -302,9 +325,7 @@ SOURCES_CXX += $(COMMONDIR)/MemArenaPosix.cpp \ $(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp endif -SOURCES_CXX += $(NATIVEDIR)/file/fd_util.cpp \ - $(NATIVEDIR)/file/file_util.cpp \ - $(NATIVEDIR)/gfx/gl_debug_log.cpp \ +SOURCES_CXX += $(NATIVEDIR)/gfx/gl_debug_log.cpp \ $(NATIVEDIR)/gfx/texture_atlas.cpp \ $(NATIVEDIR)/gfx/d3d9_shader.cpp \ $(NATIVEDIR)/gfx/d3d9_state.cpp \ @@ -312,8 +333,6 @@ SOURCES_CXX += $(NATIVEDIR)/file/fd_util.cpp \ $(NATIVEDIR)/gfx_es2/draw_text.cpp \ $(NATIVEDIR)/gfx_es2/gpu_features.cpp \ $(NATIVEDIR)/gfx_es2/glsl_program.cpp \ - $(NATIVEDIR)/image/zim_load.cpp \ - $(NATIVEDIR)/image/png_load.cpp \ $(NATIVEDIR)/net/http_client.cpp \ $(NATIVEDIR)/net/resolve.cpp \ $(NATIVEDIR)/net/url.cpp \ @@ -322,14 +341,6 @@ SOURCES_CXX += $(NATIVEDIR)/file/fd_util.cpp \ $(NATIVEDIR)/thin3d/GLRenderManager.cpp \ $(NATIVEDIR)/thin3d/GLQueueRunner.cpp \ $(NATIVEDIR)/thin3d/DataFormatGL.cpp \ - $(NATIVEDIR)/ui/root.cpp \ - $(NATIVEDIR)/ui/screen.cpp \ - $(NATIVEDIR)/ui/ui.cpp \ - $(NATIVEDIR)/ui/ui_context.cpp \ - $(NATIVEDIR)/ui/ui_screen.cpp \ - $(NATIVEDIR)/ui/ui_tween.cpp \ - $(NATIVEDIR)/ui/view.cpp \ - $(NATIVEDIR)/ui/viewgroup.cpp \ $(EXTDIR)/jpge/jpgd.cpp \ $(EXTDIR)/jpge/jpge.cpp \ $(COREDIR)/AVIDump.cpp \ diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 8b0cefa854..bdb5f8d1b1 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -11,7 +11,7 @@ #include "Common/System/NativeApp.h" #include "Common/System/System.h" #include "Common/TimeUtil.h" -#include "Common/FileUtil.h" +#include "Common/File/FileUtil.h" #include "Common/Serialize/Serializer.h" #include "Common/ConsoleListener.h" #include "Common/Input/InputState.h"