thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-06 16:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16994 commits 2 branches 14 tags 206 MiB
Commit graph

290 commits

Author SHA1 Message Date
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
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
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
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
James R
2ae394b8e3 Fix opengl splitscreen 2020-10-26 19:51:42 -07:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
Jaime Passos
70cd48c9a2 Merge remote-tracking branch 'origin' into slight-shader-cleanup 2020-10-08 22:45:39 -03:00
SteelT
045aaa678c Merge branch 'ogl-model-uv-adjust' into 'next' 
Re-adjust model UVs when sprite texture dimensions change

See merge request STJr/SRB2!1068
 2020-09-25 21:19:59 -04:00
Hannu Hanhi
9473de18c5 Convince the compiler that I know what I'm doing, I think 2020-08-18 23:21:26 +03:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sryder
7f9850644b A few opengl file build fixes 
Also ogl_win.c had a merge conflict remaining apparently.
 2020-08-12 00:12:42 +01:00
Sryder
67486dc0b6 Fix Simple opengl merge conflicts 
hw_cache.c, hw_data.h, hw_defs.h, hw_dll.h, hw_draw.c, hw_drv.h, hw_glob.h, hw_md2.c, hw_md2.h, r_opengl.c
 2020-08-10 17:39:34 +01:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
737f5c35c4 Merge r_opengl.c/h 2020-08-09 20:45:29 -04:00
James R
66d36d4fdf Merge branch 'opengl-skydome-fixes' into 'next' 
Move the sky dome code out of r_opengl.c, fix issues with shaders

See merge request STJr/SRB2!1071
 2020-08-09 20:45:01 -04:00
Jaime Passos
368e550ab1 Shader code cleanup 2020-08-07 18:17:05 -03:00
James R
36210abee8 Merge branch 'ogl-model-lighting-shader' into 'next' 
Add capability to use model lighting with shaders enabled

See merge request STJr/SRB2!1073
 2020-08-05 19:50:31 -04:00
Hannu Hanhi
6fd250117a Don't discard zero alpha fog block fragments. Fixes #198. 2020-07-23 18:24:41 +03:00
Hannu Hanhi
1c4d605b51 Fix shader comment 2020-07-19 16:07:53 +03:00
Hannu Hanhi
e575676887 Don't override custom shaders with model lighting shader 2020-07-18 15:48:37 +03:00
Hannu Hanhi
5b8c41fffd Add capability to use model lighting with shaders enabled 2020-07-18 15:08:59 +03:00
Jaime Passos
16c4ba672a Move the sky dome code out of r_opengl.c, fix issues with shaders 2020-07-17 02:48:05 -03:00
Hannu Hanhi
85b2ed594f More work on sprite-texture model uv adjustment 2 2020-07-16 22:39:44 +03:00
Hannu Hanhi
edc479fd13 More work on sprite-texture model uv adjustment 2020-07-16 22:11:36 +03:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
Jaime Passos
fec258ccb8 Fix GL y-shearing ignoring a Y-flipped transform 2020-07-10 19:19:51 -03:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
Jaime Passos
ff7b9a5b5c Remove unused texture formats 2020-07-06 00:58:09 -03:00
Jaime Passos
d283cc1d2a Rename structs, turn GrTextureFormat_t into an enum 2020-07-06 00:52:10 -03:00
Jaime Passos
146da28f88 Remove GrTexInfo 2020-07-06 00:35:48 -03:00
kaysrishaq
18281fd511 Whoops, switched these for no reason 2020-06-19 11:11:19 -04:00
kaysrishaq
6f859fd44d FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04:00
Hannu Hanhi
a5f4c3eeb0 Backwards compatibility for shaderless hardware 2020-06-18 17:39:34 +03:00
Steel Titanium
06f76f07f4 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
 2020-06-17 18:15:07 -04:00
mazmazz
b62497911c Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
Hannu Hanhi
6cdb8c3320 Change some unsigned ints to UINT32 2020-06-07 21:32:52 +03:00
Hannu Hanhi
8ea66e3813 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Steel Titanium
52c8ba5d49 Fix opengl crashing on startup due to lack of checks 
Also fixes the log file not being written to the home directory.
 2020-05-23 16:21:26 -04:00
Sryder
b2674a3cd0 Initialise these to 0 just to stop GCC 4.4 from complaining. 
This should be okay since 0 generally means "nothing" for these, and they should always be set before being used later on.
 2020-05-20 11:47:22 +01:00
Wolfy
c3d34198ef Shader batching additions 2020-04-29 00:03:02 -05:00
Sally Cochenour
9483b72410 Forgotten / TICRATE 2020-04-25 21:33:34 -04:00
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
Hannu Hanhi
9daa78554d Optimization: also don't reset shader on models 2020-04-25 16:32:44 +03:00
Hannu Hanhi
cb62882e5a Optimization: only call pglUseProgram if shader actually needs changing 2020-04-25 16:32:32 +03:00
Hannu Hanhi
44c420a671 Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader 2020-04-25 16:32:21 +03:00