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

fixes for glsl mac

Browse source
This commit is contained in:
dev 2015-01-13 16:53:22 -08:00
parent 9c083ce86e
commit d3edd14638
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/render-utils/src/Material.slh
View file

@ -15,12 +15,14 @@ struct Material {
vec4 _diffuse; vec4 _diffuse;
vec4 _specular; vec4 _specular;
float getOpacity() { return _diffuse.a; }
vec3 getDiffuse() { return _diffuse.rgb; }
vec3 getSpecular() { return _specular.rgb; }
float getShininess() { return _specular.a; }
}; };
float getMaterialOpacity(Material m) { return m._diffuse.a; }
vec3 getMaterialDiffuse(Material m) { return m._diffuse.rgb; }
vec3 getMaterialSpecular(Material m) { return m._specular.rgb; }
float getMaterialShininess(Material m) { return m._specular.a; }
<@if GLPROFILE == PC_GL@> <@if GLPROFILE == PC_GL@>
uniform materialBuffer { uniform materialBuffer {
Material mat; Material mat;

8
libraries/render-utils/src/model.slf
View file

@ -29,8 +29,8 @@ void main(void) {
packDeferredFragment( packDeferredFragment(
normalize(normal.xyz), normalize(normal.xyz),
evalOpaqueFinalAlpha(mat.getOpacity(), diffuse.a), evalOpaqueFinalAlpha(getMaterialOpacity(mat), diffuse.a),
mat.getDiffuse()/* * diffuse.rgb*/, getMaterialDiffuse(mat) * diffuse.rgb,
mat.getSpecular(), getMaterialSpecular(mat),
mat.getShininess()); getMaterialShininess(mat));
} }