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

ParseStage: do not overwrite alpha channel with rgbGen const, fix #120 #181

Merged
merged 1 commit into from Mar 17, 2019

Conversation

2 participants
@illwieckz
Copy link
Member

illwieckz commented Mar 10, 2019

I hope that it does the same thing the ColorAdaptor line did but without modifying alpha channel:

Daemon/src/common/Color.h

Lines 126 to 128 in 714566b

ColorAdaptor( const Component array[3] ) : ColorAdaptor<Component*>( array ) {}
Component Alpha() const { return ColorAdaptor<Component*>::component_max; }

fixedbug

fixedbug

fixedbug

fixedbug

Note that I also tested the alternative to edit the Color.h code to not reset alpha channel instead and it visually looks the same:

fixedbug

So this must fix #120.

@illwieckz illwieckz changed the title tr_shader.cpp: do not overwrite alpha channel with rgbGen const, fix #120 ParseStage: do not overwrite alpha channel with rgbGen const, fix #120 Mar 11, 2019

@illwieckz illwieckz force-pushed the illwieckz:fixwater branch from 4992f36 to 08ff5c1 Mar 11, 2019

@illwieckz illwieckz added this to To do in Unvanquished via automation Mar 13, 2019

@slipher

This comment has been minimized.

Copy link
Contributor

slipher commented Mar 17, 2019

Should you be multiplying by 255? Because that's what was done before the change which started to overwrite the alpha channel. 663a8a7#diff-1bbae737de9a028c652244c335ca8da3

@illwieckz illwieckz force-pushed the illwieckz:fixwater branch from 08ff5c1 to 645c1bd Mar 17, 2019

@illwieckz

This comment has been minimized.

Copy link
Member Author

illwieckz commented Mar 17, 2019

Fixed, and yes now that I see it I recognize what I was used to:

fixedbug

Thanks for the review.

@illwieckz illwieckz merged commit 645c1bd into DaemonEngine:master Mar 17, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

Unvanquished automation moved this from To do to Done Mar 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.