Commit graph

4201 commits

Author SHA1 Message Date
mazmazz
02ed2d247e Colormap netsync: String format numsectors to UINT32 (thanks buildbot) 2018-09-17 08:05:51 -04:00
mazmazz
0cba69e75a Colormap netsync: Mixed D+C fixes 2018-09-17 00:26:58 -04:00
mazmazz
e5d533edc2 New colormap netsync fixes 2018-09-16 22:42:36 -04:00
mazmazz
5923e85c5a Streamlined colormap netsyncing so duplicates are not saved to $$$.sav per sector 2018-09-16 20:25:46 -04:00
mazmazz
09338f77a7 Colormap overhaul: Wrap R_CheckNumForNameList under ifdef EXTRACOLORMAPLUMPS 2018-09-15 02:10:55 -04:00
mazmazz
20eb98b89f Colormap overhaul: %d format size_t -> UINT32 fix 2018-09-15 01:50:33 -04:00
mazmazz
23de95dce2 Colormap overhaul r_data: Mixed D+C fix 2018-09-15 00:49:03 -04:00
mazmazz
d19eefdcf4 Remove possibly wrong comment about extracolormap_t->fog 2018-09-14 22:35:30 -04:00
mazmazz
3dc4a1d7da Missed fog boolean -> integer 2018-09-13 12:18:53 -04:00
mazmazz
031bc8f4d7 Make extracolormap_t->fog UINT8; it's not boolean, but categorical 2018-09-13 12:08:46 -04:00
mazmazz
70f3f7c80d Init side->colormap_data pointer to NULL (for paranoia) 2018-09-12 21:05:50 -04:00
mazmazz
18bd48843f Add colormap_data to side_t and store colormaps there on setup 2018-09-12 20:43:48 -04:00
mazmazz
854caf2383 Merge errors 2018-09-12 17:39:30 -04:00
mazmazz
691ee31681 Merge remote-tracking branch 'origin/master' into colormap-overhaul 2018-09-12 17:28:22 -04:00
mazmazz
d53201d45d Use lightlist.extra_colormap double pointers in OpenGL 2018-09-12 16:28:55 -04:00
mazmazz
f06e0a6569 Make lightlists react to control sector colormap changes (double pointer) 2018-09-12 16:06:56 -04:00
mazmazz
95f5b7c3f8 Colormap savegame failsafe - Handle NULL (default colormap) 2018-09-12 11:13:49 -04:00
mazmazz
91004ac075 Outdated comment; unused var 2018-09-12 08:07:34 -04:00
mazmazz
68d242bc4c R_AddColormap will not return an existing colormap, and new colormap is not added to chain 2018-09-12 07:24:22 -04:00
mazmazz
4d6cbd8878 Smarter default fadergbaA and fadeend for relative calc 2018-09-12 07:14:23 -04:00
mazmazz
c99f4319ec Add fadestart/fadeend/fog to R_AddColormaps 2018-09-12 07:07:26 -04:00
mazmazz
50c5cfaba5 Split colormap netsync to Load/SaveExtraColormap methods 2018-09-11 22:44:31 -04:00
mazmazz
8e4d87a739 Add R_CheckEqualColormaps comparison method 2018-09-11 22:43:12 -04:00
mazmazz
86e619e1bf R_AddColormaps method 2018-09-11 21:03:55 -04:00
mazmazz
41735f1da8 Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA 2018-09-11 17:30:43 -04:00
Monster Iestyn
7d49951cc0 Merge branch 'change-colormap-ldef' into 'master'
New linedef executor special: change tagged sector's colormap

See merge request STJr/SRB2Internal!149
2018-09-11 17:21:31 -04:00
mazmazz
9869e13eda Don't set sector's extra_colormap if we just made a default clone
* Allow colormap parsing to proceed in p_setup always
* Add R_CheckDefaultColormap
* Add R_GetRgbaR/G/B/A macros
2018-09-11 17:08:57 -04:00
mazmazz
cf271e33dd Ifdef typo 2018-09-11 15:59:56 -04:00
mazmazz
186a75b7d3 Consolidate colormap matching into R_GetColormapFromList 2018-09-11 15:56:21 -04:00
mazmazz
14d7057bf9 Add R_CopyColormap 2018-09-11 15:20:30 -04:00
mazmazz
73db00488c Merge branch 'master' into colormap-overhaul 2018-09-11 15:02:35 -04:00
mazmazz
7da83e13f0 Smarter string digit parsing; allow alpha-only values
* GetDefaultColormap and CheckDefaultColormapValues methods
2018-09-11 15:01:05 -04:00
mazmazz
a22f660bc8 Clear colormaps properly (resolve sigsegv crash) 2018-09-11 13:46:34 -04:00
mazmazz
2cac83d5e9 Initialize extra_colormaps to NULL on program start 2018-09-11 13:31:09 -04:00
mazmazz
029d47376b Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba 2018-09-11 13:27:04 -04:00
Monster Iestyn
bab4a67516 Merge branch 'master' into change-colormap-ldef 2018-09-11 16:43:01 +01:00
Monster Iestyn
78130e830e Merge branch 'public_next'
# Conflicts:
#	src/p_setup.c
#	src/r_data.c
2018-09-11 16:41:27 +01:00
Monster Iestyn
d8f73b0d97 Merge branch 'master' into next 2018-09-11 16:34:16 +01:00
Monster Iestyn
bf6379c3df Merge branch 'colormap-code-cleanup' into 'master'
Colormap code cleanup

See merge request STJr/SRB2!275
2018-09-11 11:31:56 -04:00
mazmazz
bbab5fc735 Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order 2018-09-10 22:37:27 -04:00
mazmazz
a4052d96b0 Make default extracolormap on init
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
mazmazz
7000d27175 Savegame fixes 2018-09-10 21:15:34 -04:00
mazmazz
96b07962fd Fixed colormap matching code again * Added debug messages for matching code 2018-09-10 20:56:59 -04:00
mazmazz
c3fafd18be Remove MAXCOLORMAPS 2018-09-10 20:41:12 -04:00
mazmazz
c1d1f08ea6 extracolormap_t refinement and netsyncing
* Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor)
* Crunched some UINT16/32 into UINT8
* Calculate mask values in R_CreateLightTable
* ifdef out EXTRACOLORMAPLUMPS
2018-09-10 20:36:34 -04:00
mazmazz
78f984e362 Remove bottommap and topmap from savegame because unused 2018-09-10 16:50:35 -04:00
mazmazz
27a8309ea4 Savegame netsync for sector colormaps; add spawn_midmap and co for comparison 2018-09-10 16:50:27 -04:00
mazmazz
102467489e Fix shared colormap matching 2018-09-10 16:42:07 -04:00
mazmazz
c767436629 Type 606 renderer check allow OGL again 2018-09-10 16:32:54 -04:00
mazmazz
0344ca70ba Compiler fixes 2018-09-10 16:28:39 -04:00