Rend2 Updates #30

taysta · 2023-10-28T18:07:03Z

Theres a define in MP that clashes, so it was renamed in MP. Apply this to vanilla too. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

q_shared.h defines "int COM_GetCurrentParseLine( void )" q_shared.cpp implemented "int COM_GetCurrentParseLine( int index )" Fixed now, so function can actually be used. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Adding mdr structs, one more texture compression algorithm, some zone tags, and SkipBracedSection function Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Cleaned up alot of noise. Code formating will happen in another commit. All work based on: https://github.com/AntiAnti/OpenJK Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

To match MP

Chose the SP variant of this to get rid of the void pointer in the struct, so potentially less casting.

cg_showtris 1 shouldnt use depth culling. Had overseen this before.

ifdefed sp / mp differences

The saber marks in SP use some additional scaling and there's some missing parts still. Also fixed incorrect ifdeffed if else constructs.

Added working IsShaking Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Because there's a skyportal in this map, it always culled all the ui elements because they aren't sky surfaces.

when G2_PERFORMANCE_ANALYSIS

Compiles, haven't tested it though

You can now load yavin_swamp again.

Need to implement gpu vertex animations, but use the cpu fallback solution for now.

Its drawing at least. Potentially missing extra SP features.

I have no idea what this does. Can't find a difference visually myself.

Changed the API a little to match better between SP and MP. See following commits SomaZ@6654638 SomaZ@e40982b SomaZ@3ac87fd

so we can use Free on the program without checking if everything has been allocated.

taspir2 and yavin_swamp now look correct too.

…d is broken

Dont do that. GLS_DSTBLEND_BITS & GLS_SRCBLEND_BITS should be 0 for opaque objects that can write depth.

Also fixes depth lookup for weather surfaces that have no downwards velocity because we wont divide by zero anymore.

# Conflicts: # CMakeLists.txt # code/CMakeLists.txt # code/client/cl_cgame.cpp # code/client/cl_cin.cpp # code/client/cl_main.cpp # code/client/cl_ui.cpp # code/ghoul2/G2.h # code/qcommon/q_shared.cpp # code/qcommon/q_shared.h # code/qcommon/qfiles.h # code/qcommon/tags.h # code/rd-common/tr_public.h # code/rd-common/tr_types.h # code/rd-vanilla/G2_API.cpp # code/rd-vanilla/tr_local.h # code/rd-vanilla/tr_model.cpp # code/rd-vanilla/tr_scene.cpp # code/rd-vanilla/tr_shader.cpp # code/ui/ui_public.h # codemp/rd-vulkan/tr_subs.cpp # shared/rd-rend2/tr_light.cpp # shared/rd-rend2/tr_shader.cpp

taysta · 2023-10-29T10:36:00Z

Will wait until this is merged into OJK or for feedback from SomaZ, seemed to have some issues in game

SomaZ and others added 30 commits October 2, 2023 12:45

Copy all rend2 files to sp directory

7ab56c4

[vanilla] LS_NONE -> LS_LSNONE

c5fa1aa

Theres a define in MP that clashes, so it was renamed in MP. Apply this to vanilla too. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

COM_GetCurrentParseLine fix

2ca57db

q_shared.h defines "int COM_GetCurrentParseLine( void )" q_shared.cpp implemented "int COM_GetCurrentParseLine( int index )" Fixed now, so function can actually be used. Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Prepare qcommon and rd-common

564648e

Adding mdr structs, one more texture compression algorithm, some zone tags, and SkipBracedSection function Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Patch rend2 for sp

b58d0bb

Cleaned up alot of noise. Code formating will happen in another commit. All work based on: https://github.com/AntiAnti/OpenJK Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

Move mp rend2 to shared folder

a3ef151

[SP] rit.Malloc -> rit.Z_Malloc

6654638

To match MP

[MP] Get rid of _skinSurface_t

af50dcd

Chose the SP variant of this to get rid of the void pointer in the struct, so potentially less casting.

[Rend2] Fix cg_showtris depthtest

12e6d73

cg_showtris 1 shouldnt use depth culling. Had overseen this before.

[SP] Match R_LerpTag with MP API

e40982b

[SP] Match R_LerpTag with MP API for the UI too

3ac87fd

[SP] Match G2_SetupModelPointers with MP version

398bc90

[rend2] make sp renderer use the shared rend2 files

cb3fbe5

ifdefed sp / mp differences

Remove duplicate files

8728c92

Fix incorrect texture coordnates

e94f98f

The saber marks in SP use some additional scaling and there's some missing parts still. Also fixed incorrect ifdeffed if else constructs.

[rend2] WIP Weather functions

80f63c3

Added working IsShaking Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>

[rend2-sp] Fix broken endscreen yavin2

d4d710a

Because there's a skyportal in this map, it always culled all the ui elements because they aren't sky surfaces.

[rend2-sp] Fix ParseSessions

84095a9

[rend2-sp] Add missing G2 functions

58a2a51

when G2_PERFORMANCE_ANALYSIS

[rend2-sp] Add OpenJO cmake config

a540ebc

Compiles, haven't tested it though

[rend2-sp] Add basic JO support

ad6bccf

[rend2] Fix ghoul2 cache crashes

15a2b7c

[rend2] Increase max fog count

8a1cb94

You can now load yavin_swamp again.

[rend2-sp] Fix force push refraction and force speed doppelgaenger

1f85606

[rend2-sp] Add SP tcGen environment

cbce285

[rend2-sp] Fix SP force lightning

32d51fd

Merge branch 'JACoders:master' into rend2-unified-wip

825ab84

[rend2-sp] Add missing entity surface render types

8e9672d

[rend2] Add md3 animations back, just CPU for now

5d78e56

Need to implement gpu vertex animations, but use the cpu fallback solution for now.

[rend2-sp] Fix ghoul2 saber marks

14a5a18

Its drawing at least. Potentially missing extra SP features.

SomaZ and others added 22 commits October 8, 2023 18:21

[rend2-sp] Enabling additional sp g2 gore features

62c9b4c

I have no idea what this does. Can't find a difference visually myself.

[rend2-sp] Fix vid_restart and changing renderers

f319d69

[rend2] Add missing weather functions

83c3984

[SP] Increase REF_API_VERSION & UI_API_VERSION

c8facdf

Changed the API a little to match better between SP and MP. See following commits SomaZ@6654638 SomaZ@e40982b SomaZ@3ac87fd

[rend2-sp] Attempt fixing non Windows builds

30ab592

[rend2] Fix viewport when RDF_NOWORLDMODEL

65b189c

[rend2-sp] Implement RDF_doLAGoggles

dab5a41

[rend2] Init Uniforms for the splashScreenShader

4f3d478

so we can use Free on the program without checking if everything has been allocated.

[rend2-sp] Fix LA Goggles

b0b5a2b

[rend2-sp] Fix fog assignments

b2fe6c1

taspir2 and yavin_swamp now look correct too.

[rend2-sp] Make level end screenshot work correctly

c39945a

[rend2-sp] Implement screen dissolve

e654948

[rend2] Don't draw shadowmap shadows for g2 effects

1ba765b

[rend2] Fallback to surface normal for lighting vectors when lightgri…

eb53d01

…d is broken

[rend2] Fix depth writes for shaders with blendFunc & sort opaque

71c57d2

Dont do that. GLS_DSTBLEND_BITS & GLS_SRCBLEND_BITS should be 0 for opaque objects that can write depth.

[rend2] Load weather images as SRGB in hdr lighting conditions

e67779a

Also fixes depth lookup for weather surfaces that have no downwards velocity because we wont divide by zero anymore.

[rend2] Fix fog color in hdr lighting conditions

b23b3f1

[SP] Match AddPolyToScene with MP

63249af

Adjust VK according to new Rend2 changes

96dd9b0

Put this define back

08fe762

Merge branch 'master' into rend2update

d6f5bec

taysta closed this Oct 29, 2023

taysta deleted the rend2update branch November 1, 2023 09:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rend2 Updates #30

Rend2 Updates #30

taysta commented Oct 28, 2023

taysta commented Oct 29, 2023

Rend2 Updates #30

Rend2 Updates #30

Conversation

taysta commented Oct 28, 2023

taysta commented Oct 29, 2023