Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 09:15:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shader transform errors

Browse source
This commit is contained in:
Atlante45 2015-11-23 15:19:41 -08:00
parent 9adc437553
commit 28c8cf26f5
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/textured_particle.slv
View file

@ -128,7 +128,7 @@ void main(void) {
vec4 clipPos;
vec4 eyePos = vec4(anchorPoint.xyz + quadPos.xyz, 1.0);
<$transformEyeToClip(cam, eyePos, clipPos)$>
<$transformEyeToClipPos(cam, eyePos, clipPos)$>
gl_Position = clipPos;

13
libraries/gpu/src/gpu/Transform.slh
View file

@ -76,11 +76,10 @@ TransformCamera getTransformCamera() {
<@func $transformModelToEyePos(cameraTransform, objectTransform, modelPos, eyePos)@>
<!// Equivalent to the following but hoppefully a tad more accurate
//return camera._projection * camera._view * object._model * pos; !>
//return camera._view * object._model * pos; !>
{ // transformModelToEyePos
vec4 _worldpos = (<$objectTransform$>._model * <$modelPos$>);
vec4 _worldpos = (<$objectTransform$>._model * vec4(<$modelPos$>.xyz, 1.0));
<$eyePos$> = (<$cameraTransform$>._view * _worldpos);
// <$eyePos$> = (<$cameraTransform$>._projectionInverse * <$clipPos$>);
}
<@endfunc@>
@ -145,13 +144,13 @@ TransformCamera getTransformCamera() {
<@func transformClipToEyeDir(cameraTransform, clipPos, eyeDir)@>
{ // transformClipToEyeDir
<$eyeDir$> = vec3(<$cameraTransform$>._projectionInverse * vec4(<$clipPos$>.xyz, 1.0));
<$eyeDir$> = vec3(<$cameraTransform$>._projectionInverse * vec4(<$clipPos$>.xyz, 0.0));
}
<@endfunc@>
<@func transformEyeToClip(cameraTransform, eyePos, clipPos)@>
{ // transformEyeToClip
<$clipPos$> = <$cameraTransform$>._projection * <$eyePos$>;
<@func transformEyeToClipPos(cameraTransform, eyePos, clipPos)@>
{ // transformEyeToClipPos
<$clipPos$> = <$cameraTransform$>._projection * vec4(<$eyePos$>.xyz, 1.0);
}
<@endfunc@>