Commit graph

282 commits

Author SHA1 Message Date
NepDisk
d7ed03fab9 Remove M_Memcpy
Was quite literally a wrapper that did nothing.
2025-11-08 02:00:30 -05:00
NepDisk
a8609d7204 Un-shitify function.acp1 pointers 2025-10-23 23:26:26 -04:00
GenericHeroGuy
b051e142c1 Apply colormaps directly to sectors in kart maps, fixes Misty Maze
+ fix encore mapping not applying to fade color (Sunbeam Paradise)
2025-07-17 19:53:11 +02:00
NepDisk
2f84779d41 Update rest of the existing files to use blankart branding 2025-07-01 00:23:30 -04:00
NepDisk
f004b36dbb Revert 'Merge pull request 'File loading refactor' (#68) from wadstrbuf into blankart-dev'
This reverts commit f72475b557, reversing
changes made to 0c89c85aae.

Sorry Generic this branch is really cool but it needs more work. I shouldn't have merged it too early...
2025-06-30 01:45:01 -04:00
GenericHeroGuy
2ff383a248 Replace shortname functions with stubs, and some trivial caller replacements 2025-06-25 22:20:07 +02:00
GenericHeroGuy
7aae6775e6 Use LUMPERROR instead of INT16_MAX, and MAX_WADFILES instead of UINT16_MAX
The 32768th lump of a file works now lol
2025-06-25 17:47:57 +02:00
GenericHeroGuy
684ded7647 Formally deprecate the shortname functions
and make TestValidLump actually work
2025-06-25 14:57:37 +02:00
NepDisk
e78e49e3c1 Texture precaching
A simple port from saturn
2025-05-29 12:06:51 -04:00
SteelT
14e5796cf2 Support reading PICTURE/MINIMAP/ENCORE/TWEAKMAP lumps from a map resource
This supersedes the header-based method of fetching those lumps.

(G: a LOT of creative liberties... but i'd rather this thing compiles)
2025-02-07 02:41:06 +01:00
GenericHeroGuy
286592bd97 Restore old colormap algorithm (now as an option!) 2025-02-04 03:07:13 +01:00
GenericHeroGuy
48bb0ea5ef The actual palette remapping 2025-01-24 18:18:37 +01:00
NepDisk
80a40bf91f Make Terrain loading the same as other texture related things such as brightmaps 2024-09-19 21:44:34 -04:00
Eidolon
603be1dcaa Merge branch 'gl-encoremap-leak-fix' into 'master'
Fix GLENCORE memory leak, re-enable

See merge request KartKrew/Kart!1688
2024-08-01 03:44:32 -04:00
Sally Coolatta
04c1a9dcb1 Brightmaps on walls 2021-12-16 09:40:14 -05:00
Sally Coolatta
dbefc8fe58 Fix yellow persist fade colormap bug
I did the equivalent change to OpenGL and it broke Zoned City, despite it being fine in Software ... not sure what's up with that, since the color math is pretty similar. Just gonna leave that alone for now...
2021-12-06 22:47:15 -05:00
Sally Coolatta
8484ba9294 Alpha value for fade colormaps 2021-12-06 20:38:30 -05:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
toaster
cf59809852 Fixed some of the worst of it, but still has inconsistencies with the lookup tables we generated for main.kart - will provide evidence on Discord.
(side note, it's weird as hell that code we inherited from vanilla next - and i checked, it wasn't mangled in the merge - has bugs that straight up prevent it from functioning properly...)
2021-04-01 00:05:05 +01:00
Jaime Ita Passos
316ecff003 [Software] A few floorsprite fixes
This fixes the texture of the floorsprite sometimes facing the wrong way, since plane rendering can change the view angle.
2021-03-29 23:04:13 -03:00
toaster
99a764dbc0 Loadbar plus.
* Resolves #145.
* Increased granularity, to seperate out texture loading and sprite loading from other render structure initialisation.
* Shows small loading string in DEVELOP builds, to show where we can optimise loading times when we're polishing.
* Clean up con_refresh/startup, which got split into two variables in the merge by mistake.
2021-03-28 20:16:47 +01: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
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
a597d9b463 Fixed a too-small memory allocation for Encore remaps, removing all memory-related crashes in Software. 2021-02-15 16:37:37 +00:00
James R
e49d4a4cee Use fabs 2021-02-10 23:47:09 -08:00
Sally Coolatta
d5d8697efa Fix bug causing fog to be dull in some maps 2021-02-10 18:10:12 -05:00
Sally Coolatta
c3c9025b27 Minor cleanup 2021-02-10 17:20:16 -05:00
Sally Coolatta
c95684198d Add/sub fog
Makes it consistent with the subtractive lighting I was working on... the big benefit is that no saturation is lost when blending to white or black.
Has a few maps this looks worse on, though.
2021-02-10 15:43:58 -05:00
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next'
PNG conversion refactoring

See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
98c6b54994 Improved memory management for patches 2020-09-07 02:23:07 -03:00
Jaime Passos
7bc4af41ab Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Sally Coolatta
dfd733eb80 Up to screen.o
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Jaime Passos
cb3660331a Refactor renderer switching 2020-08-14 22:27:16 -03:00
Sally Coolatta
bca2e508ed Use kart's f_wipe 2020-08-12 18:15:28 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Jaime Passos
a7f3dd7eff Refactor patch loading 2020-08-08 05:16:47 -03:00
Sally Coolatta
9f869ec466 Merge r_data.c/h 2020-08-06 19:20:51 -04:00
Jaime Passos
10189ecdc0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03:00
Nev3r
d57d2959e0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-12 14:59:38 +02:00
Jaime Passos
a9da775dd9 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03:00
Jaime Passos
c385eca5d2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +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
Jaime Passos
588d6798fd Fix mistake 2020-05-16 14:01:42 -03:00
Jaime Passos
1b81e81c56 Attempt to properly match Software texture blending
without messing with the original ASTBlendPixel function
2020-05-16 13:51:10 -03:00
Jaime Passos
c421a12fea Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all 2020-05-15 16:41:39 -03:00
Jaime Passos
c69a4f9ced Merge remote-tracking branch 'origin/next' into pictureformats 2020-05-15 01:34:54 -03:00