Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:49:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIxed a few shaders varyings, problem identified on MAC to be solved

Browse source
This commit is contained in:
samcake 2015-08-03 11:18:08 -07:00
parent 785fd03085
commit d3fc05e99f
9 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/gpu/src/gpu/DrawColoredTexture.slf
View file

@ -15,9 +15,9 @@
uniform sampler2D colorMap; uniform sampler2D colorMap;
uniform vec4 color; uniform vec4 color;
in vec2 varTexcoord; in vec2 varTexCoord0;
out vec4 outFragColor; out vec4 outFragColor;
void main(void) { void main(void) {
outFragColor = texture(colorMap, varTexcoord) * color; outFragColor = texture(colorMap, varTexCoord0) * color;
} }

4
libraries/gpu/src/gpu/DrawTexcoordRectTransformUnitQuad.slv
View file

@ -19,7 +19,7 @@
uniform vec4 texcoordRect; uniform vec4 texcoordRect;
out vec2 varTexcoord; out vec2 varTexCoord0;
void main(void) { void main(void) {
const vec4 UNIT_QUAD[4] = vec4[4]( const vec4 UNIT_QUAD[4] = vec4[4](
@ -35,5 +35,5 @@ void main(void) {
TransformObject obj = getTransformObject(); TransformObject obj = getTransformObject();
<$transformModelToClipPos(cam, obj, pos, gl_Position)$> <$transformModelToClipPos(cam, obj, pos, gl_Position)$>
varTexcoord = ((pos.xy + 1) * 0.5) * texcoordRect.zw + texcoordRect.xy; varTexCoord0 = ((pos.xy + 1) * 0.5) * texcoordRect.zw + texcoordRect.xy;
} }

4
libraries/gpu/src/gpu/DrawTexture.slf
View file

@ -14,9 +14,9 @@
uniform sampler2D colorMap; uniform sampler2D colorMap;
in vec2 varTexcoord; in vec2 varTexCoord0;
out vec4 outFragColor; out vec4 outFragColor;
void main(void) { void main(void) {
outFragColor = texture(colorMap, varTexcoord); outFragColor = texture(colorMap, varTexCoord0);
} }

4
libraries/gpu/src/gpu/DrawTextureOpaque.slf
View file

@ -15,9 +15,9 @@
uniform sampler2D colorMap; uniform sampler2D colorMap;
in vec2 varTexcoord; in vec2 varTexCoord0;
out vec4 outFragColor; out vec4 outFragColor;
void main(void) { void main(void) {
outFragColor = vec4(texture(colorMap, varTexcoord).xyz, 1.0); outFragColor = vec4(texture(colorMap, varTexCoord0).xyz, 1.0);
} }

4
libraries/gpu/src/gpu/DrawTransformUnitQuad.slv
View file

@ -16,7 +16,7 @@
<$declareStandardTransform()$> <$declareStandardTransform()$>
out vec2 varTexcoord; out vec2 varTexCoord0;
void main(void) { void main(void) {
const vec4 UNIT_QUAD[4] = vec4[4]( const vec4 UNIT_QUAD[4] = vec4[4](
@ -32,5 +32,5 @@ void main(void) {
TransformObject obj = getTransformObject(); TransformObject obj = getTransformObject();
<$transformModelToClipPos(cam, obj, pos, gl_Position)$> <$transformModelToClipPos(cam, obj, pos, gl_Position)$>
varTexcoord = (pos.xy + 1) * 0.5; varTexCoord0 = (pos.xy + 1) * 0.5;
} }

4
libraries/gpu/src/gpu/DrawViewportQuadTransformTexcoord.slv
View file

@ -16,7 +16,7 @@
<$declareStandardTransform()$> <$declareStandardTransform()$>
out vec2 varTexcoord; out vec2 varTexCoord0;
void main(void) { void main(void) {
const vec4 UNIT_QUAD[4] = vec4[4]( const vec4 UNIT_QUAD[4] = vec4[4](
@ -34,5 +34,5 @@ void main(void) {
<$transformModelToWorldPos(obj, tc, tc)$> <$transformModelToWorldPos(obj, tc, tc)$>
gl_Position = pos; gl_Position = pos;
varTexcoord = tc.xy; varTexCoord0 = tc.xy;
} }

4
libraries/render-utils/src/simple_textured_emisive.slf
View file

@ -19,8 +19,8 @@ uniform sampler2D originalTexture;
// the interpolated normal // the interpolated normal
in vec3 _normal; in vec3 _normal;
in vec4 _texCoord0; in vec3 _color;
in vec4 _color; in vec2 _texCoord0;
void main(void) { void main(void) {
vec4 texel = texture(originalTexture, _texCoord0.st); vec4 texel = texture(originalTexture, _texCoord0.st);

14
libraries/render-utils/src/standardDrawTexture.slf
View file

@ -14,18 +14,18 @@
// the texture // the texture
uniform sampler2D colorMap; uniform sampler2D colorMap;
in vec3 _position; in vec3 varPosition;
in vec3 _normal; in vec3 varNormal;
in vec2 _texCoord0; in vec2 varTexCoord0;
in vec4 _color; in vec4 varColor;
out vec4 _fragColor; out vec4 outFragColor;
void main(void) { void main(void) {
vec4 color = texture(colorMap, _texCoord0); vec4 color = texture(colorMap, varTexCoord0);
// FIXME CORE this isn't working // FIXME CORE this isn't working
//_fragColor = color * _color; //_fragColor = color * _color;
//_fragColor = vec4(color.rgb, color.a * _color.a); //_fragColor = vec4(color.rgb, color.a * _color.a);
//_fragColor = vec4(color.rgb * _color.rgb, color.a); //_fragColor = vec4(color.rgb * _color.rgb, color.a);
_fragColor = color; outFragColor = color;
} }

16
libraries/render-utils/src/standardTransformPNTC.slv
View file

@ -18,19 +18,19 @@
<$declareStandardTransform()$> <$declareStandardTransform()$>
out vec3 _position; out vec3 varPosition;
out vec3 _normal; out vec3 varNormal;
out vec2 _texCoord0; out vec2 varTexCoord0;
out vec4 _color; out vec4 varColor;
void main(void) { void main(void) {
_texCoord0 = inTexCoord0.st; varTexCoord0 = inTexCoord0.st;
_color = inColor; varColor = inColor;
// standard transform // standard transform
TransformCamera cam = getTransformCamera(); TransformCamera cam = getTransformCamera();
TransformObject obj = getTransformObject(); TransformObject obj = getTransformObject();
<$transformModelToClipPos(cam, obj, inPosition, gl_Position)$> <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
<$transformModelToEyeDir(cam, obj, inNormal.xyz, _normal)$> <$transformModelToEyeDir(cam, obj, inNormal.xyz, varNormal)$>
_position = inPosition.xyz; varPosition = inPosition.xyz;
} }