sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1318 from MeFisto94/fix-pbr-opengl2

Browse Source 
Fixes #1304 - Don't use mat3() constructor to keep compatibility with…
This commit is contained in:
MeFisto94 2020-04-03 22:54:24 +02:00 committed by GitHub
commit c198b1d546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jme3-core/src/main/resources/Common/ShaderLib/PBR.glsllib
View File

@ -143,7 +143,11 @@ float renderProbe(vec3 viewDir, vec3 worldPos, vec3 normal, vec3 norm, float Rou
if(lightProbeData[0][3] != 0.0){ if(lightProbeData[0][3] != 0.0){
// oriented box probe // 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); wToLocalRot = inverse(wToLocalRot);
vec3 scale = vec3(lightProbeData[0][3], lightProbeData[1][3], lightProbeData[2][3]); vec3 scale = vec3(lightProbeData[0][3], lightProbeData[1][3], lightProbeData[2][3]);
#if NB_PROBES >= 2 #if NB_PROBES >= 2