jaby/jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Include SplashImage and detect right type

Browse Source
This commit is contained in:
jaby
2022-10-02 11:01:42 +02:00
parent 1daeefc407
commit e69974672b
5 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/PSX/File/File_Types.hpp
View File

@@ -9,6 +9,10 @@ struct __no_align SimpleTIM : private ComplexBitMap<uint32_t> {
static constexpr auto ClutX = BitRange<uint32_t>(17, 22);
static constexpr auto ClutY = BitRange<uint32_t>(23, 31);
constexpr SimpleTIM() {
this->raw = 0;
}
constexpr SimpleTIM(uint16_t texX, uint16_t texY, uint16_t clutX, uint16_t clutY) : ComplexBitMap(ComplexBitMap::with(TextureX.with(texX), TextureY.with(texY), ClutX.with(clutX), ClutY.with(clutY))) {
}

8
include/PSX/File/Processor/File_Processor.hpp
View File

@@ -6,7 +6,7 @@ namespace FileProcessor {
class State {
private:
struct Reserved {
uint32_t reserved[2];
uint32_t reserved[4];
};
struct Configuration;
@@ -26,6 +26,12 @@ namespace FileProcessor {
Configuration config;
Reserved reserved;
template<typename T>
static __always_inline State from(const T& reserved, const uint32_t* data_adr, bool (*process_routine)(Configuration&, T&, size_t)) {
return {Configuration::from(process_routine, data_adr), *reinterpret_cast<const Reserved*>(&reserved)};
static_assert(sizeof(T) <= sizeof(Reserved));
}
public:
bool process(size_t size) {
return (*this->config.process_routine)(this->config, this->reserved, size);