sigonasr2/EarthboundBattleBackgrounds
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Add in some layer encapsulation and prepare drawing tick.

Browse Source
This commit is contained in:
sigonasr2 2024-07-03 16:06:38 -04:00
parent 99dde2e607
commit bbeac33ad6
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"files.associations": {
"cstdint": "cpp"
}
}

41
EarthboundBattleBackgrounds/EarthboundBattleBackgrounds/main.cpp
View File

@ -342,8 +342,9 @@ struct Rom{
BattleBackground&background;
BackgroundGraphics&graphics;
PaletteCycle cycle;
uint_fast16_t backgroundInd;
BackgroundLayer(PixelGameEngine*pge,uint_fast16_t backgroundInd,std::vector<BattleBackground>&backgrounds,std::vector<BackgroundPalette>&palettes,std::vector<BackgroundGraphics>&graphics,std::u8string_view data)
:pge(pge),spr(new Sprite(256,256)),distorter(*spr),background(backgrounds[backgroundInd]),graphics(graphics[background.graphicsInd]),cycle(background,palettes[background.paletteInd]){
:pge(pge),spr(new Sprite(256,256)),distorter(*spr),backgroundInd(backgroundInd),background(backgrounds[backgroundInd]),graphics(graphics[background.graphicsInd]),cycle(background,palettes[background.paletteInd]){
uint_fast32_t effectVal{((background.GetAnimation()>>16)&0xFF)};
if(effectVal==0)effectVal=(((background.GetAnimation()>>24)&0xFF));
distorter.effect=std::make_unique<DistortionEffect>(data,effectVal);
@ -354,7 +355,20 @@ struct Rom{
std::vector<BattleBackground>backgrounds;
std::vector<BackgroundPalette>palettes;
std::vector<BackgroundGraphics>graphics;
const BackgroundLayer*const GetLayer1(){return layer1.get();}
const BackgroundLayer*const GetLayer2(){return layer2.get();}
void SetLayer1(uint_fast16_t backgroundInd){
backgroundInd=std::clamp(backgroundInd,0U,uint_fast16_t(backgrounds.size()));
layer1=std::make_unique<BackgroundLayer>(nullptr,backgroundInd,backgrounds,palettes,graphics,data);
}
void SetLayer2(uint_fast16_t backgroundInd){
backgroundInd=std::clamp(backgroundInd,0U,uint_fast16_t(backgrounds.size()));
layer2=std::make_unique<BackgroundLayer>(nullptr,backgroundInd,backgrounds,palettes,graphics,data);
}
private:
std::unique_ptr<BackgroundLayer>layer1,layer2;
public:
Rom(){
#pragma region Setup Reversed Bytes
reversedBytes.resize(256);
@ -457,17 +471,28 @@ public:
}
}
void BackgroundLayerDisplayTest(){
}
int yOffset{0};
float accumulatedTime{};
void runTick(){
float alpha1{1.f},alpha2{1.f};
if(rom.GetLayer1()->backgroundInd&&!rom.GetLayer2()->backgroundInd){
alpha1=1.f;
alpha2=0.f;
}
if(!rom.GetLayer1()->backgroundInd&&rom.GetLayer2()->backgroundInd){
alpha1=0.f;
alpha2=1.f;
}
}
bool OnUserUpdate(float fElapsedTime) override
{
//PaletteDisplayTest();
//GraphicsDisplayTest();
//BackgroundLayerDisplayTest();
accumulatedTime+=fElapsedTime;
while(accumulatedTime>=1/60.f){
runTick();
accumulatedTime-=1/60.f
}
return true;
}
};