Merge branch 'master' of https://git.etud.insa-toulouse.fr/serviere/EnginPasTangible
This commit is contained in:
commit
2ee55100e5
2 changed files with 4 additions and 0 deletions
|
@ -10,6 +10,7 @@ out vec3 Ey;
|
|||
out vec3 Ez;
|
||||
out vec3 CamPos;
|
||||
out float fovValue;
|
||||
out float FacteurLargeur;
|
||||
|
||||
uniform float iTime;
|
||||
uniform vec3 iEx;
|
||||
|
@ -17,6 +18,7 @@ uniform vec3 iEy;
|
|||
uniform vec3 iEz;
|
||||
uniform vec3 iCamPos;
|
||||
uniform float iFovValue;
|
||||
uniform float iFacteurLargeur;
|
||||
|
||||
|
||||
void main()
|
||||
|
@ -29,4 +31,5 @@ void main()
|
|||
Ez = iEz;
|
||||
CamPos = iCamPos;
|
||||
fovValue = iFovValue;
|
||||
FacteurLargeur=iFacteurLargeur;
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ in vec3 Ey;
|
|||
in vec3 Ez;
|
||||
in vec3 CamPos;
|
||||
in float fovValue;
|
||||
in float FacteurLargeur;
|
||||
|
||||
out vec4 FragColor;
|
||||
//uniform sampler2D generalTexture;
|
||||
|
|
Loading…
Reference in a new issue