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

Removed unused variable, fixed shader comments.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-07-18 18:16:45 -07:00
parent b5a8c2710c
commit b15724665b
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/shaders/face.frag
View file

@ -1,10 +1,10 @@
#version 120 #version 120
// //
// iris.frag // face.frag
// fragment shader // fragment shader
// //
// Created by Andrzej Kapolka on 6/13/13. // Created by Andrzej Kapolka on 7/12/13.
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
// //
@ -12,6 +12,6 @@
uniform sampler2D colorTexture; uniform sampler2D colorTexture;
void main(void) { void main(void) {
// modulate texture by diffuse color and add specular contribution // for now, just modulate color
gl_FragColor = gl_Color * texture2D(colorTexture, gl_TexCoord[0].st); gl_FragColor = gl_Color * texture2D(colorTexture, gl_TexCoord[0].st);
} }

1
interface/resources/shaders/face.vert
View file

@ -24,6 +24,7 @@ void main(void) {
gl_TexCoord[0] = vec4(texCoordCorner + gl_Vertex.x * texCoordRight + gl_Vertex.y * texCoordUp, 0.0, 1.0); gl_TexCoord[0] = vec4(texCoordCorner + gl_Vertex.x * texCoordRight + gl_Vertex.y * texCoordUp, 0.0, 1.0);
float depth = texture2D(depthTexture, gl_TexCoord[0].st).r; float depth = texture2D(depthTexture, gl_TexCoord[0].st).r;
// set alpha to zero for invalid depth values
const float MIN_VISIBLE_DEPTH = 1.0 / 255.0; const float MIN_VISIBLE_DEPTH = 1.0 / 255.0;
const float MAX_VISIBLE_DEPTH = 254.0 / 255.0; const float MAX_VISIBLE_DEPTH = 254.0 / 255.0;
gl_FrontColor = vec4(1.0, 1.0, 1.0, step(MIN_VISIBLE_DEPTH, depth) * (1.0 - step(MAX_VISIBLE_DEPTH, depth))); gl_FrontColor = vec4(1.0, 1.0, 1.0, step(MIN_VISIBLE_DEPTH, depth) * (1.0 - step(MAX_VISIBLE_DEPTH, depth)));

2
interface/src/avatar/Face.cpp
View file

@ -84,7 +84,7 @@ int Face::processVideoMessage(unsigned char* packetData, size_t dataBytes) {
if ((_frameBytesRemaining -= payloadSize) <= 0) { if ((_frameBytesRemaining -= payloadSize) <= 0) {
float aspectRatio = *(const float*)_arrivingFrame.constData(); float aspectRatio = *(const float*)_arrivingFrame.constData();
int result = vpx_codec_decode(&_codec, (const uint8_t*)_arrivingFrame.constData() + sizeof(float), vpx_codec_decode(&_codec, (const uint8_t*)_arrivingFrame.constData() + sizeof(float),
_arrivingFrame.size() - sizeof(float), 0, 0); _arrivingFrame.size() - sizeof(float), 0, 0);
vpx_codec_iter_t iterator = 0; vpx_codec_iter_t iterator = 0;
vpx_image_t* image; vpx_image_t* image;