调整头文件包含顺序

This commit is contained in:
2025-08-06 18:06:30 +08:00
parent 957a372209
commit 429292b446
13 changed files with 21 additions and 33 deletions

View File

@ -5,9 +5,7 @@
#include "BinaryReader.h" #include "BinaryReader.h"
#include <filesystem> #include <filesystem>
#include <fstream>
#include <iostream> #include <iostream>
#include <vector>
namespace PKG namespace PKG
{ {

View File

@ -4,12 +4,13 @@
#ifndef BINARYREADER_H #ifndef BINARYREADER_H
#define BINARYREADER_H #define BINARYREADER_H
#include <cstdint>
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <vector> #include <vector>
#include "../Core.h" #include "Core.h"
namespace PKG namespace PKG
{ {

View File

@ -5,7 +5,6 @@
#include "BinaryWriter.h" #include "BinaryWriter.h"
#include <filesystem> #include <filesystem>
#include <fstream>
#include <iostream> #include <iostream>
namespace PKG namespace PKG

View File

@ -7,9 +7,8 @@
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
#include <vector>
#include "../Core.h" #include "Core.h"
namespace PKG namespace PKG
{ {

View File

@ -4,10 +4,8 @@
#include "ImageReader.h" #include "ImageReader.h"
#include <filesystem>
#include <iostream> #include <iostream>
#include "BinaryWriter.h"
#include "lz4.h" #include "lz4.h"

View File

@ -4,8 +4,8 @@
#ifndef IMAGEREADER_H #ifndef IMAGEREADER_H
#define IMAGEREADER_H #define IMAGEREADER_H
#include "BinaryReader.h" #include "BinaryOPT/BinaryReader.h"
#include "../Tex/TexImageContainer.h" #include "Tex/TexImageContainer.h"
namespace PKG namespace PKG
{ {

View File

@ -4,12 +4,11 @@
#include "EXPKG.h" #include "EXPKG.h"
#include "BinaryOPT/BinaryWriter.h"
#include "BinaryOPT/ImageReader.h"
#include "stb_image_write.h"
#include <iostream> #include <iostream>
#include "BinaryOPT/BinaryWriter.h"
#include "BinaryOPT/ImageReader.h"
#include "Tex/Tex.h"
extern "C" unsigned char* stbi_write_png_to_mem(const unsigned char* pixels, int stride_bytes, int x, int y, int n, extern "C" unsigned char* stbi_write_png_to_mem(const unsigned char* pixels, int stride_bytes, int x, int y, int n,
int* out_len); int* out_len);
@ -331,7 +330,7 @@ example:
// return ImageResult // return ImageResult
// data format // data format
std::filesystem::path outPath = m_OutDir / m_Reader->GetFileName(); std::filesystem::path outPath = m_OutDir / reader->GetFileName();
outPath.replace_extension(GetFileExtension(format)); outPath.replace_extension(GetFileExtension(format));
std::cout << "convert file: " << outPath << std::endl; std::cout << "convert file: " << outPath << std::endl;

View File

@ -4,11 +4,10 @@
#ifndef EXPKG_H #ifndef EXPKG_H
#define EXPKG_H #define EXPKG_H
#include <filesystem>
#include <memory>
#include "BinaryOPT/BinaryReader.h" #include <vector>
#include "Tex/Tex.h"
#include "Entry.h"
typedef struct CommandArgs typedef struct CommandArgs
@ -19,6 +18,7 @@ typedef struct CommandArgs
namespace PKG namespace PKG
{ {
class BinaryReader;
enum class FILE_EXTENSION; enum class FILE_EXTENSION;
class PKG_API EXPKG class PKG_API EXPKG
@ -38,7 +38,6 @@ namespace PKG
private: private:
std::shared_ptr<BinaryReader> m_Reader; std::shared_ptr<BinaryReader> m_Reader;
std::shared_ptr<Tex> m_Tex;
std::filesystem::path m_OutDir; std::filesystem::path m_OutDir;

View File

@ -4,12 +4,13 @@
#ifndef ENTRY_H #ifndef ENTRY_H
#define ENTRY_H #define ENTRY_H
#include <cstdint>
#include <filesystem> #include <filesystem>
#include <string> #include <string>
#include "Core.h" #include "Core.h"
namespace PKG namespace PKG
{ {
enum class TexFormat enum class TexFormat

View File

@ -4,10 +4,7 @@
#ifndef TEX_H #ifndef TEX_H
#define TEX_H #define TEX_H
#include <optional>
#include <string>
#include "Entry.h"
#include "TexImageContainer.h" #include "TexImageContainer.h"

View File

@ -4,9 +4,10 @@
#ifndef TEXIMAGE_H #ifndef TEXIMAGE_H
#define TEXIMAGE_H #define TEXIMAGE_H
#include <vector> #include <vector>
#include "../Entry.h" #include "Entry.h"
namespace PKG namespace PKG
{ {

View File

@ -4,11 +4,8 @@
#ifndef TEXIMAGECONTAINER_H #ifndef TEXIMAGECONTAINER_H
#define TEXIMAGECONTAINER_H #define TEXIMAGECONTAINER_H
#include <memory>
#include "../Entry.h"
#include "TexImage.h" #include "TexImage.h"
#include "BinaryOPT/BinaryReader.h"
namespace PKG namespace PKG
{ {

View File

@ -1,15 +1,14 @@
#ifndef EXPKG_H #ifndef EXPKG_H
#define EXPKG_H #define EXPKG_H
#include "Entry.h"
#include "BinaryOPT/BinaryReader.h" #include "BinaryOPT/BinaryReader.h"
#include "BinaryOPT/BinaryWriter.h" #include "BinaryOPT/BinaryWriter.h"
#include "Entry.h" #include "BinaryOPT/ImageReader.h"
#include "EXPKG/EXPKG.h"
#include "Tex/Tex.h" #include "Tex/Tex.h"
#include "Tex/TexImage.h" #include "Tex/TexImage.h"
#include "Tex/TexImageContainer.h" #include "Tex/TexImageContainer.h"
#include "BinaryOPT/ImageReader.h"
#include "EXPKG/EXPKG.h"
#endif // EXPKG_H #endif // EXPKG_H