Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'core' of https://github.com/highfidelity/hifi into punk

Browse source
This commit is contained in:
Sam Gateau 2015-08-04 14:55:00 -07:00
commit 79e4cdd514
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/render-utils/src/model_lightmap.slf
View file

@ -23,11 +23,11 @@ uniform sampler2D diffuseMap;
uniform sampler2D emissiveMap;
uniform vec2 emissiveParams;
out vec4 _position;
out vec2 _texCoord0;
out vec2 _texCoord1;
out vec3 _normal;
out vec3 _color;
in vec4 _position;
in vec2 _texCoord0;
in vec2 _texCoord1;
in vec3 _normal;
in vec3 _color;
void main(void) {
vec4 diffuse = texture(diffuseMap, _texCoord0);

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

@ -22,10 +22,10 @@ uniform sampler2D diffuseMap;
// the specular texture
uniform sampler2D specularMap;
out vec4 _position;
out vec2 _texCoord0;
out vec3 _normal;
out vec3 _color;
in vec4 _position;
in vec2 _texCoord0;
in vec3 _normal;
in vec3 _color;
void main(void) {