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

debugging: implement r_showNormalMaps and r_showMaterialMaps #257

Merged
merged 3 commits into from Jan 9, 2020

Conversation

@illwieckz
Copy link
Member

illwieckz commented Dec 29, 2019

implement r_showNormalMaps

r_showEntityNormals is dropped, in any way, vertexLighting_DBS_entity
and vertexLighting_DBS_world glsl are asking for merge

also beautify some code for other r_show* cvar

also introduce r_showMaterialMaps to debug specular and physical maps.

@illwieckz illwieckz force-pushed the illwieckz:debug branch from 732edf6 to 07b7979 Dec 29, 2019
@illwieckz illwieckz changed the title debugging: implement r_showNormalMaps debugging: implement r_showNormalMaps and r_showMaterialMaps Dec 29, 2019
@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Dec 30, 2019

I was having problems with specular maps, so I added r_showMaterialMaps… This to discover a mistake I did… and to somwhat fix PBR in the process…

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Dec 31, 2019

I would like to merge #256 before this one so I can also implement r_normalMapping in liquid shader.

Copy link
Member

slipher left a comment

A warning message if 2 or more of these mutually exclusive cvars are enabled would be nice. Otherwise looks good to merge.

@illwieckz illwieckz force-pushed the illwieckz:debug branch from df05cfa to 9d49e71 Jan 6, 2020
@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Jan 6, 2020

rebased on master and implemented r_showNormalMaps on liquidmap_fp.glsl

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Jan 6, 2020

@slipher A warning message if 2 or more of these mutually exclusive cvars are enabled would be nice. Otherwise looks good to merge.

I would like to have such feature but that seems not be very easy to do, as we may test all conflicting options…

A better implementation would be something like `r_showDebug normalmaps' or something like that, with a number for each type. We may create an issue for this but to me that looks out of topic of this PR.

@slipher
slipher approved these changes Jan 8, 2020
illwieckz added 3 commits Dec 29, 2019
r_showEntityNormals is dropped, in any way, vertexLighting_DBS_entity
and vertexLighting_DBS_world glsl are asking for merge

also beautify some code for other r_show* cvar
also, it may be a physical map and not only a specular one
@illwieckz illwieckz force-pushed the illwieckz:debug branch from 9d49e71 to 36fac1a Jan 9, 2020
@illwieckz illwieckz merged commit 8d05a50 into DaemonEngine:master Jan 9, 2020
0 of 2 checks passed
0 of 2 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.