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

Project 6 submission #18

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open

Project 6 submission #18

wants to merge 38 commits into from

Commits on Nov 13, 2013

  1. Updated project to run on my laptop with cornel box.

    @cboots
    cboots committed Nov 13, 2013
    Configuration menu
    Copy the full SHA
    4950125 View commit details
    Browse the repository at this point in the history

  2. Added some debug text to command line modes.

    @cboots
    cboots committed Nov 13, 2013
    Configuration menu
    Copy the full SHA
    e3774eb View commit details
    Browse the repository at this point in the history

  3. Added nvidia settings.

    @cboots
    cboots committed Nov 13, 2013
    Configuration menu
    Copy the full SHA
    d775847 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2013

  1. Minor changes.

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    5139a93 View commit details
    Browse the repository at this point in the history

  2. Added simple point lights.

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    88ead1f View commit details
    Browse the repository at this point in the history

  3. Added point light grid.

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    864fdb1 View commit details
    Browse the repository at this point in the history

  4. Added lights for sponza scene.

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    d9f7506 View commit details
    Browse the repository at this point in the history

  5. Moved points around

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    67858ff View commit details
    Browse the repository at this point in the history

  6. Added buggy textures.

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    9ca052d View commit details
    Browse the repository at this point in the history

  7. Fixed diffuse textures.

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    ba0b53b View commit details
    Browse the repository at this point in the history

  8. Fixed sponza file. tinyobj loader can't handle multiple materials per… 

    … group.
    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    8ccdd9a View commit details
    Browse the repository at this point in the history

  9. Added filtered textures.

    @cboots
    cboots committed Nov 14, 2013
    Configuration menu
    Copy the full SHA
    cc8b235 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2013

  1. Added passthrough for bump, mask, and specular textures.

    @cboots
    cboots committed Nov 15, 2013
    Configuration menu
    Copy the full SHA
    0d6dc23 View commit details
    Browse the repository at this point in the history

  2. Added some more debug modes.

    @cboots
    cboots committed Nov 15, 2013
    Configuration menu
    Copy the full SHA
    b305d9b View commit details
    Browse the repository at this point in the history

  3. Added more debug modes, allow disabling of different textures.

    @cboots
    cboots committed Nov 15, 2013
    Configuration menu
    Copy the full SHA
    70f2e3c View commit details
    Browse the repository at this point in the history

  4. Renamed color output of passthrough shader.

    @cboots
    cboots committed Nov 15, 2013
    Configuration menu
    Copy the full SHA
    f50bfb0 View commit details
    Browse the repository at this point in the history

  5. Added specular texture to each stage 2 shader.

    @cboots
    cboots committed Nov 15, 2013
    Configuration menu
    Copy the full SHA
    74c7c12 View commit details
    Browse the repository at this point in the history

  6. Added specular debug mode and sampling stubs

    @cboots
    cboots committed Nov 15, 2013
    Configuration menu
    Copy the full SHA
    6de24a7 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2013

  1. Moved around debug shader options.

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    c5682e9 View commit details
    Browse the repository at this point in the history

  2. Added specular highlights

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    73cf348 View commit details
    Browse the repository at this point in the history

  3. Added more scene lighting

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    ab6ce59 View commit details
    Browse the repository at this point in the history

  4. Added Ks to point shader

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    4961d2a View commit details
    Browse the repository at this point in the history

  5. Added Tangent to pass shader.

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    04b0c3e View commit details
    Browse the repository at this point in the history

  6. Added bump mapping.

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    e4ab4b7 View commit details
    Browse the repository at this point in the history

  7. Disabled depth test for point lights

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    98ba267 View commit details
    Browse the repository at this point in the history

  8. Attempted to implement alpha channel passthrough.

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    7746735 View commit details
    Browse the repository at this point in the history

  9. Added in bloom texture to pass through separately. 

    Alpha channel screwed me over.
    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    5fe4497 View commit details
    Browse the repository at this point in the history

  10. Changed bloom code a bit. Still not fixed.

    @cboots
    cboots committed Nov 16, 2013
    Configuration menu
    Copy the full SHA
    cfa3d44 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2013

  1. Added bloom. Scaling was wrong on filter.

    @cboots
    cboots committed Nov 17, 2013
    Configuration menu
    Copy the full SHA
    e641936 View commit details
    Browse the repository at this point in the history

  2. Added ability to disable bloom at runtime.

    @cboots
    cboots committed Nov 17, 2013
    Configuration menu
    Copy the full SHA
    108bbcf View commit details
    Browse the repository at this point in the history

  3. Added toon shader.

    @cboots
    cboots committed Nov 17, 2013
    Configuration menu
    Copy the full SHA
    0acb1b7 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2013

  1. Added performance metric recording code.

    @cboots
    cboots committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    f7487b2 View commit details
    Browse the repository at this point in the history

  2. Added charts

    @cboots
    cboots committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    4d7b9ff View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @cboots
    cboots committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    1ecb2c0 View commit details
    Browse the repository at this point in the history

  4. Lion Closeup

    @cboots
    cboots committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    671310b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/cboots/Deferred-Shading

    @cboots
    cboots committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    8adb10a View commit details
    Browse the repository at this point in the history

  6. Update README.md

    @cboots
    cboots committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    c821d26 View commit details
    Browse the repository at this point in the history

  7. Update README.md

    @cboots
    cboots committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    5bd574d View commit details
    Browse the repository at this point in the history