mirror of
https://github.com/lubosz/overte.git
synced 2025-08-05 20:44:04 +02:00
Merge pull request #4379 from AndrewMeadows/thermonuclear
fix dark lighting and missing avatars on linux
This commit is contained in:
commit
ef66182ce7
1 changed files with 4 additions and 1 deletions
|
@ -31,7 +31,8 @@ vec4 transformModelToClipPos(TransformCamera camera, TransformObject object, vec
|
||||||
return camera._projectionViewUntranslated * epos;
|
return camera._projectionViewUntranslated * epos;
|
||||||
// Equivalent to the following but hoppefully a bit more accurate
|
// Equivalent to the following but hoppefully a bit more accurate
|
||||||
// return camera._projection * camera._view * object._model * pos;
|
// return camera._projection * camera._view * object._model * pos;
|
||||||
|
<@else@>
|
||||||
|
return gl_ModelViewProjectionMatrix * pos;
|
||||||
<@endif@>
|
<@endif@>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,6 +51,8 @@ vec3 transformModelToEyeDir(TransformCamera camera, TransformObject object, vec3
|
||||||
vec3 result = vec3(dot(mvc0, dir), dot(mvc1, dir), dot(mvc2, dir));
|
vec3 result = vec3(dot(mvc0, dir), dot(mvc1, dir), dot(mvc2, dir));
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
<@else@>
|
||||||
|
return gl_NormalMatrix * dir;
|
||||||
<@endif@>
|
<@endif@>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue