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

add LoadImage wrapper in CKTexture

Browse Source
This commit is contained in:
yyc12345
2023-10-08 10:42:07 +08:00
parent 812f32bfca
commit 754a281655
6 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
LibCmo/CK2/CKBitmapData.cpp
View File

@ -560,7 +560,10 @@ namespace LibCmo::CK2 {
// get extension of file. then get corresponding reader
XContainer::XString ext(filename);
m_Context->GetPathManager()->GetExtension(ext);
auto reader = DataHandlers::CKBitmapHandler::GetBitmapHandlerWrapper(CKFileExtension(ext.c_str()), CKGUID());
auto reader = DataHandlers::CKBitmapHandler::GetBitmapHandlerWrapper(
CKFileExtension(ext.c_str()),
CKGUID()
);
if (reader == nullptr) return false;
// get desc and read data
@ -621,9 +624,9 @@ namespace LibCmo::CK2 {
CKSTRING CKBitmapData::GetSlotFileName(CKDWORD slot) const {
if (slot >= m_Slots.size()) return nullptr;
// return nullptr if no corresponding filename
if (m_Slots[slot].m_FileName.empty()) return nullptr;
else return m_Slots[slot].m_FileName.c_str();
// return nullptr if corresponding filename is empty to indicate there is no binding filename
return XContainer::NSXString::ToCKSTRING(m_Slots[slot].m_FileName);
}
CKDWORD CKBitmapData::GetWidth() const {