James R
d6ed2f4ac8
Merge branch 'spritestuff2-fixes' into 'next'
...
Some fixes for spritestuff2
See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
James R
1a2c2c8471
Resolve one last conflict in splat sorting
...
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
Jaime Ita Passos
490758eac2
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
James R
d7e32e616d
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
2020-11-22 14:41:42 -08:00
Jaime Ita Passos
6d2742f5fb
Some fixes for spritestuff2
2020-11-22 03:47:15 -03:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
James R
cb7b7763cd
Do not factor height into sprite thickseg sorting
2020-11-05 18:45:52 -08:00
James R
fb181a5b38
Remove unused stuff
2020-11-05 18:45:51 -08:00
James R
9bb22d5fce
Check that top of sprite is above plane or bottom is below
...
This fixes slightly raised fofs drawing on top of sprites that should be in
front of them. Previously would check that the bottom of the object was above
the plane. Now also uses sprite offsets like the fof seg sorting does.
2020-11-05 18:45:43 -08:00
Jaime Passos
928ea1abc9
R_DrawSplatSprite -> R_DrawFloorSprite
2020-11-04 21:43:16 -03:00
Jaime Passos
d2c000b252
Implement an "ignore colormaps" sprite rendering flag
2020-10-27 19:54:50 -03:00
Jaime Passos
ab3f4960cb
Bug fixes
2020-10-27 17:02:35 -03:00
Jaime Passos
cdc4a6d86e
Implement blend modes
2020-10-27 00:03:41 -03:00
Jaime Passos
018b826e1b
Rename R_DrawVisSplat to R_DrawSplatSprite, move into r_splats.c
2020-10-19 17:36:29 -03:00
Jaime Passos
b84a7ebd53
Remove FLOORSPLATS define
2020-10-19 17:33:16 -03:00
Jaime Passos
f2e09eb2f6
Change vis->transmap statement
2020-10-15 14:05:18 -03:00
Jaime Passos
1aa324add0
Remove unnecessarily duplicated code in R_GetSpriteTranslation
2020-10-15 11:32:21 -03:00
Jaime Passos
5c2f487fbe
Don't project if rot_y is less than a single fracunit
2020-10-14 21:26:23 -03:00
Jaime Passos
578600156d
Simplify the floor splat clipping code a bit
2020-10-14 21:20:37 -03:00
Jaime Passos
96fa912bae
Implement object-defined floor sprite slopes.
2020-10-14 00:57:13 -03:00
Jaime Passos
3a76f04ac2
[Software] Use the light at the bottom of the object for splats
2020-10-13 23:14:05 -03:00
Jaime Passos
f93e050569
Implement sloped floor sprites
2020-10-13 22:42:07 -03:00
Jaime Passos
a6f2e8b9c6
Implement relative and absolute sprite offsets for objects (mobjs)
...
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
Jaime Passos
e8dd79e5e2
Improve sorting between sprites and floor sprites
2020-10-13 02:24:18 -03:00
Jaime Passos
ecd3ef99fc
Improve splat sorting:
...
Adjust the sort scale of splats
Do splat sorting in R_CreateDrawNodes if either vissprite is a splat, instead of if both are
2020-10-13 01:45:18 -03:00
Jaime Passos
cd87c6a5fb
Fix splat sorting
2020-10-13 01:09:17 -03:00
Jaime Passos
3849b4ac6c
Fix other uninitialized variable warnings
2020-10-13 00:14:27 -03:00
Jaime Passos
9bb09cdc8c
OpenGL support for splats, fix some shadow draw bugs in Software
2020-10-12 19:53:21 -03:00
Jaime Passos
37ed2a6b26
Support spritexscale and spriteyscale in OpenGL
...
Fix papersprite scaling with spritexscale and spriteyscale in Software
2020-10-12 17:25:18 -03:00
Jaime Passos
b4b4738c94
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
c40f2b3f2b
Add r_patchrotation.h
2020-10-10 18:53:05 -03:00
Jaime Passos
e23929a899
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
9ad15fd556
Fix PNG issue in OpenGL + optimize PNG sprite loading
2020-10-02 19:48:13 -03: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
d18d12fdea
Introduce Doom patch format into picture formats
...
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Jaime Passos
7bc4af41ab
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Jaime Passos
a7f3dd7eff
Refactor patch loading
2020-08-08 05:16:47 -03:00
lachwright
b132a6d3ec
Hide Metal Sonic's jet fume in first person
2020-08-03 20:09:35 +08:00
Jaime Passos
c385eca5d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
kaysrishaq
6f859fd44d
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
Hannu Hanhi
6961bba693
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
lachwright
92cae7aef9
Oops, forgot to #undef
2020-05-31 01:26:23 +08:00
lachwright
3b4df4657a
Move drop shadows to the ceiling for objects in reverse gravity
2020-05-31 01:21:26 +08:00
Monster Iestyn
58d62f9881
also do the fovtan multiplication thing with precip sprites
2020-05-20 19:34:18 +01:00
Monster Iestyn
8ad59bbb51
on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now)
...
meanwhile, let's move x/yscale calculations down since we don't actually need them until later on
2020-05-19 22:00:34 +01:00
Monster Iestyn
4ad02cae93
change limits for tx based on fov, by multiplying by fovtan
...
this makes it so that higher fov values can actually let you see all the sprites that should be in the view
2020-05-19 18:54:39 +01:00
Monster Iestyn
a2a6208548
do tx checking after tz clamping, not before
2020-05-19 18:43:33 +01:00
