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

gamedata: Implemented OpenGL SSR reflections on water from LVutner #641

Merged
merged 13 commits into from Jul 13, 2020
Merged

gamedata: Implemented OpenGL SSR reflections on water from LVutner #641

merged 13 commits into from Jul 13, 2020

Conversation

eagleivg
Copy link
Contributor

Please check for possible errors or places that can be optimized.

@eagleivg eagleivg requested a review from SkyLoaderr June 29, 2020 15:28
@SkyLoaderr
Copy link
Contributor

Please, replace all .f -> .0

eagleivg and others added 2 commits July 2, 2020 17:13
@eagleivg @Xottab-DUTY
Update src/Layers/xrRenderPC_GL/rgl_shaders.cpp
f3eec74 
Format fix #1

Co-authored-by: Xottab_DUTY <Xottab-DUTY@users.noreply.github.com>
@eagleivg @Xottab-DUTY
Update src/Layers/xrRenderPC_GL/rgl_shaders.cpp
4092ccb 
Format fix #2

Co-authored-by: Xottab_DUTY <Xottab-DUTY@users.noreply.github.com>
Xottab-DUTY
Xottab-DUTY reviewed Jul 2, 2020
View reviewed changes
Copy link
Member

@Xottab-DUTY Xottab-DUTY left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, sorry, I did the wrong formatting in the previous review.

src/Layers/xrRenderPC_GL/rgl_shaders.cpp Outdated Show resolved Hide resolved
src/Layers/xrRenderPC_GL/rgl_shaders.cpp Outdated Show resolved Hide resolved
eagleivg and others added 2 commits July 2, 2020 17:25
@eagleivg @Xottab-DUTY
Update src/Layers/xrRenderPC_GL/rgl_shaders.cpp
e737adc 
Fix format OpenXRay#3

Co-authored-by: Xottab_DUTY <Xottab-DUTY@users.noreply.github.com>
@eagleivg @Xottab-DUTY
Update src/Layers/xrRenderPC_GL/rgl_shaders.cpp
8ca2b96 
Fix format OpenXRay#4

Co-authored-by: Xottab_DUTY <Xottab-DUTY@users.noreply.github.com>
Xottab-DUTY
Xottab-DUTY reviewed Jul 2, 2020
View reviewed changes
Copy link
Member

@Xottab-DUTY Xottab-DUTY left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget to hide the inclusion of SSR.h in water.ps:

#if SSR_QUALITY > 0
#include "ssr.h"
#endif

src/Layers/xrRender/xrRender_console.cpp Outdated Show resolved Hide resolved
res/gamedata/shaders/gl/iostructs/p_water.h Show resolved Hide resolved
res/gamedata/shaders/gl/iostructs/p_water.h Show resolved Hide resolved
res/gamedata/shaders/gl/iostructs/p_water.h Outdated Show resolved Hide resolved
res/gamedata/shaders/gl/iostructs/v_water.h Show resolved Hide resolved
res/gamedata/shaders/gl/iostructs/v_water.h Show resolved Hide resolved
res/gamedata/shaders/gl/iostructs/v_water.h Outdated Show resolved Hide resolved
res/gamedata/shaders/gl/water.vs Show resolved Hide resolved
@Xottab-DUTY Xottab-DUTY merged commit da9114f into OpenXRay:xd_dev Jul 13, 2020
@Xottab-DUTY Xottab-DUTY deleted the sslr branch July 13, 2020 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xottab-DUTY Xottab-DUTY Xottab-DUTY left review comments

@SkyLoaderr SkyLoaderr SkyLoaderr left review comments

Assignees
No one assigned
Labels
Enhancement Player Experience Renderer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@eagleivg @SkyLoaderr @Xottab-DUTY