thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-05 01:38:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
17789 commits 2 branches 14 tags 206 MiB
Commit graph

1458 commits

Author SHA1 Message Date
toaster
ebe38ff518 * Add a blend field to FOFs. 
* Set via a fourth digit in the upper midtexture for transparent FOFs
        * For example - #2551 is additive solid, #1282 is subtractive half...
    * The original method of setting the upper midtexture to #900 or 901 still works, since I'm not out to break existing maps.
* Software: Remove the horrible `else if` ladder for FOF translucency. Algorithms, baby!
* OpenGL: Move to using `HWR_GetBlendModeFlag` in more places, for more long-term extensible support for multiple blendmodes.
 2021-04-01 23:45:21 +01:00
toaster
e27506c660 * Made it possible to perform palette calculations in gamma-corrected space. Now used by: 
* Blend tables generated by the game.
    * The Color Cube accessibility tool.
* Fixed another stupid typo that got in the way of FF_BLENDMASK working.
* Some minor adjustments for code cleanliness.
 2021-04-01 19:28:01 +01:00
toaster
40cbc30bff Mammoth commit, sorry. 
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
 2021-03-31 22:46:23 +01:00
Sally Coolatta
a93acd1958 Make it through OGL 2021-03-01 01:48:31 -05:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next 
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
 2021-02-27 05:18:36 -05:00
Sryder
0d43c3e3ad Invert the screen for encore circle transition in OpenGL 2021-02-16 18:26:45 +00:00
toaster
4052e01f4a Introduce a sequence of macros to reduce the reliance of Colormap-related code (especially but not limited to Encore mode) on magic numbers. 2021-02-16 14:34:00 +00:00
toaster
8a4542a5ef Reintroduce the mirroring aspect of Encore in OpenGL. I'm not familiar enough with the renderer to recreate the rest of the changes at current, but this is the most significant regression. 2021-02-15 12:26:22 +00:00
Sryder
ca531738ab Fix for missing part of lighting calculation compared to software. 2021-02-12 18:41:16 +00:00
Sally Coolatta
13285d0ca4 OpenGL shader updated to be subtractive 
Not a big fan of how it separately checks each channel but grumble grumble
 2021-02-12 00:55:41 -05:00
Sryder
a06e4da65b Additive and subtractive for the HUD 2021-02-01 17:53:27 +00:00
Jaime Ita Passos
0d04b14bb3 Remove GLMipmap_t.nextmipmap 2021-01-27 21:23:20 -03:00
Jaime Ita Passos
7e28b7d3e9 OpenGL backend: Manage uploaded GPU textures with an internal list 
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
 2021-01-27 17:48:57 -03:00
LJ Sonic
2fcebc5eba Merge branch 'gl-levelflat-fix' into 'next' 
Fix a misuse of levelflat_t.picture in OpenGL

See merge request STJr/SRB2!1327
 2021-01-25 16:40:02 -05:00
James R
0292464611 Let sector flags control plane ripple effect 2021-01-12 22:16:55 -08:00
James R
ef3102e75a Merge branch 'gl-colormap-update' into 'next' 
Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)

Closes #187, #247, #301, and #370

See merge request STJr/SRB2!1301
 2020-12-15 20:50:45 -05:00
James R
bde40c36b1 Merge branch 'team-elementalfire' into 'next' 
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
 2020-12-15 20:47:45 -05:00
Jaime Ita Passos
5b56c49e1f Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port) 2020-12-14 02:07:12 -03:00
James R
20e0d99ea0 Remove trailing whitespace 2020-12-12 02:40:46 -08:00
Zippy_Zolton
b153276057 Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
James R
60ce05de38 Merge branch 'fix-gl-draw-cropped' into 'next' 
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.

See merge request STJr/SRB2!1297
 2020-12-10 15:44:51 -05:00
James R
2e649de64f Merge branch 'high-resolution-timer-2' into next 2020-12-10 02:55:02 -08:00
Jaime Ita Passos
f928709fa5 Fix animated skincolors in OpenGL 2020-12-06 20:17:14 -03:00
GoldenTails
01c9ae2377 Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides. 2020-12-06 12:01:31 -06:00
Jaime Ita Passos
490758eac2 Remove SHORT macros for referencing patch width/height/offsets 2020-11-22 20:02:47 -03:00
Jaime Ita Passos
82b11c224a Improve GPU texture management. 2020-11-22 18:18:26 -03:00
Jaime Ita Passos
688384c79b Fix sprite textures in models 2020-11-22 17:10:10 -03:00
Jaime Ita Passos
b8a13e6006 Change how texture deletion works in OpenGL 2020-11-22 17:03:04 -03:00
Jaime Ita Passos
be274a4fa9 Merge branch 'next' into spritestuff2 2020-11-19 00:52:43 -03:00
Sal
b2eb64ac09 Merge branch 'roll-and-tilt' into 'master' 
Roll & pitch replace modeltilt

See merge request KartKrew/Kart!326
 2020-11-17 20:03:48 -05:00
Sally Coolatta
f4e763ed72 Use additive/subtractive on models 2020-11-17 18:49:14 -05:00
James R
e1a8a393a3 Merge branch 'udmf-multitag' into 'next' 
UDMF: Multitag support

See merge request STJr/SRB2!1097
 2020-11-14 19:18:14 -05:00
James R
3a57e8eca5 Don't use drawflags for drawing precipitation in opengl 
drawflags does not exist in precipmobj_t
 2020-11-13 00:51:13 -08:00
James R
630dd8acb0 OpenGL: don't access field that doesn't exist in precipmobj_t 2020-11-13 00:46:03 -08:00
Sally Coolatta
da59009ba1 More extreme hitlag vibration 2020-11-10 23:12:17 -05:00
Nev3r
f94d9825b4 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag 2020-11-10 11:46:53 +01:00
James R
e0a799c1ed Merge branch 'allowshaders' into 'next' 
Let the server or an admin toggle clients' custom shaders

See merge request STJr/SRB2!1181
 2020-11-08 21:09:56 -05:00
Jaime Passos
72e338a164 rename 2020-11-08 23:02:05 -03:00
Sally Coolatta
470e399abe Merge master, add support for hitlag jitter in OpenGL 2020-11-08 01:56:27 -05:00
James R
27fbf77922 Huge perfstats refactor 
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
 2020-11-07 01:32:59 -08:00
Sally Coolatta
fed0ed98de Add R_SpriteRotationAngle function 
Gets the rotation angle for the mobj's sprite. Meant for pitch & roll later, but that part is if'd out currently and just returns mobj->rollangle
 2020-10-30 15:54:58 -04:00
Sally Coolatta
875493d778 Remove the need for setting rotation axis in spriteinfo for models 
Now it just does it like Software
 2020-10-30 02:15:49 -04:00
Hannu Hanhi
0516d21ff1 Fix some copyright statements in new files 2020-10-29 16:04:25 +02:00
Sally Coolatta
64c321fbed Fix incorrect tilts 2020-10-28 21:05:58 -04:00
Sally Coolatta
9dd43d4e4e Remove modeltilt, use roll & pitch instead 
Broken currently, about half of the slopes you can go into have the wrong tilt
 2020-10-28 18:36:26 -04:00
Sally Coolatta
01d5c9a95b Put back in the improvements to HWR_CreateBlendedTexture 
Fixes colors being darker, and creates blend textures faster
 2020-10-28 16:20:11 -04:00
Sally Coolatta
bac7de9b0f Merge branch 'master' into model-texture-fix 2020-10-28 15:58:00 -04:00
Sal
8b20a94202 Merge branch 'additive-transmap' into 'master' 
Additive and Subtractive Translation Maps

See merge request KartKrew/Kart!323
 2020-10-28 15:50:22 -04:00
Sally Coolatta
a253a6cedd Remove rogue line making this function do nothing 2020-10-28 15:41:32 -04:00
Sally Coolatta
646fd15b02 Remove these 2 calls to HWR_UnlockCachedPatch 
From what I can tell, this is not in SRB2 master or next. I'm uncertain about this, but Jeck has had zero crashes with this.
 2020-10-28 15:16:05 -04:00