Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-07 13:19:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for TGA orientation

Browse source
This commit is contained in:
Ryan Huffman 2019-03-08 09:36:20 -08:00
parent 5fd2b0699a
commit c55811ced5
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libraries/image/src/image/TGAReader.cpp
View file

@ -24,6 +24,10 @@ QImage image::readTGA(QIODevice& content) {
RunLengthEncodedTrueColor = 10, RunLengthEncodedTrueColor = 10,
RunLengthEncodedBlackWhite = 11, RunLengthEncodedBlackWhite = 11,
}; };
enum class TGAOrientation : uint8_t {
BottomLeft = 0,
TopLeft = 1,
};
struct TGAHeader { struct TGAHeader {
uint8_t idLength; uint8_t idLength;
@ -41,7 +45,8 @@ QImage image::readTGA(QIODevice& content) {
uint8_t pixelDepth; uint8_t pixelDepth;
struct { struct {
uint8_t attributeBitsPerPixel : 4; uint8_t attributeBitsPerPixel : 4;
uint8_t orientation : 2; uint8_t reserved : 1;
TGAOrientation orientation : 1;
uint8_t padding : 2; uint8_t padding : 2;
} imageDescriptor; } imageDescriptor;
}; };
@ -80,7 +85,7 @@ QImage image::readTGA(QIODevice& content) {
qDebug() << "Origin: " << header.xOrigin << header.yOrigin; qDebug() << "Origin: " << header.xOrigin << header.yOrigin;
qDebug() << "Size: " << header.width << header.height; qDebug() << "Size: " << header.width << header.height;
qDebug() << "Depth: " << header.pixelDepth; qDebug() << "Depth: " << header.pixelDepth;
qDebug() << "Image desc: " << header.imageDescriptor.attributeBitsPerPixel << header.imageDescriptor.orientation; qDebug() << "Image desc: " << header.imageDescriptor.attributeBitsPerPixel << (int)header.imageDescriptor.orientation;
} }
if (header.xOrigin != 0 || header.yOrigin != 0) { if (header.xOrigin != 0 || header.yOrigin != 0) {
@ -110,8 +115,13 @@ QImage image::readTGA(QIODevice& content) {
} }
QImage image{ header.width, header.height, QImage::Format_ARGB32 }; QImage image{ header.width, header.height, QImage::Format_ARGB32 };
char* line;
for (int y = 0; y < header.height; ++y) { for (int y = 0; y < header.height; ++y) {
char* line = (char*)image.scanLine(y); if (header.imageDescriptor.orientation == TGAOrientation::BottomLeft) {
line = (char*)image.scanLine(header.height - y - 1);
} else {
line = (char*)image.scanLine(y);
}
for (int x = 0; x < header.width; ++x) { for (int x = 0; x < header.width; ++x) {
content.read(line, bytesPerPixel); content.read(line, bytesPerPixel);
*(line + 3) |= alphaMask; *(line + 3) |= alphaMask;
@ -124,7 +134,12 @@ QImage image::readTGA(QIODevice& content) {
QImage image{ header.width, header.height, QImage::Format_ARGB32 }; QImage image{ header.width, header.height, QImage::Format_ARGB32 };
for (int y = 0; y < header.height; ++y) { for (int y = 0; y < header.height; ++y) {
char* line = (char*)image.scanLine(y); char* line;
if (header.imageDescriptor.orientation == TGAOrientation::BottomLeft) {
line = (char*)image.scanLine(header.height - y - 1);
} else {
line = (char*)image.scanLine(y);
}
int col = 0; int col = 0;
while (col < header.width) { while (col < header.width) {
constexpr char IS_REPETITION_MASK{ (char)0x80 }; constexpr char IS_REPETITION_MASK{ (char)0x80 };

1
libraries/image/src/image/TGAReader.h
View file

@ -16,6 +16,7 @@
namespace image { namespace image {
// TODO Move this into a plugin that QImageReader can use
QImage readTGA(QIODevice& contents); QImage readTGA(QIODevice& contents);
} }