Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rend2 Updates #30

Closed
wants to merge 52 commits into from
Closed

Rend2 Updates #30

wants to merge 52 commits into from

Commits on Oct 2, 2023

  1. Copy all rend2 files to sp directory

    @SomaZ
    SomaZ committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    7ab56c4 View commit details
    Browse the repository at this point in the history

  2. [vanilla] LS_NONE -> LS_LSNONE 

    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>
    @SomaZ @AntiAnti
    SomaZ and AntiAnti committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    c5fa1aa View commit details
    Browse the repository at this point in the history

  3. COM_GetCurrentParseLine fix 

    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>
    @SomaZ @AntiAnti
    SomaZ and AntiAnti committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    2ca57db View commit details
    Browse the repository at this point in the history

  4. Prepare qcommon and rd-common 

    Adding mdr structs, one more texture compression algorithm, some zone tags, and SkipBracedSection function

Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
    @SomaZ @AntiAnti
    SomaZ and AntiAnti committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    564648e View commit details
    Browse the repository at this point in the history

  5. Patch rend2 for sp 

    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>
    @SomaZ @AntiAnti
    SomaZ and AntiAnti committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    b58d0bb View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Move mp rend2 to shared folder

    @SomaZ
    SomaZ committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    a3ef151 View commit details
    Browse the repository at this point in the history

  2. [SP] rit.Malloc -> rit.Z_Malloc 

    To match MP
    @SomaZ
    SomaZ committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    6654638 View commit details
    Browse the repository at this point in the history

  3. [MP] Get rid of _skinSurface_t 

    Chose the SP variant of this to get rid of the void pointer in the struct, so potentially less casting.
    @SomaZ
    SomaZ committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    af50dcd View commit details
    Browse the repository at this point in the history

  4. [Rend2] Fix cg_showtris depthtest 

    cg_showtris 1 shouldnt use depth culling. Had overseen this before.
    @SomaZ
    SomaZ committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    12e6d73 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. [SP] Match R_LerpTag with MP API

    @SomaZ
    SomaZ committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    e40982b View commit details
    Browse the repository at this point in the history

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

    @SomaZ
    SomaZ committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    3ac87fd View commit details
    Browse the repository at this point in the history

  3. [SP] Match G2_SetupModelPointers with MP version

    @SomaZ
    SomaZ committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    398bc90 View commit details
    Browse the repository at this point in the history

  4. [rend2] make sp renderer use the shared rend2 files 

    ifdefed sp / mp differences
    @SomaZ
    SomaZ committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    cb3fbe5 View commit details
    Browse the repository at this point in the history

  5. Remove duplicate files

    @SomaZ
    SomaZ committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    8728c92 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Fix incorrect texture coordnates 

    The saber marks in SP use some additional scaling and there's some missing parts still.

Also fixed incorrect ifdeffed if else constructs.
    @SomaZ
    SomaZ committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    e94f98f View commit details
    Browse the repository at this point in the history

  2. [rend2] WIP Weather functions 

    Added working IsShaking

Co-Authored-By: AntiAnti <17278566+antianti@users.noreply.github.com>
    @SomaZ @AntiAnti
    SomaZ and AntiAnti committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    80f63c3 View commit details
    Browse the repository at this point in the history

  3. [rend2-sp] Fix broken endscreen yavin2 

    Because there's a skyportal in this map, it always culled all the ui elements because they aren't sky surfaces.
    @SomaZ
    SomaZ committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    d4d710a View commit details
    Browse the repository at this point in the history

  4. [rend2-sp] Fix ParseSessions

    @SomaZ
    SomaZ committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    84095a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. [rend2-sp] Add missing G2 functions 

    when G2_PERFORMANCE_ANALYSIS
    @SomaZ
    SomaZ committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    58a2a51 View commit details
    Browse the repository at this point in the history

  2. [rend2-sp] Add OpenJO cmake config 

    Compiles, haven't tested it though
    @SomaZ
    SomaZ committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    a540ebc View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. [rend2-sp] Add basic JO support

    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    ad6bccf View commit details
    Browse the repository at this point in the history

  2. [rend2] Fix ghoul2 cache crashes

    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    15a2b7c View commit details
    Browse the repository at this point in the history

  3. [rend2] Increase max fog count 

    You can now load yavin_swamp again.
    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    8a1cb94 View commit details
    Browse the repository at this point in the history

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

    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    1f85606 View commit details
    Browse the repository at this point in the history

  5. [rend2-sp] Add SP tcGen environment

    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    cbce285 View commit details
    Browse the repository at this point in the history

  6. [rend2-sp] Fix SP force lightning

    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    32d51fd View commit details
    Browse the repository at this point in the history

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

    @SomaZ
    SomaZ authored Oct 7, 2023
    Configuration menu
    Copy the full SHA
    825ab84 View commit details
    Browse the repository at this point in the history

  8. [rend2-sp] Add missing entity surface render types

    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    8e9672d View commit details
    Browse the repository at this point in the history

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

    Need to implement gpu vertex animations, but use the cpu fallback solution for now.
    @SomaZ
    SomaZ committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    5d78e56 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. [rend2-sp] Fix ghoul2 saber marks 

    Its drawing at least. Potentially missing extra SP features.
    @SomaZ
    SomaZ committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    14a5a18 View commit details
    Browse the repository at this point in the history

  2. [rend2-sp] Enabling additional sp g2 gore features 

    I have no idea what this does. Can't find a difference visually myself.
    @SomaZ
    SomaZ committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    62c9b4c View commit details
    Browse the repository at this point in the history

  3. [rend2-sp] Fix vid_restart and changing renderers

    @SomaZ
    SomaZ committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    f319d69 View commit details
    Browse the repository at this point in the history

  4. [rend2] Add missing weather functions

    @SomaZ
    SomaZ committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    83c3984 View commit details
    Browse the repository at this point in the history

  5. [SP] Increase REF_API_VERSION & UI_API_VERSION 

    Changed the API a little to match better between SP and MP. See following commits
SomaZ@6654638
SomaZ@e40982b
SomaZ@3ac87fd
    @SomaZ
    SomaZ committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    c8facdf View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. [rend2-sp] Attempt fixing non Windows builds

    @SomaZ
    SomaZ committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    30ab592 View commit details
    Browse the repository at this point in the history

  2. [rend2] Fix viewport when RDF_NOWORLDMODEL

    @SomaZ
    SomaZ committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    65b189c View commit details
    Browse the repository at this point in the history

  3. [rend2-sp] Implement RDF_doLAGoggles

    @SomaZ
    SomaZ committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    dab5a41 View commit details
    Browse the repository at this point in the history

  4. [rend2] Init Uniforms for the splashScreenShader 

    so we can use Free on the program without checking if everything has been allocated.
    @SomaZ
    SomaZ committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    4f3d478 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. [rend2-sp] Fix LA Goggles

    @SomaZ
    SomaZ committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    b0b5a2b View commit details
    Browse the repository at this point in the history

  2. [rend2-sp] Fix fog assignments 

    taspir2 and yavin_swamp now look correct too.
    @SomaZ
    SomaZ committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    b2fe6c1 View commit details
    Browse the repository at this point in the history

  3. [rend2-sp] Make level end screenshot work correctly

    @SomaZ
    SomaZ committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    c39945a View commit details
    Browse the repository at this point in the history

  4. [rend2-sp] Implement screen dissolve

    @SomaZ
    SomaZ committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    e654948 View commit details
    Browse the repository at this point in the history

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

    @SomaZ
    SomaZ committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    1ba765b View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

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

    …d is broken
    @SomaZ
    SomaZ authored Oct 13, 2023
    Configuration menu
    Copy the full SHA
    eb53d01 View commit details
    Browse the repository at this point in the history

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

    Dont do that. GLS_DSTBLEND_BITS & GLS_SRCBLEND_BITS should be 0 for opaque objects that can write depth.
    @SomaZ
    SomaZ committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    71c57d2 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2023

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

    Also fixes depth lookup for weather surfaces that have no downwards velocity because we wont divide by zero anymore.
    @SomaZ
    SomaZ committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    e67779a View commit details
    Browse the repository at this point in the history

  2. [rend2] Fix fog color in hdr lighting conditions

    @SomaZ
    SomaZ committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    b23b3f1 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. [SP] Match AddPolyToScene with MP

    @SomaZ
    SomaZ committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    63249af View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Merge remote-tracking branch 'SomaZ/rend2-unified-wip' into rend2update 

    # 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
    taysta committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    730b8b4 View commit details
    Browse the repository at this point in the history

  2. Adjust VK according to new Rend2 changes

    @taysta
    taysta committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    96dd9b0 View commit details
    Browse the repository at this point in the history

  3. Put this define back

    @taysta
    taysta committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    08fe762 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. Merge branch 'master' into rend2update

    @taysta
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    d6f5bec View commit details
    Browse the repository at this point in the history