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

Night Vision Light Sensetivity #5486

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

Night Vision Light Sensetivity #5486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7d4229d
init
Rinary1 Oct 7, 2024
0f7821e
fix double GL.Clear
Rinary1 Oct 7, 2024
c80c376
Merge branch 'master' of https://github.com/Rinary1/RobustToolbox int…
Rinary1 Oct 26, 2024
18ccd7a
Merge branch 'space-wizards:master' into night-vision-light-sensitivity
Rinary1 Oct 26, 2024
357b178
upd
Rinary1 Oct 29, 2024
400eb11
upd
Rinary1 Oct 30, 2024
d52ef8c
clear
Rinary1 Oct 30, 2024
00128dc
clear
Rinary1 Oct 30, 2024
3efd5ec
Merge branch 'space-wizards:master' into night-vision-light-sensitivity
Rinary1 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions Robust.Client/Graphics/Clyde/Clyde.LightRendering.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ internal partial class Clyde
private ClydeTexture FovTexture => _fovRenderTarget.Texture;
private ClydeTexture ShadowTexture => _shadowRenderTarget.Texture;

private (PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)[] _lightsToRenderList = default!;
private (EntityUid uid, PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)[] _lightsToRenderList = default!;

private LightCapacityComparer _lightCap = new();
private ShadowCapacityComparer _shadowCap = new ShadowCapacityComparer();
Expand Down Expand Up @@ -383,7 +383,7 @@ private void DrawLightsAndFov(Viewport viewport, Box2Rotated worldBounds, Box2 w
{
for (var i = 0; i < count; i++)
{
var (light, lightPos, _, _) = _lightsToRenderList[i];
var (_, light, lightPos, _, _) = _lightsToRenderList[i];

if (!light.CastShadows) continue;

Expand Down Expand Up @@ -432,22 +432,34 @@ private void DrawLightsAndFov(Viewport viewport, Box2Rotated worldBounds, Box2 w
var lastPower = float.NaN;
var lastColor = new Color(float.NaN, float.NaN, float.NaN, float.NaN);
var lastSoftness = float.NaN;
var lightRenderEvent = new LightRenderEvent();
Texture? lastMask = null;

using (_prof.Group("Draw Lights"))
{
for (var i = 0; i < count; i++)
{
var (component, lightPos, _, rot) = _lightsToRenderList[i];
var (uid, component, lightPos, _, rot) = _lightsToRenderList[i];

lightRenderEvent.Mask = component.Mask;
lightRenderEvent.Rotation = component.Rotation;
lightRenderEvent.MaskAutoRotate = component.MaskAutoRotate;
lightRenderEvent.Radius = component.Radius;
lightRenderEvent.Energy = component.Energy;
lightRenderEvent.Color = component.Color;
lightRenderEvent.CastShadows = component.CastShadows;
lightRenderEvent.Softness = component.Softness;

_entityManager.EventBus.RaiseLocalEvent(uid, ref lightRenderEvent);

Texture? mask = null;
var rotation = Angle.Zero;
if (component.Mask != null)
if (lightRenderEvent.Mask != null)
{
mask = component.Mask;
rotation = component.Rotation;
mask = lightRenderEvent.Mask;
rotation = lightRenderEvent.Rotation;

if (component.MaskAutoRotate)
if (lightRenderEvent.MaskAutoRotate)
{
rotation += rot;
}
Expand All @@ -461,35 +473,35 @@ private void DrawLightsAndFov(Viewport viewport, Box2Rotated worldBounds, Box2 w
lightShader.SetUniformTextureMaybe(UniIMainTexture, TextureUnit.Texture0);
}

if (!MathHelper.CloseToPercent(lastRange, component.Radius))
if (!MathHelper.CloseToPercent(lastRange, lightRenderEvent.Radius))
{
lastRange = component.Radius;
lastRange = lightRenderEvent.Radius;
lightShader.SetUniformMaybe("lightRange", lastRange);
}

if (!MathHelper.CloseToPercent(lastPower, component.Energy))
if (!MathHelper.CloseToPercent(lastPower, lightRenderEvent.Energy))
{
lastPower = component.Energy;
lastPower = lightRenderEvent.Energy;
lightShader.SetUniformMaybe("lightPower", lastPower);
}

if (lastColor != component.Color)
if (lastColor != lightRenderEvent.Color)
{
lastColor = component.Color;
lastColor = lightRenderEvent.Color;
lightShader.SetUniformMaybe("lightColor", lastColor);
}

if (_enableSoftShadows && !MathHelper.CloseToPercent(lastSoftness, component.Softness))
{
lastSoftness = component.Softness;
lastSoftness = lightRenderEvent.Softness;
lightShader.SetUniformMaybe("lightSoftness", lastSoftness);
}

lightShader.SetUniformMaybe("lightCenter", lightPos);
lightShader.SetUniformMaybe("lightIndex",
component.CastShadows ? (i + 0.5f) / ShadowTexture.Height : -1);
lightRenderEvent.CastShadows ? (i + 0.5f) / ShadowTexture.Height : -1);

var offset = new Vector2(component.Radius, component.Radius);
var offset = new Vector2(lightRenderEvent.Radius, lightRenderEvent.Radius);

Matrix3x2 matrix;
if (mask == null)
Expand Down Expand Up @@ -566,28 +578,28 @@ private static bool LightQuery(ref (
shadowCount++;

var distanceSquared = (state.worldAABB.Center - lightPos).LengthSquared();
state.clyde._lightsToRenderList[count++] = (light, lightPos, distanceSquared, rot);
state.clyde._lightsToRenderList[count++] = (value.Uid, light, lightPos, distanceSquared, rot);

return true;
}

private sealed class LightCapacityComparer : IComparer<(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)>
private sealed class LightCapacityComparer : IComparer<(EntityUid _, PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)>
{
public int Compare(
(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) x,
(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) y)
(EntityUid _, PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) x,
(EntityUid _, PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) y)
{
if (x.light.CastShadows && !y.light.CastShadows) return 1;
if (!x.light.CastShadows && y.light.CastShadows) return -1;
return 0;
}
}

private sealed class ShadowCapacityComparer : IComparer<(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)>
private sealed class ShadowCapacityComparer : IComparer<(EntityUid _, PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot)>
{
public int Compare(
(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) x,
(PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) y)
(EntityUid _, PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) x,
(EntityUid _, PointLightComponent light, Vector2 pos, float distanceSquared, Angle rot) y)
{
return x.distanceSquared.CompareTo(y.distanceSquared);
}
Expand Down Expand Up @@ -1233,7 +1245,7 @@ private void MaxOccludersChanged(int value)
private void MaxLightsChanged(int value)
{
_maxLights = value;
_lightsToRenderList = new (PointLightComponent, Vector2, float , Angle)[value];
_lightsToRenderList = new (EntityUid, PointLightComponent, Vector2, float , Angle)[value];
DebugTools.Assert(_maxLights >= _maxShadowcastingLights);
}
}
Expand Down
17 changes: 17 additions & 0 deletions Robust.Client/Graphics/Clyde/LightRenderEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using Robust.Client.Graphics;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;

[ByRefEvent]
public record struct LightRenderEvent()
{
public Texture? Mask;
public bool MaskAutoRotate;
public Angle Rotation;
public float Radius;
public float Energy;
public Color Color;
public bool CastShadows;
public float Softness;
}

Loading