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

Merge branch 'temp1' of https://github.com/samcake/hifi into temp1

Browse source
This commit is contained in:
Sam Gateau 2015-01-30 17:04:27 -08:00
commit 56925cee00
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
libraries/render-utils/src/Light.slh
View file

@ -64,15 +64,13 @@ Light getLight() {
uniform vec4 lightBuffer[9]; uniform vec4 lightBuffer[9];
Light getLight() { Light getLight() {
Light light; Light light;
light._transform[0] = lightBuffer[0]; light._position = lightBuffer[0];
light._transform[1] = lightBuffer[1]; light._direction = lightBuffer[1];
light._transform[2] = lightBuffer[2]; light._color = lightBuffer[2];
light._transform[3] = lightBuffer[3]; light._attenuation = lightBuffer[3];
light._color = lightBuffer[4]; light._spot = lightBuffer[4];
light._range = lightBuffer[5]; light._shadow = lightBuffer[5];
light._spot = lightBuffer[6]; light._control = lightBuffer[6];
light._shadow = lightBuffer[7];
light._control = lightBuffer[8];
return light; return light;
} }
@ -80,15 +78,13 @@ Light getLight() {
uniform vec4 lightBuffer[9]; uniform vec4 lightBuffer[9];
Light getLight() { Light getLight() {
Light light; Light light;
light._transform[0] = lightBuffer[0]; light._position = lightBuffer[0];
light._transform[1] = lightBuffer[1]; light._direction = lightBuffer[1];
light._transform[2] = lightBuffer[2]; light._color = lightBuffer[2];
light._transform[3] = lightBuffer[3]; light._attenuation = lightBuffer[3];
light._color = lightBuffer[4]; light._spot = lightBuffer[4];
light._range = lightBuffer[5]; light._shadow = lightBuffer[5];
light._spot = lightBuffer[6]; light._control = lightBuffer[6];
light._shadow = lightBuffer[7];
light._control = lightBuffer[8];
return light; return light;
} }