Skip to content
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

Jump to bottom

implement PNG brightmaps #1921

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

implement PNG brightmaps #1921

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b26327
implement PNG brightmaps
rfomin Sep 23, 2024
a698289
increase number of grayscale colors, cosmetics
rfomin Sep 23, 2024
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 src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ set(WOOF_SOURCES
p_telept.c
p_tick.c p_tick.h
p_user.c p_user.h
r_bmaps.c r_bmaps.h
r_brightmaps.c r_brightmaps.h
r_bsp.c r_bsp.h
r_data.c r_data.h
r_defs.h
Expand Down
7 changes: 4 additions & 3 deletions src/d_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
#include "p_map.h" // MELEERANGE
#include "p_mobj.h"
#include "p_setup.h"
#include "r_bmaps.h"
#include "r_brightmaps.h"
#include "r_defs.h"
#include "r_draw.h"
#include "r_main.h"
Expand Down Expand Up @@ -2288,8 +2288,6 @@ void D_DoomMain(void)

PostProcessDeh();

W_ProcessInWads("BRGHTMPS", R_ParseBrightmaps, false);

// Moved after WAD initialization because we are checking the COMPLVL lump
G_ReloadDefaults(false); // killough 3/4/98: set defaults just loaded.
// jff 3/24/98 this sets startskill if it was -1
Expand Down Expand Up @@ -2457,6 +2455,9 @@ void D_DoomMain(void)
I_Printf(VB_INFO, "VX_Init: ");
VX_Init();

I_Printf(VB_INFO, "R_InitBrightmaps: Load brightmaps.");
R_InitBrightmaps();

I_PutChar(VB_INFO, '\n');

idmusnum = -1; //jff 3/17/98 insure idmus number is blank
Expand Down
7 changes: 2 additions & 5 deletions src/mn_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "mn_font.h"
#include "mn_menu.h"
#include "p_mobj.h"
#include "r_bmaps.h"
#include "r_brightmaps.h"
#include "r_data.h"
#include "r_defs.h"
#include "r_draw.h"
Expand Down Expand Up @@ -2837,8 +2837,7 @@ static setup_menu_t gen_settings5[] = {

{"Voxels", S_ONOFF | S_STRICT, OFF_CNTR_X, M_SPC, {"voxels_rendering"}},

{"Brightmaps", S_ONOFF | S_STRICT, OFF_CNTR_X, M_SPC, {"brightmaps"},
.action = R_InitDrawFunctions},
{"Brightmaps", S_ONOFF | S_STRICT, OFF_CNTR_X, M_SPC, {"brightmaps"}},

{"Stretch Short Skies", S_ONOFF, OFF_CNTR_X, M_SPC, {"stretchsky"},
.action = R_InitSkyMap},
Expand Down Expand Up @@ -4451,8 +4450,6 @@ void MN_SetupResetMenu(void)
DisableItem(M_ParmExists("-uncapped") || M_ParmExists("-nouncapped"),
gen_settings1, "uncapped");
DisableItem(deh_set_blood_color, enem_settings1, "colored_blood");
DisableItem(!brightmaps_found || force_brightmaps, gen_settings5,
"brightmaps");
UpdateInterceptsEmuItem();
UpdateCrosshairItems();
UpdateCenteredWeaponItem();
Expand Down
Loading