Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DaemonEngine/Daemon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e8c9fb0490
Choose a base ref
...
head repository: DaemonEngine/Daemon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca3634aa75
Choose a head ref
  • 8 commits
  • 21 files changed
  • 2 contributors

Commits on Jan 15, 2025

  1. cmake: do not use space in compiler string definition, it is not comp…

    …atible with the standalone MinGW for Windows
    illwieckz committed Jan 15, 2025
    Configuration menu
    Copy the full SHA
    ca3634a View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2025

  1. Add r_forceRendererTime

    When set to >= 0, the value of this cvar (in milliseconds) will be used for time-based shader effects.
    VReaperV committed Jan 17, 2025
    Configuration menu
    Copy the full SHA
    0431a67 View commit details
    Browse the repository at this point in the history
  2. Change u_Color to uint

    `u_Color` was a vec4 that was being set from a `Color` object, which only has 8-bit precision per colour, so using up 4 times more memory than that to transfer it was quite atrocious. Instead, pack it into a uint32_t, then use `unpackUnorm4x8()` to unpack in the shader.
    
    Also adds a macro for unpacking for hardware that doesn't support `GL_ARB_gpu_shader5`.
    VReaperV committed Jan 17, 2025
    Configuration menu
    Copy the full SHA
    d3083cc View commit details
    Browse the repository at this point in the history
  3. Add a uint version of u_ColorModulate

    Add `u_ColorModulateColorGen` for use with shaders other than `cameraEffects`, since the latter can get an arbitrary vec4 for it. All other shaders only use 12 distinct states of `u_ColorModulateColorGen`, encoded as 5 bits. Also adds `u_ColorModulateLightFactor` as a global uniform, to be able to put the `genericMaterial` shader struct into 8 bytes.
    
    Fixes an issue with material shader post-processing that was removing global uniforms that had similar names to a non-global one.
    VReaperV committed Jan 17, 2025
    Configuration menu
    Copy the full SHA
    fcdd2b1 View commit details
    Browse the repository at this point in the history
  4. Fix lightsyles with u_Color

    Move the multiplication by tr.mapLightFactor to the generic shader, store it in `u_ColorModulateColorGen`.
    VReaperV committed Jan 17, 2025
    Configuration menu
    Copy the full SHA
    1d56e7d View commit details
    Browse the repository at this point in the history
  5. Switch lightFactor to use u_ColorModulateColorGen

    `tr.mapLightFactor` is already in `u_ColorModulateColorGen` anyway, so there's no need for the extra uniform.
    VReaperV committed Jan 17, 2025
    Configuration menu
    Copy the full SHA
    8104069 View commit details
    Browse the repository at this point in the history
  6. Fix colorModulate for lightFactor < 4

    Also fixes extra bits beng added to the `lightFactor` part `SetUniform_ColorModulateColorGen` in some cases.
    VReaperV committed Jan 17, 2025
    Configuration menu
    Copy the full SHA
    49b275e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    ad87861 View commit details
    Browse the repository at this point in the history
Loading