Add palette-faithful club logo import, transformations and isolated crest cells (by Codex)

This commit is contained in:
Codex committed 2026-10-31 15:29:11 +01:00
1 parent db21653b75
commit 561d290643
12 files changed
+155 -13

No files matched your search

+13
View File
@@ -0,0 +1,13 @@
// SPDX-License-Identifier: GPL-3.0-only
#define NOMINMAX
#include "obdeddi/logo_transform_win32.hpp"
#include <iostream>
#include <stdexcept>
void check(bool ok,const char* message){if(!ok)throw std::runtime_error(message);}
int main()try{Gdiplus::GdiplusStartupInput input;ULONG_PTR token=0;check(Gdiplus::GdiplusStartup(&token,&input,nullptr)==Gdiplus::Ok,"GDI startup");
{Gdiplus::Bitmap source(16,8,PixelFormat32bppARGB);for(int y=0;y<8;++y)for(int x=0;x<16;++x)source.SetPixel(x,y,x<8?Gdiplus::Color(255,255,0,0):Gdiplus::Color(255,0,0,255));
auto normal=bmh::obdeddi::transform_logo(source,0,0,16,8,0,false,false);auto mirror=bmh::obdeddi::transform_logo(source,0,0,16,8,0,true,false);auto rotate=bmh::obdeddi::transform_logo(source,0,0,16,8,180,false,false);auto crop=bmh::obdeddi::transform_logo(source,0,0,8,8,0,false,false);
check((normal[19*38+8]&0xffffff)==0xff0000,"normal left color");check((mirror[19*38+8]&0xffffff)==0xff,"horizontal mirror");check((rotate[19*38+8]&0xffffff)==0xff,"rotation");check((crop[19*38+30]&0xffffff)==0xff0000,"crop respects source rectangle");check((normal[0]>>24)==0,"transparent fit border");
bool rejected=false;try{bmh::obdeddi::transform_logo(source,-1,0,16,8,0,false,false);}catch(...){rejected=true;}check(rejected,"invalid crop accepted");}
Gdiplus::GdiplusShutdown(token);std::cout<<"Native logo crop, rotation, mirroring and alpha passed\n";return 0;
}catch(const std::exception&e){std::cerr<<e.what()<<'\n';return 1;}
+2 -1
View File
@@ -22,12 +22,13 @@ int main()try{
check(app::scene_frame_delay(80)==100&&app::scene_frame_delay(0)==16,"scene pacing mapping");
auto db=synthetic();auto master=encode_database(db);check(encode_database(decode_database(master,db.counts))==master,"master roundtrip");
auto root=std::filesystem::temp_directory_path()/("obdeddi-test-"+std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));std::filesystem::create_directories(root);
auto runtime=bytes("OBMHDAT1");runtime.resize(36);const Bytes asset{3,17,91,0,255};auto input=archive({{"M3D.MAN",master},{"RUNTIME.DAT",runtime},{"OBMHPROF.INI",bytes("[OpenBMH]\nprofile=classic-plus-1\n")},{"KB/1.VGA",asset}});auto path=root/std::filesystem::path(std::u8string(u8"Saison-ä.obd"));write(path,input);
auto runtime=bytes("OBMHDAT1");runtime.resize(36);const Bytes asset{3,17,91,0,255};Bytes palette(768,0);for(size_t i=0;i<256;++i)for(int c=0;c<3;++c)palette[i*3+size_t(c)]=uint8_t(std::min(size_t(63),i/4));palette[10*3]=63;palette[10*3+1]=palette[10*3+2]=0;palette[20*3]=palette[20*3+1]=0;palette[20*3+2]=63;Bytes pixels(304*38,94),vga;auto putHeader=[&](uint32_t v,int n){for(int b=0;b<n;++b)vga.push_back(uint8_t(v>>(b*8)));};Bytes payload;for(size_t i=0;i<pixels.size();i+=128){size_t n=std::min(size_t(128),pixels.size()-i);payload.push_back(uint8_t(n-1));payload.insert(payload.end(),pixels.begin()+i,pixels.begin()+i+n);}payload.push_back(0);putHeader(304,2);putHeader(38,2);putHeader(uint32_t(payload.size()),4);vga.insert(vga.end(),payload.begin(),payload.end());auto input=archive({{"M3D.MAN",master},{"RUNTIME.DAT",runtime},{"OBMHPROF.INI",bytes("[OpenBMH]\nprofile=classic-plus-1\n")},{"KB/1.VGA",asset},{"M3PC.COL",palette},{"W/0.VGA",vga}});auto path=root/std::filesystem::path(std::u8string(u8"Saison-ä.obd"));write(path,input);
Document doc(path);check(!doc.dirty()&&doc.save().empty()&&read_file(path)==input,"no-op wrote a file");
auto player=doc.player(0);auto high=db.players[0].w35c&~0x1fffffu;player.name="M}LLER";player.nation=61;player.age=30;player.form=75;player.skills[2]=3;doc.set_player(0,player);check((doc.database().players[0].w35c&~0x1fffffu)==high,"unrelated player bits changed");
auto invalid=player;invalid.skills[0]=4;bool rejected=false;try{doc.set_player(1,invalid);}catch(const FormatError&){rejected=true;}check(rejected,"invalid skill accepted");
doc.set_club(0,"NEUER VEREIN",3,0,12);doc.move_player(0,1);check(doc.club_of(0)==1&&doc.club_of(20)==1,"move failed");doc.move_player(1,1,20);check(doc.club_of(1)==1&&doc.club_of(20)==0,"swap failed");
auto backup=doc.save();check(!backup.empty()&&read_file(backup)==input,"backup not exact");check(entry(path,"KB/1.VGA")==asset,"asset modified");Document loaded(path);check(loaded.player(0).name=="M}LLER"&&loaded.player(0).nation==61&&loaded.database().club_names[0]=="NEUER VEREIN","edited data not persisted");check(loaded.club_of(0)==1&&loaded.club_of(20)==0,"saved roster changed");
auto logoPath=root/"logos.obd";write(logoPath,input);Document logos(logoPath);auto originalSelectors=logos.database().raw_club_badge_selectors;std::array<uint32_t,1444> rgba{};rgba.fill(0xffff0000);auto preview=logos.preview_logo(rgba);logos.set_logo(0,rgba);check(logos.logo(0)==preview,"logo preview differs from stored palette result");check(le16(logos.database().raw_club_badge_selectors,0)==1,"shared logo was not cloned");check(le16(logos.database().raw_club_badge_selectors,2)==0,"neighbour selector changed");logos.save();auto firstMaster=entry(logoPath,"M3D.MAN");auto sheet=decode_vga(entry(logoPath,"W/0.VGA"));for(int y=0;y<38;++y)for(int x=0;x<304;++x)if(x<38||x>=76)check(sheet.pixels[size_t(y*304+x)]==94,"neighbour pixels changed");rgba.fill(0xff0000ff);logos.set_logo(0,rgba);logos.save();check(entry(logoPath,"M3D.MAN")==firstMaster,"logo-only save changed database");Document logoReload(logoPath);check(logoReload.logo(0)==logoReload.preview_logo(rgba),"logo-only edit was not saved");
auto changed=loaded.player(2);changed.form=40;loaded.set_player(2,changed);auto outside=read_file(path);outside.push_back(0);write(path,outside);rejected=false;try{loaded.save();}catch(const FormatError&){rejected=true;}check(rejected&&read_file(path)==outside,"external edit overwritten");
auto failRoot=root/"backup-failure";std::filesystem::create_directory(failRoot);auto failPath=failRoot/"COMMUNITY.OBD";write(failPath,input);write(failRoot/"backups",bytes("not a directory"));Document failure(failPath);auto value=failure.player(0);value.form=12;failure.set_player(0,value);rejected=false;try{failure.save();}catch(const std::exception&){rejected=true;}check(rejected&&read_file(failPath)==input,"backup failure changed original");
auto corrupt=input;corrupt.resize(12);write(root/"bad.obd",corrupt);rejected=false;try{Document bad(root/"bad.obd");}catch(const std::exception&){rejected=true;}check(rejected,"truncated archive accepted");