Skip to content

Write PNG instead of TGA images for select ports #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Oct 31, 2025
Merged

Write PNG instead of TGA images for select ports #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/edge.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ EDGE.PARAMETERS =
liquid_floors = true,
mirrors = true,
thing_exfloor_flags = true,
tga_images = true
png_images = true
}


Expand Down
2 changes: 1 addition & 1 deletion ports/zdoom.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ZDOOM.PARAMETERS =
bridges = true,
extra_floors = true,
liquid_floors = true,
tga_images = true
png_images = true
}

function ZDOOM.setup()
Expand Down
4 changes: 2 additions & 2 deletions scripts/title_gen.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ function Title_make_interpic()
local lump = PARAM.interpic_lump
local format = PARAM.interpic_format

if PARAM.tga_images then format = "tga" end
if PARAM.png_images then format = "png" end

gui.title_write(lump, format)
gui.title_free()
Expand Down Expand Up @@ -2091,7 +2091,7 @@ function Title_make_titlepic()
local lump = PARAM.titlepic_lump
local format = PARAM.titlepic_format

if PARAM.tga_images then format = "tga" end
if PARAM.png_images then format = "png" end

gui.title_write(lump, format)
gui.title_free()
Expand Down
52 changes: 18 additions & 34 deletions source/dm_extra.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "lib_zip.h"
#include "main.h"
#include "minilua.h"
#include "miniz.h" // PNG creation
#include "physfs.h"
#include "raw_def.h"
#include "sys_assert.h"
Expand Down Expand Up @@ -1627,46 +1628,29 @@ static int TitleAveragePixel(int x, int y)
return OBSIDIAN_MAKE_RGBA(r, g, b, 255);
}

static qLump_c *TitleCreateTGA()
static qLump_c *TitleCreatePNG()
{
qLump_c *lump = new qLump_c();

lump->AddByte(0); // id_length
lump->AddByte(0); // colormap_type
lump->AddByte(2); // TGA_RGB

lump->AddByte(0); // colormap_xxx
lump->AddByte(0);
lump->AddByte(0);
lump->AddByte(0);
lump->AddByte(0);

lump->AddByte(0); // x_offset
lump->AddByte(0);
lump->AddByte(0); // y_offset
lump->AddByte(0);
std::vector<rgb_color_t> raw_image;

lump->AddByte(title_W & 255); // width
lump->AddByte(title_W >> 8);

lump->AddByte(title_H & 255); // height
lump->AddByte(title_H >> 8);

lump->AddByte(24); // pixel_bits
lump->AddByte(0); // attributes

for (int y = title_H - 1; y >= 0; y--)
for (int y = 0; y < title_H - 1; y++)
{
for (int x = 0; x < title_W; x++)
{
rgb_color_t col = TitleAveragePixel(x, y);

lump->AddByte(OBSIDIAN_RGB_BLUE(col));
lump->AddByte(OBSIDIAN_RGB_GREEN(col));
lump->AddByte(OBSIDIAN_RGB_RED(col));
raw_image.push_back(TitleAveragePixel(x, y));
}
}

qLump_c *lump = new qLump_c();

size_t png_size = 0;
void *raw_png = tdefl_write_image_to_png_file_in_memory(raw_image.data(), title_W, title_H, 4, &png_size);

if (raw_png)
{
lump->Append(raw_png, png_size);
free(raw_png);
}

return lump;
}

Expand Down Expand Up @@ -1731,9 +1715,9 @@ int title_write(lua_State *L)

qLump_c *lump;

if (StringCompare(format, "tga") == 0)
if (StringCompare(format, "png") == 0)
{
lump = TitleCreateTGA();
lump = TitleCreatePNG();
}
else if (StringCompare(format, "raw") == 0)
{
Expand Down