Skip to content

Fixes #1304 - Don't use mat3() constructor to keep compatibility with… #1318

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
MeFisto94 merged 1 commit into from
Apr 3, 2020
Merged

Fixes #1304 - Don't use mat3() constructor to keep compatibility with… #1318

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
6 changes: 5 additions & 1 deletion jme3-core/src/main/resources/Common/ShaderLib/PBR.glsllib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,11 @@ float renderProbe(vec3 viewDir, vec3 worldPos, vec3 normal, vec3 norm, float Rou

if(lightProbeData[0][3] != 0.0){
// oriented box probe
mat3 wToLocalRot = mat3(lightProbeData);
mat3 wToLocalRot;
wToLocalRot[0].xyz = lightProbeData[0].xyz;
wToLocalRot[1].xyz = lightProbeData[1].xyz;
wToLocalRot[2].xyz = lightProbeData[2].xyz;

wToLocalRot = inverse(wToLocalRot);
vec3 scale = vec3(lightProbeData[0][3], lightProbeData[1][3], lightProbeData[2][3]);
#if NB_PROBES >= 2
Expand Down