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

Merge Feature/PBR lighting #962

Merged
merged 5 commits into from Mar 14, 2019

Conversation

Projects
None yet
2 participants
@georgios-uber
Copy link
Contributor

commented Mar 9, 2019

Background

Unify lighting sources.

Change List

  • Integrate shadertools lighting with phong-lighting (#949)
  • Convert PBR to use Standard Light parameters, Part 3 (#944)
  • Convert PBR to use Standard Light parameters, Part 2 (#943)
  • Convert PBR to use Standard Light parameters, Part 1 (#939)
  • Separate out code that prepares lighting uniforms

@georgios-uber georgios-uber self-assigned this Mar 9, 2019

@georgios-uber georgios-uber requested review from ibgreen and jianhuang01 Mar 9, 2019

@georgios-uber georgios-uber force-pushed the feature/pbr-lighting branch from 7e3ca56 to 6af3fac Mar 14, 2019

@georgios-uber georgios-uber merged commit a6c9f7d into master Mar 14, 2019

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@georgios-uber georgios-uber deleted the feature/pbr-lighting branch Mar 14, 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.