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

Terrain normalmapping #1847

Closed
wants to merge 51 commits into from
Closed

Terrain normalmapping #1847

wants to merge 51 commits into from

Commits on Nov 2, 2021

  1. [Partial] Add optional support for terrain normalmap / specularmap

    @past-due @amelentev
    past-due authored and amelentev committed Nov 2, 2021
    Copy the full SHA
    0039be9 View commit details
    Browse the repository at this point in the history

  2. Terrain lighting. without texturemaps yet

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    f53f879 View commit details
    Browse the repository at this point in the history

  3. Terrain: normalmaps support

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    835aec7 View commit details
    Browse the repository at this point in the history

  4. Terrain: NormalMatrix uniform

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    b168de0 View commit details
    Browse the repository at this point in the history

  5. Terrain: specularmap

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    2807c0c View commit details
    Browse the repository at this point in the history

  6. Terrain: weight normals by angle

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    f0454d5 View commit details
    Browse the repository at this point in the history

  7. Terrain: lighting in opengl

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    8f0b844 View commit details
    Browse the repository at this point in the history

  8. Allow page-..._nm.png and page-..._sm.png texture files. 

    Do not put them all to "page-xx" pagename
    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    a91a770 View commit details
    Browse the repository at this point in the history

  9. Terrain: move paramXY to ModelUVMatrix. light uniforms from pie

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    5251823 View commit details
    Browse the repository at this point in the history

  10. Terrain: Fix lightmap shift

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    02db90f View commit details
    Browse the repository at this point in the history

  11. Terrain: decals normal and specmaps

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    2ee882d View commit details
    Browse the repository at this point in the history

  12. Terrain: fix normal points up

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    62d8aac View commit details
    Browse the repository at this point in the history

  13. Terrain: fix transitions

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    426fe94 View commit details
    Browse the repository at this point in the history

  14. Terrain: fix old gl code

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    7168059 View commit details
    Browse the repository at this point in the history

  15. Terrain: fix float textureSize

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    7367de9 View commit details
    Browse the repository at this point in the history

  16. Terrain: shader fixes

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    06a6c7a View commit details
    Browse the repository at this point in the history

  17. Testing decals 512x512 support

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    630b391 View commit details
    Browse the repository at this point in the history

  18. Terrain: heightmaps tile-xx_hm.png for decals

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    9745f43 View commit details
    Browse the repository at this point in the history

  19. Terrain: normal/specmaps for water

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    4025c68 View commit details
    Browse the repository at this point in the history

  20. Terrain: use TextureSize config for decals

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    f97ffbc View commit details
    Browse the repository at this point in the history

  21. Terrain: remove diffuse lighting from lightmap since it is in shaders… 

    … now.
    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    222d3b3 View commit details
    Browse the repository at this point in the history

  22. Terrain: water: light in modelspace 

    decals: 0 default specular
    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    23600bb View commit details
    Browse the repository at this point in the history

  23. Graphics tab in Debug window 

    buttons for reload textures, recompile shaders and sun rotation.
    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    63e311e View commit details
    Browse the repository at this point in the history

  24. Terrain: fix water uv2

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    068fde3 View commit details
    Browse the repository at this point in the history

  25. Terrain: fix lightmap and tile illumination

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    1e90dc0 View commit details
    Browse the repository at this point in the history

  26. Terrain: provide depth to water shader

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    8195187 View commit details
    Browse the repository at this point in the history

  27. Terrain: remove ViewSpace, move from Model directly to TangentSpace

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    d97de69 View commit details
    Browse the repository at this point in the history

  28. fix crash at 2nd game init

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    9e3cd7e View commit details
    Browse the repository at this point in the history

  29. terrain: decal automipmap

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    7271722 View commit details
    Browse the repository at this point in the history

  30. terrain: fixes for vulkan

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    27eedd2 View commit details
    Browse the repository at this point in the history

  31. fix vulkan automipmap

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    30a9177 View commit details
    Browse the repository at this point in the history

  32. terrain: >128 decal support fixes

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    64affcf View commit details
    Browse the repository at this point in the history

  33. terrain: heighmap for terrainLayers

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    7c1c8f3 View commit details
    Browse the repository at this point in the history

  34. Reload decal textures button

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    6c65d90 View commit details
    Browse the repository at this point in the history

  35. Terrain: water heightmaps

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    6ac6b1d View commit details
    Browse the repository at this point in the history

  36. terrain: do not use decal maps if not found

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    fe35e6e View commit details
    Browse the repository at this point in the history

  37. terrain: decal automipmap fixes 

    detect and use max available decals. scale down if needed
    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    4440ed9 View commit details
    Browse the repository at this point in the history

  38. terrain: no overhead if no decal maps

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    a6cb81b View commit details
    Browse the repository at this point in the history

  39. terrain: minor fixes

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    b53fd93 View commit details
    Browse the repository at this point in the history

  40. terrain: minor fix

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    c764eba View commit details
    Browse the repository at this point in the history

  41. fix compile warn/error

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    492d7bc View commit details
    Browse the repository at this point in the history

  42. Terrain: minor fixes

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    89aba67 View commit details
    Browse the repository at this point in the history

  43. Terrain: tileNo in decal shader

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    dc93b1d View commit details
    Browse the repository at this point in the history

  44. terrain: minor fixes

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    0f36e5c View commit details
    Browse the repository at this point in the history

  45. terrainShaderQuality config to switch classic/bump

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    d6e28bb View commit details
    Browse the repository at this point in the history

  46. terrain: use gl format (y+) normalmaps

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    2445830 View commit details
    Browse the repository at this point in the history

  47. enable terrain normalmapping by default

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    1573de3 View commit details
    Browse the repository at this point in the history

  48. do not load opt textures if not needed

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    7b3e3ea View commit details
    Browse the repository at this point in the history

  49. Refactor texture loading functions

    @past-due @amelentev
    past-due authored and amelentev committed Nov 2, 2021
    Copy the full SHA
    79f201b View commit details
    Browse the repository at this point in the history

  50. Use a single-component texture for terrain & water specular maps

    @past-due @amelentev
    past-due authored and amelentev committed Nov 2, 2021
    Copy the full SHA
    d1c652d View commit details
    Browse the repository at this point in the history

  51. fix terraindepth error after rebase

    @amelentev
    amelentev committed Nov 2, 2021
    Copy the full SHA
    6b989a0 View commit details
    Browse the repository at this point in the history