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.

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

[Feature]: New Shader Support (Gamedata) #1407

Merged
merged 32 commits into from
Nov 4, 2023

Conversation

yohjimane
Copy link
Contributor

@yohjimane yohjimane commented Jul 24, 2023

  • Support Ascii's screen space shaders
  • Support Kennedith/KennShade's enhanced shaders
  • Support Beef's NVG shaders
  • Support Anomaly gasmask shaders

@CasualDev242
Copy link
Contributor

Gamma correction is screwed up somewhere, this is what it looks like to me.

ss_matti_07-27-23_09-38-04_(zaton) - Copy

@yohjimane
Copy link
Contributor Author

yohjimane commented Jul 27, 2023

@CasualDev242
can you try these settings in console?

cfg_load grading_default
r2_gloss_factor 0.001
r2_gloss_min 0.35
r2_sun_lumscale 3.0
r2_sun_lumscale_amb 1.0
r2_sun_lumscale_hemi 1.1

@CasualDev242
Copy link
Contributor

That fixed it. You didn't include the different color grading config files in your commit, unless I copied it wrong, so I downloaded Enhanced shaders and loaded the cfg grading_default that way. If the screenshot looks too bright it's simply because I overdid it with the Indirect Lighting for testing.

ss_matti_07-27-23_11-04-20_(zaton) - Copy

@yohjimane yohjimane force-pushed the feature/shader-support-gamedata branch 3 times, most recently from aabb4d2 to 7c0ecb9 Compare August 5, 2023 11:47
@yohjimane yohjimane force-pushed the feature/shader-support-gamedata branch 3 times, most recently from 4755945 to 5c29f2e Compare August 8, 2023 23:18
@Xottab-DUTY Xottab-DUTY added Game assets A feature or an issue that involves gamedata change Player Experience Enhancement Call of Pripyat This can affect Call of Pripyat compatibility, or related to this game. labels Aug 27, 2023
@yohjimane yohjimane force-pushed the feature/shader-support-gamedata branch from 5c29f2e to f07239e Compare August 28, 2023 13:49
@yohjimane
Copy link
Contributor Author

Due to size, this branch will no longer receive any more updates. Any additional updates for this functionality (e.g. UI for new options, script functions ported to engine, etc) will be in separate PRs.

As of now, the support for using new shaders is in place, so I consider this feature complete.

@Neloreck
Copy link
Contributor

Tried to test locally. In general game looks better with new shaders, especially water. Not sure if I have done everything wrong, but here are some observations regarding pr/game:

  • It has ~140mb of textures. It makes sense to enable lfs for the repository or move all game assets into separate submodule with lfs enabled. Gitlab is more generous in terms of free mbytes for data storage
  • Seems like different grading support will be part of another PR, but when I tried to cfg_load other presets than default validation failed for vector4 numeric ranges
  • Probably it will be easier to add original bind script as separate PR and then changes will be easier to review. As I understand, it is just few lines to run game start callback
  • I believe it is rather specific to me, but raindrops were rather like dark ink and had near blue color with new shader
  • When I turn on SSAO mode HBAO everything is screwed up for me
    image

@yohjimane yohjimane force-pushed the feature/shader-support-gamedata branch from 2da26e0 to c590731 Compare November 4, 2023 07:52
…ading presets; add shader preset configs; moved preset configs from appdata -> gamedata
@yohjimane yohjimane force-pushed the feature/shader-support-gamedata branch from 1e57b67 to b33f3f4 Compare November 4, 2023 10:29
@Xottab-DUTY
Copy link
Member

Superseded by #1495

@Xottab-DUTY Xottab-DUTY closed this Nov 4, 2023
@Xottab-DUTY
Copy link
Member

Actually, not superseded: to make SSS-18 commits easier to diff

@Xottab-DUTY Xottab-DUTY reopened this Nov 4, 2023
@Xottab-DUTY Xottab-DUTY merged commit 1bccc36 into OpenXRay:dev Nov 4, 2023
24 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Call of Pripyat This can affect Call of Pripyat compatibility, or related to this game. Enhancement Game assets A feature or an issue that involves gamedata change Player Experience Renderer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support new shaders from Ascii1457, Kennshade, TheRealBeef, Anomaly Team
4 participants