wgroeneveld
/
gba-sprite-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u16 = COLOR

This commit is contained in:
wgroeneveld 2018-08-06 09:50:53 +02:00
parent 56dbeec546
commit 32f62cadb0
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/palette/palette_manager.cpp
View File

@ -14,6 +14,10 @@ int getBits(int number, int k, int p) {
return (((1 << k) - 1) & (number >> p)); return (((1 << k) - 1) & (number >> p));
} }
PaletteManager::PaletteManager(const COLOR *paletteData, int size) : data(paletteData), size(size) {
}
CombinedPalette* PaletteManager::operator+(const PaletteManager &other) { CombinedPalette* PaletteManager::operator+(const PaletteManager &other) {
return new CombinedPalette(*this, const_cast<PaletteManager&>(other)); return new CombinedPalette(*this, const_cast<PaletteManager&>(other));
} }
@ -59,7 +63,6 @@ void PaletteManager::increaseBrightness(u32 intensity) {
return; return;
} }
auto palBank = this->paletteBank();
for(int bank = 0; bank < PALETTE_BANK_SIZE; bank++) { for(int bank = 0; bank < PALETTE_BANK_SIZE; bank++) {
for(int index = 0; index < PALETTE_BANK_SIZE; index++) { for(int index = 0; index < PALETTE_BANK_SIZE; index++) {
auto current = get(bank, index); auto current = get(bank, index);

14
src/engine/palette/palette_manager.h
View File

@ -18,14 +18,14 @@ class CombinedPalette;
class PaletteManager { class PaletteManager {
protected: protected:
const u16 *data; const COLOR *data;
int size; int size;
virtual void* paletteAddress() = 0; virtual void* paletteAddress() = 0;
virtual PALBANK* paletteBank() = 0; virtual PALBANK* paletteBank() = 0;
public: public:
PaletteManager(const u16 paletteData[]) : data(paletteData), size(PALETTE_MAX_SIZE) {} PaletteManager(const COLOR paletteData[]) : PaletteManager(paletteData, PALETTE_MAX_SIZE) {}
PaletteManager(const u16 paletteData[], int size) : data(paletteData), size(size) {} PaletteManager(const COLOR paletteData[], int size);
CombinedPalette* operator+(const PaletteManager& other); CombinedPalette* operator+(const PaletteManager& other);
@ -54,8 +54,8 @@ protected:
public: public:
BackgroundPaletteManager() : PaletteManager(nullptr) {} BackgroundPaletteManager() : PaletteManager(nullptr) {}
BackgroundPaletteManager(const u16 paletteData[]) : PaletteManager(paletteData) {} BackgroundPaletteManager(const COLOR paletteData[]) : PaletteManager(paletteData) {}
BackgroundPaletteManager(const u16 paletteData[], int size) : PaletteManager(paletteData, size) {} BackgroundPaletteManager(const COLOR paletteData[], int size) : PaletteManager(paletteData, size) {}
}; };
@ -70,8 +70,8 @@ protected:
} }
public: public:
ForegroundPaletteManager(const u16 paletteData[]) : PaletteManager(paletteData) {} ForegroundPaletteManager(const COLOR paletteData[]) : PaletteManager(paletteData) {}
ForegroundPaletteManager(const u16 paletteData[], int size) : PaletteManager(paletteData, size) {} ForegroundPaletteManager(const COLOR paletteData[], int size) : PaletteManager(paletteData, size) {}
}; };
#endif //GBA_SPRITE_ENGINE_PALETTE_MANAGER_H #endif //GBA_SPRITE_ENGINE_PALETTE_MANAGER_H