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

Global illumination VCT & CI VCT #675

Merged
merged 48 commits into from
Dec 22, 2022
Merged

Global illumination VCT & CI VCT #675

merged 48 commits into from
Dec 22, 2022

Commits on Dec 21, 2022

  1. Ogre2GpuRays no longer creates the compositor programmatically 

    It uses a script now.
Textures are passed via the Compositor or else Ogre cannot setup proper
layout transitions for Vulkan for these textures
Fix INTEGRATION_gpu_rays under Vulkan

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    fd40395 View commit details
    Browse the repository at this point in the history

  2. Ogre2GpuRays no longer creates the compositor programmatically 

    It uses a script now.
Textures are passed via the Compositor or else Ogre cannot setup proper
layout transitions for Vulkan for these textures
Fix INTEGRATION_gpu_rays under Vulkan

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    43927a9 View commit details
    Browse the repository at this point in the history

  3. Reduce VRAM consumption by reusing textures in Ogre2GpuRays 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    6152f2c View commit details
    Browse the repository at this point in the history

  4. Add Ogre2GlobalIlluminationVct (WIP) 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    a57fde7 View commit details
    Browse the repository at this point in the history

  5. Do not early-create VctLighting as it causes a crash 

    Add VCT required compute shaders

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    c9a60af View commit details
    Browse the repository at this point in the history

  6. Fix uninitialized variable 

    Anisotropic VCT wasn't always taking effect
Disable setAllowMultipleBounces on SetBounceCount(0)

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    7f8fe84 View commit details
    Browse the repository at this point in the history

  7. Fix bug adding Items in GlobalIlluminationVct::Build 

    Add SetDebugVisualization
Add Visual::SetVisualStatic
Update to latest VCT shaders from upstream (needs updating Ogre 2.2 to
latest version for them to work)

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    e345875 View commit details
    Browse the repository at this point in the history

  8. Update to latest upstream to fix SetOctantCount 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    6146155 View commit details
    Browse the repository at this point in the history

  9. Add global_illumination example 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    bd2601d View commit details
    Browse the repository at this point in the history

  10. Update GI whenever lighting is dirty 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    d8794ab View commit details
    Browse the repository at this point in the history

  11. Update VCT data files to 2.3's 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    52a8ad1 View commit details
    Browse the repository at this point in the history

  12. Add Ogre2RenderEngine::CreateNativeWindow 

    Add Ogre2NativeWindow
GI sample uses SDL2 instead of GLUT

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    a41a5ed View commit details
    Browse the repository at this point in the history

  13. Fix unused parameter warning 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    c940dea View commit details
    Browse the repository at this point in the history

  14. Fix cast warning 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    60ed403 View commit details
    Browse the repository at this point in the history

  15. Fix wheel in SDL2-based sample 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    dab088e View commit details
    Browse the repository at this point in the history

  16. Add RenderEngine::CurrentGraphicsAPI 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    68314ca View commit details
    Browse the repository at this point in the history

  17. Fix Vulkan presentation in samples 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    ea105d3 View commit details
    Browse the repository at this point in the history

  18. Fix bad merge errors 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    5b462fd View commit details
    Browse the repository at this point in the history

  19. Add CIVCT (WIP) 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    f273c6d View commit details
    Browse the repository at this point in the history

  20. Fix sample build 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    723d10b View commit details
    Browse the repository at this point in the history

  21. CIVCT demo is working! 

    Load debug plugins on debug builds

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    5dd34d3 View commit details
    Browse the repository at this point in the history

  22. Update CIVCT as camera moves 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    ac58fb5 View commit details
    Browse the repository at this point in the history

  23. Fixes for CIVCT 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    bfbb321 View commit details
    Browse the repository at this point in the history

  24. Fix crash 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    3cbfbab View commit details
    Browse the repository at this point in the history

  25. Add GlobalIlluminationBase::SetParticipatingVisuals 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    61817bc View commit details
    Browse the repository at this point in the history

  26. Add GlobalIlluminationCiVct::PopCascade 

    And various minor fixes

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    fbfabd7 View commit details
    Browse the repository at this point in the history

  27. Add GlobalIlluminationCiVct::Started 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    862c586 View commit details
    Browse the repository at this point in the history

  28. Fix OgreNext assert after building CIVCT 

    Ogre-Next CI VCT doesn't like updating the VCT lighting more than once
per frame; and during our initial Build, we would send the wrong
coordinates; causing a second rebuild when the right coordinates are set
later on.

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    c42ec4d View commit details
    Browse the repository at this point in the history

  29. Add GlobalIlluminationCiVct::Reset 

    This allows the GUI to edit cascade settings again after it was no
longer possible

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    431988e View commit details
    Browse the repository at this point in the history

  30. Fix assert in OgreNext 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    8be0c35 View commit details
    Browse the repository at this point in the history

  31. Don't return started after calling GlobalIlluminationCiVct::Reset 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    3d45182 View commit details
    Browse the repository at this point in the history

  32. Fix IGN -> GZ compiler error 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    8f006f6 View commit details
    Browse the repository at this point in the history

  33. Add missing function 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    478ffc8 View commit details
    Browse the repository at this point in the history

  34. Fix ign -> gz naming 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    53b6370 View commit details
    Browse the repository at this point in the history

  35. Fix deprecation warning 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    cec9837 View commit details
    Browse the repository at this point in the history

  36. Update copyright 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    34beb59 View commit details
    Browse the repository at this point in the history

  37. Update copyright 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    6837cf2 View commit details
    Browse the repository at this point in the history

  38. Update copyright 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    02a87c4 View commit details
    Browse the repository at this point in the history

  39. Syntactic sugar changes 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    64f38da View commit details
    Browse the repository at this point in the history

  40. Fix ignition -> gz name changes 

    Use d key to toggle debug visualization

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    11f8820 View commit details
    Browse the repository at this point in the history

  41. Docs fixes 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    5675754 View commit details
    Browse the repository at this point in the history

  42. Fix wrong documentation 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    418a289 View commit details
    Browse the repository at this point in the history

  43. Update docs 

    Ign -> gz naming changes

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    54d6db5 View commit details
    Browse the repository at this point in the history

  44. Rename GlutWindow -> Sdl2Window 

    Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
    @darksylinc @iche033
    darksylinc authored and iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    b831b35 View commit details
    Browse the repository at this point in the history

  45. Add tests, change SetVisualStatic -> SetStatic, fix shutdown, fix dem… 

    …o, ign->gz

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
    @iche033
    iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    1167ace View commit details
    Browse the repository at this point in the history

  46. fix style and tests 

    Signed-off-by: Ian Chen <ichen@osrfoundation.org>
    @iche033
    iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    98e4d8d View commit details
    Browse the repository at this point in the history

  47. skip test on github actions 

    Signed-off-by: Ian Chen <ichen@osrfoundation.org>
    @iche033
    iche033 committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    94a042d View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. fix gi demo exit crash 

    Signed-off-by: Ian Chen <ichen@osrfoundation.org>
    @iche033
    iche033 committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    73d0760 View commit details
    Browse the repository at this point in the history