yyc12345/libcmo21
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish CKtexture writer

Browse Source 
- finish CKTexture writer
- add std::enable_if for CKStateChunk::ReadIdent&WriteIdent to limit it in enum type.
- fix error function calling in CKBitmapData writer.
- let CKTexture reader mor formal for mipmap.
- fix CKStateChunk ReadBuffer redirect guideline.
- add a stupid height and width getter for CKBitmapData to serve CKTexture using.
This commit is contained in:
yyc12345
2023-09-30 11:51:04 +08:00
parent 3195a9682f
commit eedd9bdb55
6 changed files with 189 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
LibCmo/CK2/CKBitmapData.cpp
View File

@ -458,40 +458,35 @@ namespace LibCmo::CK2 {
// save data
if (saveopt == CK_TEXTURE_SAVEOPTIONS::CKTEXTURE_RAWDATA) {
// save as raw data
chunk->WriteIdentifier(identifiers.m_RawData);
chunk->WriteIdentifierDword(identifiers.m_RawData);
chunk->WriteStruct(slotcount);
VxMath::VxImageDescEx invalidDesc;
for (CKDWORD i = 0; i < slotcount; ++i) {
if (XContainer::NSXBitArray::IsSet(validExternalSavingSlot, i)) {
VxMath::VxImageDescEx* thisimg = GetImageDesc(i);
if (XContainer::NSXBitArray::IsSet(validExternalSavingSlot, i) || !thisimg->IsValid()) {
// if this slot can save as external, pass a invalid desc to writer
// or image is invalid, simply write it as invalid one.
WriteRawBitmap(chunk, &invalidDesc);
} else {
// otherwise, pass the real slot data
WriteRawBitmap(chunk, GetImageDesc(i));
// do upside down first as reader done
VxMath::VxImageDescEx upsidedown(thisimg->GetWidth(), thisimg->GetHeight());
VxMath::VxDoBlitUpsideDown(thisimg, &upsidedown);
WriteRawBitmap(chunk, &upsidedown);
}
}
}
if (saveopt == CK_TEXTURE_SAVEOPTIONS::CKTEXTURE_IMAGEFORMAT) {
// save as special format
chunk->WriteIdentifier(identifiers.m_SpecificFormat);
chunk->WriteIdentifierDword(identifiers.m_SpecificFormat);
chunk->WriteStruct(slotcount);
// prepare height, width, bpp data
CKDWORD height = 0, width = 0, bpp = 32;
for (CKDWORD i = 0; i < slotcount; ++i) {
VxMath::VxImageDescEx* desc = GetImageDesc(i);
if (desc->IsValid()) {
height = desc->GetHeight();
width = desc->GetWidth();
break;
}
}
// write it
chunk->WriteStruct(width);
chunk->WriteStruct(height);
chunk->WriteStruct(bpp);
// write width, height and bpp
chunk->WriteStruct(GetWidth());
chunk->WriteStruct(GetHeight());
chunk->WriteStruct(32);
// write slot one by one
for (CKDWORD i = 0; i < slotcount; ++i) {
@ -502,7 +497,7 @@ namespace LibCmo::CK2 {
// write filename
{
chunk->WriteIdentifier(identifiers.m_FileNames);
chunk->WriteIdentifierDword(identifiers.m_FileNames);
chunk->WriteStruct(slotcount);
XContainer::XString filename;
@ -629,6 +624,24 @@ namespace LibCmo::CK2 {
else return m_Slots[slot].m_FileName.c_str();
}
CKDWORD CKBitmapData::GetWidth() const {
for (auto& slot : m_Slots) {
if (slot.m_ImageData.IsValid()) {
return slot.m_ImageData.GetWidth();
}
}
return 0;
}
CKDWORD CKBitmapData::GetHeight() const {
for (auto& slot : m_Slots) {
if (slot.m_ImageData.IsValid()) {
return slot.m_ImageData.GetHeight();
}
}
return 0;
}
#pragma endregion
#pragma region Not important variable visitor