LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-18 03:34:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed CompressedData:getType to CompressedData:getFormat

Browse Source
This commit is contained in:
Alex Szpakowski
2013-08-17 14:30:23 -03:00
parent ce4d895918
commit 96a668ecf3
10 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/magpie/ddsHandler.cpp
+15 -15
View File
@@ -40,21 +40,21 @@ bool ddsHandler::canParse(const filesystem::FileData *data)
return dds::isCompressedDDS(data->getData(), data->getSize());
}
CompressedData::TextureType ddsHandler::parse(filesystem::FileData *data, std::vector<CompressedData::SubImage> &images)
CompressedData::Format ddsHandler::parse(filesystem::FileData *data, std::vector<CompressedData::SubImage> &images)
{
if (!dds::isDDS(data->getData(), data->getSize()))
throw love::Exception("Could not decode compressed data (not a DDS file?)");
CompressedData::TextureType textype = CompressedData::TYPE_UNKNOWN;
CompressedData::Format texformat = CompressedData::FORMAT_UNKNOWN;
try
{
// Attempt to parse the dds file.
dds::Parser parser(data->getData(), data->getSize());
textype = convertFormat(parser.getFormat());
texformat = convertFormat(parser.getFormat());
if (textype == CompressedData::TYPE_UNKNOWN)
if (texformat == CompressedData::FORMAT_UNKNOWN)
throw love::Exception("Could not parse compressed data: Unsupported format.");
if (parser.getMipmapCount() == 0)
@@ -88,32 +88,32 @@ CompressedData::TextureType ddsHandler::parse(filesystem::FileData *data, std::v
throw love::Exception(e.what());
}
return textype;
return texformat;
}
CompressedData::TextureType ddsHandler::convertFormat(dds::Format ddsformat)
CompressedData::Format ddsHandler::convertFormat(dds::Format ddsformat)
{
switch (ddsformat)
{
case dds::FORMAT_DXT1:
return CompressedData::TYPE_DXT1;
return CompressedData::FORMAT_DXT1;
case dds::FORMAT_DXT3:
return CompressedData::TYPE_DXT3;
return CompressedData::FORMAT_DXT3;
case dds::FORMAT_DXT5:
return CompressedData::TYPE_DXT5;
return CompressedData::FORMAT_DXT5;
case dds::FORMAT_BC4:
return CompressedData::TYPE_BC4;
return CompressedData::FORMAT_BC4;
case dds::FORMAT_BC4s:
return CompressedData::TYPE_BC4s;
return CompressedData::FORMAT_BC4s;
case dds::FORMAT_BC5:
return CompressedData::TYPE_BC5;
return CompressedData::FORMAT_BC5;
case dds::FORMAT_BC5s:
return CompressedData::TYPE_BC5s;
return CompressedData::FORMAT_BC5s;
default:
return CompressedData::TYPE_UNKNOWN;
return CompressedData::FORMAT_UNKNOWN;
}
return CompressedData::TYPE_UNKNOWN;
return CompressedData::FORMAT_UNKNOWN;
}
} // magpie