mirror
/
msdf-atlas-gen
mirror of https://github.com/Chlumsky/msdf-atlas-gen.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MSDFgen 1.12 and new image formats

This commit is contained in:
Chlumsky 2024-05-26 19:07:38 +02:00
parent b0a423bf00
commit d120bb3e05
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
msdf-atlas-gen/image-save.hpp
View File

@ -29,6 +29,10 @@ bool saveImage(const msdfgen::BitmapConstRef<byte, N> &bitmap, ImageFormat forma
return msdfgen::saveBmp(bitmap, filename);
case ImageFormat::TIFF:
return false;
case ImageFormat::RGBA:
return msdfgen::saveRgba(bitmap, filename);
case ImageFormat::FL32:
return false;
case ImageFormat::TEXT:
return saveImageText(bitmap, filename, outputYDirection);
case ImageFormat::TEXT_FLOAT:
@ -54,6 +58,10 @@ bool saveImage(const msdfgen::BitmapConstRef<float, N> &bitmap, ImageFormat form
return msdfgen::saveBmp(bitmap, filename);
case ImageFormat::TIFF:
return msdfgen::saveTiff(bitmap, filename);
case ImageFormat::RGBA:
return msdfgen::saveRgba(bitmap, filename);
case ImageFormat::FL32:
return msdfgen::saveFl32(bitmap, filename);
case ImageFormat::TEXT:
return false;
case ImageFormat::TEXT_FLOAT:

17
msdf-atlas-gen/main.cpp
View File

@ -83,9 +83,9 @@ ATLAS CONFIGURATION
Selects the type of atlas to be generated.
)"
#ifndef MSDFGEN_DISABLE_PNG
R"( -format <png / bmp / tiff / text / textfloat / bin / binfloat / binfloatbe>)"
R"( -format <png / bmp / tiff / rgba / fl32 / text / textfloat / bin / binfloat / binfloatbe>)"
#else
R"( -format <bmp / tiff / text / textfloat / bin / binfloat / binfloatbe>)"
R"( -format <bmp / tiff / rgba / fl32 / text / textfloat / bin / binfloat / binfloatbe>)"
#endif
R"(
Selects the format for the atlas image output. Some image formats may be incompatible with embedded output formats.
@ -448,6 +448,10 @@ int main(int argc, const char *const *argv) {
config.imageFormat = ImageFormat::BMP;
else if (ARG_IS("tiff"))
config.imageFormat = ImageFormat::TIFF;
else if (ARG_IS("rgba"))
config.imageFormat = ImageFormat::RGBA;
else if (ARG_IS("fl32"))
config.imageFormat = ImageFormat::FL32;
else if (ARG_IS("text"))
config.imageFormat = ImageFormat::TEXT;
else if (ARG_IS("textfloat"))
@ -460,9 +464,9 @@ int main(int argc, const char *const *argv) {
config.imageFormat = ImageFormat::BINARY_FLOAT_BE;
else {
#ifndef MSDFGEN_DISABLE_PNG
ABORT("Invalid image format. Valid formats are: png, bmp, tiff, text, textfloat, bin, binfloat");
ABORT("Invalid image format. Valid formats are: png, bmp, tiff, rgba, fl32, text, textfloat, bin, binfloat");
#else
ABORT("Invalid image format. Valid formats are: bmp, tiff, text, textfloat, bin, binfloat");
ABORT("Invalid image format. Valid formats are: bmp, tiff, rgba, fl32, text, textfloat, bin, binfloat");
#endif
}
imageFormatName = arg;
@ -979,7 +983,9 @@ int main(int argc, const char *const *argv) {
fputs("Warning: You are using a version of this program without PNG image support!\n", stderr);
#endif
} else if (cmpExtension(config.imageFilename, ".bmp")) imageExtension = ImageFormat::BMP;
else if (cmpExtension(config.imageFilename, ".tif") || cmpExtension(config.imageFilename, ".tiff")) imageExtension = ImageFormat::TIFF;
else if (cmpExtension(config.imageFilename, ".tiff") || cmpExtension(config.imageFilename, ".tif")) imageExtension = ImageFormat::TIFF;
else if (cmpExtension(config.imageFilename, ".rgba")) imageExtension = ImageFormat::RGBA;
else if (cmpExtension(config.imageFilename, ".fl32")) imageExtension = ImageFormat::FL32;
else if (cmpExtension(config.imageFilename, ".txt")) imageExtension = ImageFormat::TEXT;
else if (cmpExtension(config.imageFilename, ".bin")) imageExtension = ImageFormat::BINARY;
}
@ -1031,6 +1037,7 @@ int main(int argc, const char *const *argv) {
imageFormatName = nullptr; // No longer consistent with imageFormat
bool floatingPointFormat = (
config.imageFormat == ImageFormat::TIFF ||
config.imageFormat == ImageFormat::FL32 ||
config.imageFormat == ImageFormat::TEXT_FLOAT ||
config.imageFormat == ImageFormat::BINARY_FLOAT ||
config.imageFormat == ImageFormat::BINARY_FLOAT_BE

2
msdf-atlas-gen/types.h
View File

@ -30,6 +30,8 @@ enum class ImageFormat {
PNG,
BMP,
TIFF,
RGBA,
FL32,
TEXT,
TEXT_FLOAT,
BINARY,

2
msdfgen

@ -1 +1 @@
Subproject commit d7ac1e084d7e790c53b6a88598c469090ca7c8cc
Subproject commit 85e8b3d47b3d1a42e4a5ebda0a24fb1cc2e669e0