Add normal maps #5643

notquitehadouken · 2025-01-30T17:12:06Z

Add normal maps to Clyde

Basically done, just waiting on content PR's spiriting work to conclude, and if #5602 is merged before that, then managing the (probably not too bad) merge conflicts

MyServer.-.Space.Station.14.2025-02-03.11-00-40.online-video-cutter.com.mp4

Defaults to off (toggle with the togglenormals command) for performance reasons (reasons being "if it turns out this has way worse performance on other computers or something then i don't want it to make people's ram boil alive")

Suggested to turn off light blur and to set resolution to 1

… into 25-01-23-normals4

notquitehadouken · 2025-02-06T03:45:23Z

pull the branch and run it to experience the wonders

notquitehadouken · 2025-02-18T23:30:47Z

It's back

0.441 is back

metalgearsloth · 2025-02-21T00:06:20Z

Resources/Shaders/Internal/light_shared.swsl

+
+    if (useNormals == 1)
+    {
+        highp vec2 lightDir = rotateVector(normalize(diff), globalRotation);
+        highp vec2 newUV = rotateVector(UV - vec2(0.5, 0.5) + rotateVector((lightCenter - eyeCenter) / vec2(2, -2) / lightRange, maskRotation), -globalRotation);
+        newUV *= (projectionMatrix * vec3(1.0, 1.0, 0.0)).xy * vec2(1.0, -1.0) / eyeZoom * lightRange;
+        newUV += vec2(0.5, 0.5);
+
+        highp vec4 origSample = texture2D(normalMap, newUV);
+        if (origSample.xyzw == vec4(0.0, 0.0, 0.0, 1.0))
+            discard;
+
+        // origSample is on the range 0 - 1 in all components,
+        // but every color component has been raised to SOMETHING by some unknown mechanism
+        // so we first raise it to the 0.452nd power to reset it
+        highp vec3 normalSample = pow(origSample.xyz, vec3(COLOR_POWER)) * vec3(2.0, 2.0, 1.0) - vec3(1.0, 1.0, 0.0);
+        run = dot(normalize(vec3(lightDir, lightHeight)), normalSample * vec3(-1.0, -1.0, 1.0));
+        if (run <= 0.0)
+            discard;
+    }
+


Aren't if statements expensive as shit in shaders.

Would it be better to just draw the normals to a separate texture and use that or somethin

metalgearsloth · 2025-02-21T00:09:12Z

Robust.Client/Graphics/Clyde/Clyde.GridRendering.cs

+        private void _drawGrids(Viewport viewport, Box2 worldAABB, Box2Rotated worldBounds, IEye eye, bool normal = false)
        {
+            if (normal && (!_lightManager.Enabled
+                           || !_lightManager.DrawLighting
+                           || !_cfg.GetCVar(CVars.LightNormals)
+                           || !_resourceCache.GetNormalsEnabled()))
+                return;
+


Not really sure why drawing is dropped entirely if lighting isn't enabled?

metalgearsloth · 2025-02-21T00:10:03Z

Resources/Shaders/Internal/normal-rotator.swsl

+uniform highp float rotation;
+const highp float COLOR_POWER = 0.452;
+const highp float COLOR_POWERNT = 2.212;
+
+void fragment()
+{
+    highp vec4 Col = zTexture(UV);
+    Col = vec4(pow(Col.xy, vec2(COLOR_POWER)) - vec2(0.5, 0.5), Col.zw);
+    Col = vec4(Col.xy * cos(rotation) + vec2(-1.0, 1.0) * Col.yx * sin(rotation), Col.zw);
+    Col = vec4(pow(Col.xy + vec2(0.5, 0.5), vec2(COLOR_POWERNT)), Col.zw);
+    COLOR = Col;


PLEASE comment shaders, especially when using magic numbers. This also has 0 flexibility for content.

metalgearsloth · 2025-02-21T00:11:37Z

Robust.Client/Graphics/AtlasTexture.cs


+        /// <summary>
+        ///     The width of the texture we came from, used for offsetting to get normals
+        /// </summary>
+        public int RegionWidth { get; }
+


I don't think knowing other texture areas should be something callers should worry about . AtlasTexture is just an abstraction to handle GPU memory in a more sane way.

metalgearsloth · 2025-02-21T00:14:03Z

Robust.Client/ResourceManagement/IResourceCache.cs

 {
+    bool GetNormalsEnabled();


ResourceCache should not be caring about rendering, at the very least it should be on clyde.

ngl i wrote that because "It works lmaoroflxd" and intended to find a better solution later. i never returned to it

metalgearsloth · 2025-02-21T00:14:54Z

Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs

+                        {
+                            var CPixel = normalImage[nX, nY].ToVector4();
+                            var NormVector = new Vector3(CPixel.X, CPixel.Y, CPixel.Z);
+                            NormVector = NormVector * new Vector3(2f, 2f, 1f) - new Vector3(1f, 1f, 0f);
+                            NormVector.Normalize();
+                            NormVector = (NormVector + new Vector3(1f, 1f, 0f)) * new Vector3(0.5f, 0.5f, 1f);
+                            var NewColor = new Rgba32(NormVector.X, NormVector.Y, NormVector.Z, texture[nX, nY].A);
+                            normalImage[nX, nY] = NewColor;
+                        }
+


Please document code with magic numbers.

metalgearsloth · 2025-02-21T00:17:45Z

Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs

                var texPath = data.Path / (stateObject.StateId + ".png");
+                var normalPath = data.Path / (stateObject.NormalId + ".png");
+                var bumpPath = data.Path / (stateObject.BumpId + ".png");


RSIs shouldn't have knowledge of normalmaps or bumpmaps in the same way they do not have knowledge of displacement maps.

metalgearsloth · 2025-02-21T00:18:24Z

Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs

+        {
+            int Width = bumpmap.Width;
+            int Height = bumpmap.Height;
+            normal = new Image<Rgba32>(Width, Height);
+            int x, y;
+            for (x = 0; x < Width; x++)
+            for (y = 0; y < Height; y++)
+            {
+                int XFactor = x / blocksize.X;
+                int YFactor = y / blocksize.Y;
+
+                int XL = x - 1;
+                int YL = y - 1;
+                int XR = x + 1;
+                int YR = y + 1;
+
+                float Left = 0f, Right = 0f, Up = 0f, Down = 0f;
+
+                if (XL - XFactor * blocksize.X >= 0)
+                    Left = bumpmap[XL, y].R / 255f;
+                if (XR - XFactor * blocksize.X < blocksize.X)
+                    Right = bumpmap[XR, y].R / 255f;
+                if (YL - YFactor * blocksize.Y >= 0)
+                    Up = bumpmap[x, YL].R / 255f;
+                if (YR - YFactor * blocksize.Y < blocksize.Y)
+                    Down = bumpmap[x, YR].R / 255f;


As elsewhere please document.

metalgearsloth · 2025-02-21T00:18:32Z

Robust.Client/ResourceManagement/ResourceTypes/RSIResource.cs

+
+                if (XL - XFactor * blocksize.X >= 0)
+                    Left = bumpmap[XL, y].A;
+                if (XR - XFactor * blocksize.X < blocksize.X)
+                    Right = bumpmap[XR, y].A;
+                if (YL - YFactor * blocksize.Y >= 0)
+                    Up = bumpmap[x, YL].A;
+                if (YR - YFactor * blocksize.Y < blocksize.Y)
+                    Down = bumpmap[x, YR].A;
+
+                if (Left == 0 || Right == 0 || Up == 0 || Down == 0)
+                {
+                    bumpmap[x, y] = new Rgba32(0.5f, 0.5f, 0.5f, original[x, y].A);
+                }
+                else
+                {
+                    bumpmap[x, y] = new Rgba32(1f, 1f, 1f, original[x, y].A);
+                }


As elsewhere please document.

metalgearsloth

Next time I'll do a proper review.

At the moment this is heavily coupled to engine and content has no control over it. Also if we need to make changes it now affects everything else.

Layers should not have an entirely separate shader for normals vs non-normals when only one is used.
Baking normal into every method signature is going to make it unmaintainable. E.g. extracttexture should not be caring about normals, texture drawing shouldn't care, dependency loading shouldn't care, etc.

We managed to get displacement maps without requiring it to be tightly coupled to the engine and we won't need it for normals.

notquitehadouken · 2025-02-22T03:27:13Z

i will create New branch

notquitehadouken and others added 17 commits January 23, 2025 16:21

Yes

69172ac

ok

19fe76c

the

f3874c7

pain

a6433f4

ok

ddde708

Merge branch 'master' of https://github.com/space-wizards/RobustToolbox…

271badb

… into 25-01-23-normals4

funny

e5b40d2

Add function normal generation

bafcc9a

no

329f3eb

OH MY GOD WHY IS HE BLACK

49b73be

funni

4371fc8

yeuAUA

cb16b06

no

b361b90

Merge branch 'master' of https://github.com/space-wizards/RobustToolbox…

d1f4491

… into 25-01-23-normals4

ok

a06e422

the

b9b5d79

ok

dc8e6a4

notquitehadouken changed the title ~~Add normals (for real this time)~~ Add normal maps Jan 30, 2025

notquitehadouken and others added 12 commits January 30, 2025 16:49

make sure

c053bca

unused

3c6dc64

fix offset

7263940

remove

5e31e1a

explain

c038d5a

fuck

487f341

Tile time

670d5b9

Fix weird mask rotation

b895e0e

Fix the horrendous 0.441 problem

37d5cf4

glue

3b51002

sussy

52b9c9c

toggle

f53350d

notquitehadouken and others added 4 commits February 3, 2025 14:48

bro

76e0600

lower precision to readable levels

9898327

very very light cleanup

7638708

Make normals not load when the CVar is disabled

4e34fe7

notquitehadouken mentioned this pull request Feb 5, 2025

Add normal maps space-wizards/space-station-14#34901

Closed

55 tasks

Support for having flat normals

42b209c

notquitehadouken marked this pull request as draft February 6, 2025 19:58

notquitehadouken marked this pull request as ready for review February 10, 2025 14:02

notquitehadouken marked this pull request as draft February 10, 2025 14:02

notquitehadouken added 2 commits February 13, 2025 08:55

.0

15c6bff

Add lightHeight and normalize normals on loading

8a8d2e8

notquitehadouken added 2 commits February 18, 2025 17:51

0.441 BEGONE

50e77c5

Prevent fuckiness when lightHeigh is below 0

9807f6f

notquitehadouken marked this pull request as ready for review February 20, 2025 00:29

Update validate_rsis.py to check for bumps and normals

fe58ea5

metalgearsloth reviewed Feb 21, 2025

View reviewed changes

metalgearsloth requested changes Feb 21, 2025

View reviewed changes

notquitehadouken marked this pull request as draft February 21, 2025 03:57

notquitehadouken closed this Feb 22, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add normal maps #5643

Add normal maps #5643

notquitehadouken commented Jan 30, 2025 •

edited

Loading

notquitehadouken commented Feb 6, 2025 •

edited

Loading

notquitehadouken commented Feb 18, 2025

metalgearsloth Feb 21, 2025

metalgearsloth Feb 21, 2025

metalgearsloth Feb 21, 2025

metalgearsloth Feb 21, 2025

metalgearsloth Feb 21, 2025

notquitehadouken Feb 22, 2025

metalgearsloth Feb 21, 2025

metalgearsloth Feb 21, 2025

metalgearsloth Feb 21, 2025

metalgearsloth Feb 21, 2025

metalgearsloth left a comment

notquitehadouken commented Feb 22, 2025

Add normal maps #5643

Add normal maps #5643

Conversation

notquitehadouken commented Jan 30, 2025 • edited Loading

notquitehadouken commented Feb 6, 2025 • edited Loading

notquitehadouken commented Feb 18, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

metalgearsloth left a comment

Choose a reason for hiding this comment

notquitehadouken commented Feb 22, 2025

notquitehadouken commented Jan 30, 2025 •

edited

Loading

notquitehadouken commented Feb 6, 2025 •

edited

Loading