Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cmdsprite 2 #13590

Merged
merged 15 commits into from
Dec 16, 2020
Merged

Cmdsprite 2 #13590

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ade0646
Merge all cmdsprite global state into single struct
duncanspumpkin Dec 15, 2020
af5e7ad
Move MakeEntries into a member function
duncanspumpkin Dec 15, 2020
030ba01
Use std::optional for sprite file open
duncanspumpkin Dec 15, 2020
3b39ab2
Move sprite_file_save to a member function
duncanspumpkin Dec 15, 2020
41a2e13
Make sprite_file_close a member function and rename open
duncanspumpkin Dec 15, 2020
ef9fdbd
Remove global variable
duncanspumpkin Dec 15, 2020
a5ff037
Make Entries a vector
duncanspumpkin Dec 15, 2020
1b4f5be
Make Data a vector
duncanspumpkin Dec 15, 2020
bc16be2
Use FileStream for Open
duncanspumpkin Dec 15, 2020
48b3fe8
Use FileStream for Save
duncanspumpkin Dec 15, 2020
a701f3a
Renmae Image Import/Export functions and cleanup
duncanspumpkin Dec 15, 2020
8a91330
Extract out common item AddImage
duncanspumpkin Dec 15, 2020
dccb8c6
Simplify SpriteFile::AddImage
duncanspumpkin Dec 15, 2020
bb76db6
Header and struct cleanup
duncanspumpkin Dec 15, 2020
750b08a
Make suggested changes
duncanspumpkin Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 27 additions & 45 deletions src/openrct2/CmdlineSprite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,20 @@ assert_struct_size(rct_sprite_file_header, 8);

struct SpriteFile
{
public:
rct_sprite_file_header Header;
duncanspumpkin marked this conversation as resolved.
Show resolved Hide resolved
std::vector<rct_g1_element> Entries;
std::vector<uint8_t> Data;
void AddImage(ImageImporter::ImportResult& image);
bool Save(const utf8* path);
static std::optional<SpriteFile> Open(const utf8* path);

private:
bool isAbsolute = false;
duncanspumpkin marked this conversation as resolved.
Show resolved Hide resolved
void MakeEntriesAbsolute();
void MakeEntriesRelative();
bool Save(const utf8* path);
static std::optional<SpriteFile> Open(const utf8* path);
};

#ifdef _WIN32

static FILE* fopen_utf8(const char* path, const char* mode)
{
auto pathW = String::ToWideChar(path);
auto modeW = String::ToWideChar(mode);
auto file = _wfopen(pathW.c_str(), modeW.c_str());
return file;
}

# define fopen fopen_utf8

#endif

duncanspumpkin marked this conversation as resolved.
Show resolved Hide resolved
void SpriteFile::MakeEntriesAbsolute()
{
for (auto& entry : Entries)
Expand All @@ -88,6 +78,23 @@ void SpriteFile::MakeEntriesRelative()
isAbsolute = false;
}

void SpriteFile::AddImage(ImageImporter::ImportResult& image)
{
Header.num_entries++;
Header.total_size += static_cast<uint32_t>(image.Buffer.size());
Entries.reserve(Header.num_entries);

MakeEntriesRelative();
Data.reserve(Header.total_size);
MakeEntriesAbsolute();
duncanspumpkin marked this conversation as resolved.
Show resolved Hide resolved

Entries[Header.num_entries - 1] = image.Element;

const auto& buffer = image.Buffer;
std::memcpy(Data.data() + (Header.total_size - buffer.size()), buffer.data(), buffer.size());
Entries[Header.num_entries - 1].offset = Data.data() + (Header.total_size - buffer.size());
}

std::optional<SpriteFile> SpriteFile::Open(const utf8* path)
{
try
Expand All @@ -109,7 +116,7 @@ std::optional<SpriteFile> SpriteFile::Open(const utf8* path)
}
return sFile;
}
catch (IOException& except)
catch (IOException&)
{
return std::nullopt;
}
Expand Down Expand Up @@ -140,7 +147,7 @@ bool SpriteFile::Save(const utf8* path)
}
return true;
}
catch (IOException& except)
catch (IOException&)
{
return false;
}
Expand Down Expand Up @@ -521,19 +528,7 @@ int32_t cmdline_for_sprite(const char** argv, int32_t argc)
return -1;
}

sFile->Header.num_entries++;
sFile->Header.total_size += static_cast<uint32_t>(importResult->Buffer.size());
sFile->Entries.reserve(sFile->Header.num_entries);

sFile->MakeEntriesRelative();
sFile->Data.reserve(sFile->Header.total_size);
sFile->MakeEntriesAbsolute();

sFile->Entries[sFile->Header.num_entries - 1] = importResult->Element;

const auto& buffer = importResult->Buffer;
std::memcpy(sFile->Data.data() + (sFile->Header.total_size - buffer.size()), buffer.data(), buffer.size());
sFile->Entries[sFile->Header.num_entries - 1].offset = sFile->Data.data() + (sFile->Header.total_size - buffer.size());
sFile->AddImage(importResult.value());

if (!sFile->Save(spriteFilePath))
return -1;
Expand Down Expand Up @@ -617,20 +612,7 @@ int32_t cmdline_for_sprite(const char** argv, int32_t argc)
return -1;
}

sFile->Header.num_entries++;
sFile->Header.total_size += static_cast<uint32_t>(importResult->Buffer.size());
sFile->Entries.reserve(sFile->Header.num_entries);

sFile->MakeEntriesRelative();
sFile->Data.reserve(sFile->Header.total_size);
sFile->MakeEntriesAbsolute();

sFile->Entries[sFile->Header.num_entries - 1] = importResult->Element;

const auto& buffer = importResult->Buffer;
std::memcpy(sFile->Data.data() + (sFile->Header.total_size - buffer.size()), buffer.data(), buffer.size());
sFile->Entries[sFile->Header.num_entries - 1].offset = sFile->Data.data()
+ (sFile->Header.total_size - buffer.size());
sFile->AddImage(importResult.value());

if (!sFile->Save(spriteFilePath))
{
Expand Down