Sally Coolatta
885b7673eb
Makes it to kart files
2021-03-01 01:02:23 -05:00
Sally Coolatta
4139e67ddb
Renderer compile errors
2021-02-28 23:31:56 -05:00
Sally Coolatta
420a6ccccb
Fix Dehacked loading
2021-02-28 22:39:47 -05:00
Jaime Ita Passos
95c6139b32
Fix thing scale mismatch in R_DrawVisSprite
2021-02-28 16:23:40 -03: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
1e23a3b663
Fix dropshadows of papersprites drifting depending on angle relative to camera. Discovered in Kart internal for the paper item drops and ported back, hence the branch name.
2021-02-19 06:45:28 -05:00
toaster
36099a900f
Fixed papersprites' shadows drifting - notably applies to Minecraft items.
2021-02-19 11:31:25 +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
LJ Sonic
85cd429d1d
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 498ff708bb
2021-02-13 17:45:20 +01:00
Sally Coolatta
e250c35489
Remove ground scaling
...
I dun like it, it makes the gameplay purpose of shadows harder to discern
2021-02-10 20:03:29 -05:00
Sally Coolatta
4c26c4fd81
Shadows use additive/subtractive
2021-02-10 19:23:07 -05:00
LJ Sonic
05a75758ab
Merge branch 'redundant-hypot' into 'next'
...
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
Sally Coolatta
2af75a2bd1
Fix merge conflicts
2021-01-11 00:06:34 -05:00
James R
c7647c7f6c
Revert "Merge branch 'plane-sorting-fix-part-3' into 'next'"
...
This reverts merge request !1235
2020-12-23 03:02:31 +00:00
James R
498ff708bb
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
James R
e5a15f49bc
Merge branch 'plane-sorting-fix-part-2' into 'master'
...
More consistent fix to plane sorting false positive
See merge request KartKrew/Kart!330
2020-11-29 19:14:03 -05:00
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
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
da59009ba1
More extreme hitlag vibration
2020-11-10 23:12:17 -05:00
Sally Coolatta
470e399abe
Merge master, add support for hitlag jitter in OpenGL
2020-11-08 01:56:27 -05: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
James R
131d592bbf
Do not factor height into sprite thickseg sorting
2020-11-05 04:55:01 -08:00
James R
648f1f0958
Revert "Do not sort sprite in front of plane if plane should render in front of sprite's plane"
...
This reverts commit 0d6f329b1d
2020-11-05 00:20:14 -08:00
Jaime Passos
928ea1abc9
R_DrawSplatSprite -> R_DrawFloorSprite
2020-11-04 21:43:16 -03:00
James R
0d6f329b1d
Do not sort sprite in front of plane if plane should render in front of sprite's plane
...
Say you have a higher plane in the foreground and a lower one behind. And then
insert a sprite above the plane in the background, the top of which is higher
than the height in the foreground. Should the sprite be drawn in front of the
foreground plane? I think not. Sprites drawing in front of a plane if only part
of them is above the plane is a rendering trick that allows sprites to extend
into the floor. This doesn't make sense if the plane they extend into would be
obscured anyway, or if they don't extend into the plane at all.
2020-11-02 17:54:51 -08:00
James R
263a11e62f
Remove unused stuff
2020-11-02 03:37:16 -08:00
James R
9abdb855f9
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-02 03:37:00 -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
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
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
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
