Use libpng for writing row by row
This commit is contained in:
parent
e2b3daf3ee
commit
3224199813
|
@ -6,6 +6,7 @@ set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
find_package(Qt6 6.2 REQUIRED COMPONENTS Quick QuickControls2)
|
find_package(Qt6 6.2 REQUIRED COMPONENTS Quick QuickControls2)
|
||||||
|
find_package(PNG REQUIRED)
|
||||||
|
|
||||||
|
|
||||||
qt_add_executable(apptexcrafting
|
qt_add_executable(apptexcrafting
|
||||||
|
@ -19,6 +20,7 @@ qt_add_qml_module(apptexcrafting
|
||||||
Main.qml
|
Main.qml
|
||||||
TexSlot.qml
|
TexSlot.qml
|
||||||
SOURCES texturecrafter.h texturecrafter.cpp
|
SOURCES texturecrafter.h texturecrafter.cpp
|
||||||
|
RESOURCES
|
||||||
)
|
)
|
||||||
|
|
||||||
# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
|
# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
|
||||||
|
@ -34,6 +36,7 @@ set_target_properties(apptexcrafting PROPERTIES
|
||||||
|
|
||||||
target_link_libraries(apptexcrafting
|
target_link_libraries(apptexcrafting
|
||||||
PRIVATE Qt6::Quick
|
PRIVATE Qt6::Quick
|
||||||
|
PNG::PNG
|
||||||
)
|
)
|
||||||
|
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
|
@ -4,6 +4,18 @@ TextureCrafter::TextureCrafter(QObject *parent)
|
||||||
: QObject{parent}
|
: QObject{parent}
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
QString TextureCrafter::getOutFilename() {
|
||||||
|
QString outFileName;
|
||||||
|
if (outDir.isValid()) {
|
||||||
|
outFileName = outDir.path();
|
||||||
|
outFileName.append("/out.png");
|
||||||
|
} else {
|
||||||
|
return QString();
|
||||||
|
}
|
||||||
|
|
||||||
|
return outFileName;
|
||||||
|
}
|
||||||
|
|
||||||
QUrl TextureCrafter::packChannels(QVector<QUrl> imagePaths) {
|
QUrl TextureCrafter::packChannels(QVector<QUrl> imagePaths) {
|
||||||
|
|
||||||
QVector<QImage> sourceImages;
|
QVector<QImage> sourceImages;
|
||||||
|
@ -26,43 +38,83 @@ QUrl TextureCrafter::packChannels(QVector<QUrl> imagePaths) {
|
||||||
sourceImages.append(newImage);
|
sourceImages.append(newImage);
|
||||||
}
|
}
|
||||||
|
|
||||||
QImage outImage(width, height, format);
|
png_structp outPng;
|
||||||
|
png_infop outInfo;
|
||||||
|
FILE *outFile;
|
||||||
|
QString outFilename = getOutFilename();
|
||||||
|
unsigned char *rowBuffer;
|
||||||
|
|
||||||
|
// maybe abstract this?
|
||||||
|
outFile = fopen(outFilename.toLatin1().data(), "wb");
|
||||||
|
|
||||||
|
if (!outFile) {
|
||||||
|
return QUrl();
|
||||||
|
}
|
||||||
|
|
||||||
|
outPng = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||||
|
outInfo = png_create_info_struct(outPng);
|
||||||
|
rowBuffer = (unsigned char*)malloc(sizeof(char) * 3 * width);
|
||||||
|
|
||||||
|
png_init_io(outPng, outFile);
|
||||||
|
|
||||||
|
png_set_IHDR (outPng,
|
||||||
|
outInfo,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
8, // TODO: support other bit depths someday
|
||||||
|
PNG_COLOR_TYPE_RGB,
|
||||||
|
PNG_INTERLACE_NONE,
|
||||||
|
PNG_COMPRESSION_TYPE_DEFAULT,
|
||||||
|
PNG_FILTER_TYPE_DEFAULT);
|
||||||
|
|
||||||
|
png_write_info(outPng, outInfo);
|
||||||
|
|
||||||
// do the channel packing!!
|
// do the channel packing!!
|
||||||
// theres probably a faster way to do this but eh
|
// theres probably a faster way to do this but eh
|
||||||
for (int i = 0; i < width; i++) {
|
for (int i = 0; i < height; i++) {
|
||||||
for (int j = 0; j < height; j++) {
|
memset(rowBuffer, 0, sizeof(char) * 3 * width);
|
||||||
int r, g, b;
|
for (int j = 0; j < width; j++) {
|
||||||
|
unsigned char r, g, b;
|
||||||
|
|
||||||
// too eepy for dry
|
// too eepy for dry
|
||||||
r = sourceImages.at(0).pixelColor(i, j).red();
|
r = sourceImages.at(0).pixelColor(j, i).red();
|
||||||
g = sourceImages.at(1).pixelColor(i, j).green();
|
g = sourceImages.at(1).pixelColor(j, i).green();
|
||||||
b = sourceImages.at(2).pixelColor(i, j).blue();
|
b = sourceImages.at(2).pixelColor(j, i).blue();
|
||||||
|
|
||||||
QColor newColor(r, g, b);
|
rowBuffer[j*3+0] = r;
|
||||||
|
rowBuffer[j*3+1] = g;
|
||||||
outImage.setPixelColor(i, j, newColor);
|
rowBuffer[j*3+2] = b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
png_write_row(outPng, rowBuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
// write it to a temp file
|
png_write_end(outPng, NULL);
|
||||||
if (outDir.isValid()) {
|
|
||||||
QString outFileName = outDir.path();
|
|
||||||
outFileName.append("/out.png");
|
|
||||||
|
|
||||||
printf("wrote to %s\n", outFileName.toLatin1().data());
|
// good soldiers free their memory
|
||||||
|
free(rowBuffer);
|
||||||
|
png_destroy_write_struct(&outPng, &outInfo);
|
||||||
|
fclose(outFile);
|
||||||
|
return QUrl::fromLocalFile(outFilename);
|
||||||
|
|
||||||
//TODO: use libpng and do progressive write to update the progress bar
|
// // write it to a temp file
|
||||||
if (outImage.save(outFileName)) {
|
// if (outDir.isValid()) {
|
||||||
printf("cool ^-^\n");
|
// QString outFileName = outDir.path();
|
||||||
return QUrl::fromLocalFile(outFileName);
|
// outFileName.append("/out.png");
|
||||||
} else {
|
|
||||||
//TODO: return some error value to show the user
|
// printf("wrote to %s\n", outFileName.toLatin1().data());
|
||||||
printf("that dream is fucked it is fucking fucked\n");
|
|
||||||
}
|
// //TODO: use libpng and do progressive write to update the progress bar
|
||||||
} else {
|
// if (outImage.save(outFileName)) {
|
||||||
printf("chat its so over\n");
|
// printf("cool ^-^\n");
|
||||||
}
|
// return QUrl::fromLocalFile(outFileName);
|
||||||
|
// } else {
|
||||||
|
// //TODO: return some error value to show the user
|
||||||
|
// printf("that dream is fucked it is fucking fucked\n");
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// printf("chat its so over\n");
|
||||||
|
// }
|
||||||
|
|
||||||
return QUrl();
|
return QUrl();
|
||||||
//do we need to close these??? idk lets hope qt handles it
|
//do we need to close these??? idk lets hope qt handles it
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include <QTemporaryDir>
|
#include <QTemporaryDir>
|
||||||
|
|
||||||
|
#include <png.h>
|
||||||
|
|
||||||
class TextureCrafter : public QObject
|
class TextureCrafter : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -17,6 +19,8 @@ public:
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
private:
|
private:
|
||||||
|
QString getOutFilename();
|
||||||
|
|
||||||
QTemporaryDir outDir;
|
QTemporaryDir outDir;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue