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

Shader rework #42

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

Shader rework #42

wants to merge 55 commits into from

Commits on Sep 22, 2024

  1. Add new terrain shader file

    @BlackYps
    BlackYps committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    bed175f View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. Attempt to fix lighting differences between editor and game

    @BlackYps
    BlackYps committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    05b1580 View commit details
    Browse the repository at this point in the history

  2. Add overlays into shader

    @BlackYps
    BlackYps committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    741e31a View commit details
    Browse the repository at this point in the history

  3. Make shader file functional

    @BlackYps
    BlackYps committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    d85d4ed View commit details
    Browse the repository at this point in the history

  4. Switch to new shader

    @BlackYps
    BlackYps committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    76460c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Fix vertex shader

    @BlackYps
    BlackYps committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    e38602c View commit details
    Browse the repository at this point in the history

  2. Fix texture sampling

    @BlackYps
    BlackYps committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    cb83fb0 View commit details
    Browse the repository at this point in the history

  3. Fix empty terrain scale

    @BlackYps
    BlackYps committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    8567e3c View commit details
    Browse the repository at this point in the history

  4. Fix normals

    @BlackYps
    BlackYps committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    af811a1 View commit details
    Browse the repository at this point in the history

  5. Move vertex shader and helper function up

    @BlackYps
    BlackYps committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    2bb199c View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Move struct further up

    @BlackYps
    BlackYps committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    40a4d5c View commit details
    Browse the repository at this point in the history

  2. Remove shadow calculation from shader

    @BlackYps
    BlackYps committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    22da8d3 View commit details
    Browse the repository at this point in the history

  3. Fix lighting inputs

    @BlackYps
    BlackYps committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    82da0c2 View commit details
    Browse the repository at this point in the history

  4. Attempt to fix decals

    @BlackYps
    BlackYps committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    d95f039 View commit details
    Browse the repository at this point in the history

  5. Use deferred rendering to enable decals, but do all light calculation… 

    …s in the surface shader
    @BlackYps
    BlackYps committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    a69ae39 View commit details
    Browse the repository at this point in the history

  6. Fix blue decals

    @BlackYps
    BlackYps committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    5eb45fc View commit details
    Browse the repository at this point in the history

  7. simplify lighting model

    @BlackYps
    BlackYps committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    cecd0f0 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Restore missing functions

    @BlackYps
    BlackYps committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c4aef07 View commit details
    Browse the repository at this point in the history

  2. Only output albedo directly in deferred shader

    @BlackYps
    BlackYps committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ec24c03 View commit details
    Browse the repository at this point in the history

  3. Reintroduce shadows for props

    @BlackYps
    BlackYps committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    fdc8b2f View commit details
    Browse the repository at this point in the history

  4. Disable shadows because of problems with unity

    @BlackYps
    BlackYps committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    82de541 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Calculate lighting and water overlay for decals and terrain out of gb… 

    …uffer

with creative use of the gbuffer we can pass all needed information
    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    20b7065 View commit details
    Browse the repository at this point in the history

  2. Do normal transformations manually so we can support custom world nor… 

    …mal textures
    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    dec7368 View commit details
    Browse the repository at this point in the history

  3. Add XP shader

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c1d4668 View commit details
    Browse the repository at this point in the history

  4. Make overlays functional

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7967b4b View commit details
    Browse the repository at this point in the history

  5. Add fog 

    This is a bullshit implementation and obviously not what the game does. But it's what the map editor has been doing so far, so we'll keep it for now.
    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    62fed31 View commit details
    Browse the repository at this point in the history

  6. Delete unused fog function

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8baf08a View commit details
    Browse the repository at this point in the history

  7. Reintroduce layer disabling

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    be48858 View commit details
    Browse the repository at this point in the history

  8. Add Terrain301

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6d57980 View commit details
    Browse the repository at this point in the history

  9. Add PBR lighting

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    15dd50c View commit details
    Browse the repository at this point in the history

  10. Make Terrain301 functional

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2ff3dce View commit details
    Browse the repository at this point in the history

  11. Restructure gBuffer usage because gBuffer2.a has only 2 bits

    @BlackYps
    BlackYps committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7715aab View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Add layer toggles to Terrain301

    @BlackYps
    BlackYps committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5332e58 View commit details
    Browse the repository at this point in the history

  2. Use a textfield for the shader name instead of a toggle

    @BlackYps
    BlackYps committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    30b1e7c View commit details
    Browse the repository at this point in the history

  3. Read correct channel for water 

    Current map gen maps read incorrect channels because of an dds encoding problem that will be fixed with the next map gen version.
    @BlackYps
    BlackYps committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    09264ae View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. Add uncommitted changes in unity files

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    ab7f81c View commit details
    Browse the repository at this point in the history

  2. Add new water shader

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    b89ec6e View commit details
    Browse the repository at this point in the history

  3. Bring in current water shader and start cleanup

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    7d48adc View commit details
    Browse the repository at this point in the history

  4. Adjust the shader to Unity's environment

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    40cb6b0 View commit details
    Browse the repository at this point in the history

  5. Cleanup

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    af64c73 View commit details
    Browse the repository at this point in the history

  6. Fix sun color

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    27ae2b1 View commit details
    Browse the repository at this point in the history

  7. More cleanup

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    c420bd6 View commit details
    Browse the repository at this point in the history

  8. Fix prop lighting

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    a1f7551 View commit details
    Browse the repository at this point in the history

  9. Add changes in water material

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    60a6e40 View commit details
    Browse the repository at this point in the history

  10. Change last used map to setons clutch faf version

    @BlackYps
    BlackYps committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    f27f14c View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Shader properties in material override global shader variables, so we… 

    … need to remove the properties
    @BlackYps
    BlackYps committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    4112396 View commit details
    Browse the repository at this point in the history

  2. Delete old shaders and rename files

    @BlackYps
    BlackYps committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    ba3bd2d View commit details
    Browse the repository at this point in the history

  3. Fix rendered area for water

    @BlackYps
    BlackYps committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    d924dbc View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. Fix specular reflections

    @BlackYps
    BlackYps committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    17e8e46 View commit details
    Browse the repository at this point in the history

  2. Add ability to read terrain normals from texture

    @BlackYps
    BlackYps committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    d6e5c49 View commit details
    Browse the repository at this point in the history

  3. Fix normal decals not appearing

    @BlackYps
    BlackYps committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    adf9281 View commit details
    Browse the repository at this point in the history

  4. Disable water coloration when water is disabled

    @BlackYps
    BlackYps committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    b952cc6 View commit details
    Browse the repository at this point in the history

  5. Fix water reflections

    @BlackYps
    BlackYps committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    4ea2ad1 View commit details
    Browse the repository at this point in the history

  6. Fix area rendering of water

    @BlackYps
    BlackYps committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    5556887 View commit details
    Browse the repository at this point in the history

  7. Fix refraction strength

    @BlackYps
    BlackYps committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    b0521c5 View commit details
    Browse the repository at this point in the history