Skip to content

Light issues fixed #1186

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

Merged
eprikazchikov merged 1 commit into from
Dec 15, 2025
Merged

Light issues fixed #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions worldeditor/bin/engine/materials/AreaLight.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ void main (void) {
proj.y = 1.0 - proj.y;
#endif

vec4 slice0 = texture(normalsMap, proj);
vec4 normalsSlice = texture(normalsMap, proj);

// Light model LIT
if(slice0.w > 0.0) {
if(normalsSlice.w > 0.0) {
float depth = texture(depthMap, proj).x;
vec3 world = getWorld(_screenToWorld, proj, depth);

Expand All @@ -145,17 +145,17 @@ void main (void) {

if(factor > 0.0) {
// Material parameters
vec4 slice1 = texture(paramsMap, proj);
float rough = slice1.x;
float metal = slice1.z;
float spec = slice1.w;
vec4 paramsSlice = texture(paramsMap, proj);
float rough = paramsSlice.x;
float metal = paramsSlice.z;
float spec = paramsSlice.w;

vec4 slice2 = texture(diffuseMap, proj);
vec3 albedo = slice2.xyz;
vec4 diffuseSlice = texture(diffuseMap, proj);
vec3 albedo = diffuseSlice.xyz;

// Vectors
vec3 v = normalize(cameraPosition() - world);
vec3 n = normalize(slice0.xyz * 2.0 - 1.0);
vec3 n = normalize(normalsSlice.xyz * 2.0 - 1.0);
vec3 r = -reflect(v, n);

float cosTheta = clamp(dot(l, n), -0.999, 0.999);
Expand Down
18 changes: 9 additions & 9 deletions worldeditor/bin/engine/materials/DirectLight.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,22 @@ void main(void) {
proj.y = 1.0 - proj.y;
#endif

vec4 slice0 = texture(normalsMap, proj);
vec4 normalsSlice = texture(normalsMap, proj);

// Light model LIT
if(slice0.w > 0.0) {
if(normalsSlice.w > 0.0) {
float depth = texture(depthMap, proj).x;
vec3 world = getWorld(_screenToWorld, proj, depth);

vec3 n = normalize(slice0.xyz * 2.0 - 1.0);
vec3 n = normalize(normalsSlice.xyz * 2.0 - 1.0);

vec4 params = texture(paramsMap, proj);
float rough = params.x;
float metal = params.z;
float spec = params.w;
vec4 paramsSlice = texture(paramsMap, proj);
float rough = paramsSlice.x;
float metal = paramsSlice.z;
float spec = paramsSlice.w;

vec4 slice2 = texture(diffuseMap, proj);
vec3 albedo = slice2.xyz;
vec4 diffuseSlice = texture(diffuseMap, proj);
vec3 albedo = diffuseSlice.xyz;

vec3 v = normalize(cameraPosition() - world);
vec3 h = normalize(direction.xyz + v);
Expand Down
18 changes: 9 additions & 9 deletions worldeditor/bin/engine/materials/PointLight.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ void main (void) {
proj.y = 1.0 - proj.y;
#endif

vec4 slice0 = texture(normalsMap, proj);
vec4 normalsSlice = texture(normalsMap, proj);

// Light model LIT
if(slice0.w > 0.0) {
if(normalsSlice.w > 0.0) {
float depth = texture(depthMap, proj).x;
vec3 world = getWorld(_screenToWorld, proj, depth);

Expand All @@ -98,17 +98,17 @@ void main (void) {
}
if(factor > 0.0) {
// Material parameters
vec4 params = texture(paramsMap, proj);
float rough = params.x;
float metal = params.z;
float spec = params.w;
vec4 paramsSlice = texture(paramsMap, proj);
float rough = paramsSlice.x;
float metal = paramsSlice.z;
float spec = paramsSlice.w;

vec4 slice2 = texture(diffuseMap, proj);
vec3 albedo = slice2.xyz;
vec4 diffuseSlice = texture(diffuseMap, proj);
vec3 albedo = diffuseSlice.xyz;

// Vectors
vec3 v = normalize(cameraPosition() - world);
vec3 n = normalize(slice0.xyz * 2.0 - 1.0);
vec3 n = normalize(normalsSlice.xyz * 2.0 - 1.0);
vec3 r = -reflect(v, n);

float radius = params.y;
Expand Down
18 changes: 9 additions & 9 deletions worldeditor/bin/engine/materials/SpotLight.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ void main (void) {

// params = x - brightness, y - radius/width, z - length/height, w - cutoff

vec4 slice0 = texture(normalsMap, proj);
vec4 normalsSlice = texture(normalsMap, proj);

// Light model LIT
if(slice0.w > 0.0) {
if(normalsSlice.w > 0.0) {
float depth = texture(depthMap, proj).x;
vec3 world = getWorld(_screenToWorld, proj, depth);

vec3 n = normalize(slice0.xyz * 2.0 - 1.0);
vec3 n = normalize(normalsSlice.xyz * 2.0 - 1.0);

vec3 dir = position.xyz - world;
vec3 l = normalize(dir);
Expand All @@ -87,13 +87,13 @@ void main (void) {
fall = getAttenuation(dist, params.y) * params.x * fall;
}

vec4 slice1 = texture(paramsMap, proj);
float rough = slice1.x;
float metal = slice1.z;
float spec = slice1.w;
vec4 paramsSlice = texture(paramsMap, proj);
float rough = paramsSlice.x;
float metal = paramsSlice.z;
float spec = paramsSlice.w;

vec4 slice2 = texture(diffuseMap, proj);
vec3 albedo = slice2.xyz;
vec4 diffuseSlice = texture(diffuseMap, proj);
vec3 albedo = diffuseSlice.xyz;

vec3 v = normalize(cameraPosition() - world);
vec3 h = normalize(l + v);
Expand Down
Loading