57959522e2
Colormap overhaul r_data: Mixed D+C fix
2018-09-15 00:49:03 -04:00
2f995f4cbe
Remove possibly wrong comment about extracolormap_t->fog
2018-09-14 22:35:30 -04:00
07af82aa84
Missed fog boolean -> integer
2018-09-13 12:18:53 -04:00
6824e6a359
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
2018-09-13 12:08:46 -04:00
0b2caa948f
Init side->colormap_data pointer to NULL (for paranoia)
2018-09-12 21:05:50 -04:00
f7ff440250
Add colormap_data to side_t and store colormaps there on setup
2018-09-12 20:43:48 -04:00
ad9ef5d593
Merge errors
2018-09-12 17:39:30 -04:00
c58e9b0bae
Merge remote-tracking branch 'origin/master' into colormap-overhaul
2018-09-12 17:28:22 -04:00
62b6950e33
Use lightlist.extra_colormap double pointers in OpenGL
2018-09-12 16:28:55 -04:00
7d36aae7c4
Make lightlists react to control sector colormap changes (double pointer)
2018-09-12 16:06:56 -04:00
92c5cb8233
Colormap savegame failsafe - Handle NULL (default colormap)
2018-09-12 11:13:49 -04:00
9a6a8b0b82
Outdated comment; unused var
2018-09-12 08:07:34 -04:00
55c43a2161
R_AddColormap will not return an existing colormap, and new colormap is not added to chain
2018-09-12 07:24:22 -04:00
87ad2a87f7
Smarter default fadergbaA and fadeend for relative calc
2018-09-12 07:14:23 -04:00
133c3598a7
Add fadestart/fadeend/fog to R_AddColormaps
2018-09-12 07:07:26 -04:00
92a97fb1a6
Split colormap netsync to Load/SaveExtraColormap methods
2018-09-11 22:44:31 -04:00
90aeac5058
Add R_CheckEqualColormaps comparison method
2018-09-11 22:43:12 -04:00
f0c11eb135
R_AddColormaps method
2018-09-11 21:03:55 -04:00
548f02eea1
Extra macros R_GetRgbaRGB; R_PutRgbaR/G/B/A/RGB/RGBA
2018-09-11 17:30:43 -04:00
55418f9750
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
5975f26177
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
71ade23739
Ifdef typo
2018-09-11 15:59:56 -04:00
c920827032
Consolidate colormap matching into R_GetColormapFromList
2018-09-11 15:56:21 -04:00
85d89287de
Add R_CopyColormap
2018-09-11 15:20:30 -04:00
3da58f436c
Merge branch 'master' into colormap-overhaul
2018-09-11 15:02:35 -04:00
ba88f8ebb6
Smarter string digit parsing; allow alpha-only values
...
* GetDefaultColormap and CheckDefaultColormapValues methods
2018-09-11 15:01:05 -04:00
4ef016e40f
Clear colormaps properly (resolve sigsegv crash)
2018-09-11 13:46:34 -04:00
506ce43627
Initialize extra_colormaps to NULL on program start
2018-09-11 13:31:09 -04:00
a818b9a1dc
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
82a26580de
Merge branch 'master' into change-colormap-ldef
2018-09-11 16:43:01 +01:00
fd783f09ea
Merge branch 'public_next'
...
# Conflicts:
# src/p_setup.c
# src/r_data.c
2018-09-11 16:41:27 +01:00
3218ab17e0
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
1199a5f9b4
Merge branch 'colormap-code-cleanup' into 'master'
...
Colormap code cleanup
See merge request STJr/SRB2!275
2018-09-11 11:31:56 -04:00
b7a216c78b
Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order
2018-09-10 22:37:27 -04:00
43ae25c4fd
Make default extracolormap on init
...
* Calc fadedist in R_CreateLightTable
2018-09-10 21:56:57 -04:00
22746c1d91
Savegame fixes
2018-09-10 21:15:34 -04:00
3da38f2a9b
Fixed colormap matching code again * Added debug messages for matching code
2018-09-10 20:56:59 -04:00
1e4f5e8d45
Remove MAXCOLORMAPS
2018-09-10 20:41:12 -04:00
8d78c22194
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
c92226890e
Remove bottommap and topmap from savegame because unused
2018-09-10 16:50:35 -04:00
7e9297d06e
Savegame netsync for sector colormaps; add spawn_midmap and co for comparison
2018-09-10 16:50:27 -04:00
7608583c6f
Fix shared colormap matching
2018-09-10 16:42:07 -04:00
53733ddf76
Type 606 renderer check allow OGL again
2018-09-10 16:32:54 -04:00
2701976ba3
Compiler fixes
2018-09-10 16:28:39 -04:00
e0d8a6eec0
Get rid of bottommap, midmap, topmap
2018-09-10 16:16:04 -04:00
574a591d43
P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block)
2018-09-10 16:08:43 -04:00
e33ed45b7b
Colormap overhaul in r_data.c
...
* Split R_CreateColormap to R_CreateLightTable
* Replace extra_colormaps array with next/prev pointer chain
* Remove foundcolormaps; instead store lumpnum in extracolormap_t
* Add properties to extracolormap_t for portability
2018-09-10 15:59:31 -04:00
fef38acc59
Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup
2018-09-10 13:24:57 -04:00
40ff436829
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
e171e565ce
Remove bottommap and topmap from savegame because unused
2018-09-10 09:03:58 -04:00
mazmazz