quartznet/raylib-cs
2
0
Fork 0
mirror of https://github.com/raylib-cs/raylib-cs synced 2025-09-09 03:01:41 -04:00
Code Activity

Fix PBR do not work

Browse Source
This commit is contained in:
MrScautHD
2024-02-08 22:27:13 +01:00
parent e8d9746e21
commit 1fac1c5d50
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Examples/Shaders/BasicPbr.cs
View File

@@ -198,13 +198,21 @@ public class BasicPbr
// Draw spheres to show the lights positions // Draw spheres to show the lights positions
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
var color = lights[i].Color;
var lightColor = new Color(
(byte)(color.X * 255),
(byte)(color.Y * 255),
(byte)(color.Z * 255),
(byte)(color.W * 255)
);
if (lights[i].Enabled) if (lights[i].Enabled)
{ {
DrawSphereEx(lights[i].Position, 0.2f, 8, 8, lights[i].Color); DrawSphereEx(lights[i].Position, 0.2f, 8, 8, lightColor);
} }
else else
{ {
DrawSphereWires(lights[i].Position, 0.2f, 8, 8, ColorAlpha(lights[i].Color, 0.3f)); DrawSphereWires(lights[i].Position, 0.2f, 8, 8, ColorAlpha(lightColor, 0.3f));
} }
} }

20
Examples/Shared/PbrLights.cs
View File

@@ -9,7 +9,7 @@ public struct PbrLight
public bool Enabled; public bool Enabled;
public Vector3 Position; public Vector3 Position;
public Vector3 Target; public Vector3 Target;
public Color Color; public Vector4 Color;
public float Intensity; public float Intensity;
// Shader light parameters locations // Shader light parameters locations
@@ -46,7 +46,12 @@ public class PbrLights
light.Type = type; light.Type = type;
light.Position = pos; light.Position = pos;
light.Target = target; light.Target = target;
light.Color = color; light.Color = new Vector4(
color.R / 255.0f,
color.G / 255.0f,
color.B / 255.0f,
color.A / 255.0f
);
light.Intensity = intensity; light.Intensity = intensity;
string enabledName = "lights[" + lightsCount + "].enabled"; string enabledName = "lights[" + lightsCount + "].enabled";
@@ -61,7 +66,7 @@ public class PbrLights
light.PositionLoc = GetShaderLocation(shader, posName); light.PositionLoc = GetShaderLocation(shader, posName);
light.TargetLoc = GetShaderLocation(shader, targetName); light.TargetLoc = GetShaderLocation(shader, targetName);
light.ColorLoc = GetShaderLocation(shader, colorName); light.ColorLoc = GetShaderLocation(shader, colorName);
light.ColorLoc = GetShaderLocation(shader, intensityName); light.IntensityLoc = GetShaderLocation(shader, intensityName);
UpdateLightValues(shader, light); UpdateLightValues(shader, light);
@@ -86,14 +91,7 @@ public class PbrLights
Raylib.SetShaderValue(shader, light.TargetLoc, light.Target, ShaderUniformDataType.Vec3); Raylib.SetShaderValue(shader, light.TargetLoc, light.Target, ShaderUniformDataType.Vec3);
// Send to shader light color values // Send to shader light color values
float[] color = new[] Raylib.SetShaderValue(shader, light.ColorLoc, light.Color, ShaderUniformDataType.Vec4);
{
(float)light.Color.R / (float)255,
(float)light.Color.G / (float)255,
(float)light.Color.B / (float)255,
(float)light.Color.A / (float)255
};
Raylib.SetShaderValue(shader, light.ColorLoc, color, ShaderUniformDataType.Vec4);
// Send to shader light intensity values // Send to shader light intensity values
Raylib.SetShaderValue(shader, light.IntensityLoc, light.Intensity, ShaderUniformDataType.Float); Raylib.SetShaderValue(shader, light.IntensityLoc, light.Intensity, ShaderUniformDataType.Float);