Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal

Browse Source 
Conflicts:
	indra/newview/llnetmap.cpp - Thankies Shyotl~
This commit is contained in:
Inusaito Sayori
2014-07-21 23:31:59 -04:00
parent 8159eff664 cd85afc9a5
commit 5191baa659
111 changed files with 2419 additions and 3960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
View File

@@ -22,6 +22,8 @@
* $/LicenseInfo$
*/
#define FLT_MAX 3.402823466e+38
ATTRIBUTE vec4 weight4;
uniform mat3x4 matrixPalette[52];
@@ -29,6 +31,9 @@ uniform float maxWeight;
mat4 getObjectSkinnedTransform()
{
int i;
vec4 w = fract(weight4);
@@ -38,6 +43,10 @@ mat4 getObjectSkinnedTransform()
index = max(index, vec4( 0.0));
float sum = (w.x+w.y+w.z+w.w);
if(sum > 0.0)
w*=1.0/sum;
else
w=vec4(FLT_MAX);
int i1 = int(index.x);
int i2 = int(index.y);
@@ -59,7 +68,7 @@ mat4 getObjectSkinnedTransform()
ret[0] = vec4(mat[0], 0);
ret[1] = vec4(mat[1], 0);
ret[2] = vec4(mat[2], 0);
ret[3] = vec4(trans, sum);
ret[3] = vec4(trans, 1.0);
return ret;
}

2
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
View File

@@ -198,5 +198,5 @@ void main()
frag_data[0] = vec4(color.rgb, color.a); // diffuse
frag_data[1] = vec4(0); // speccolor, spec
frag_data[2] = vec4(encode_normal(screenspacewavef.xyz*0.5+0.5), 0.05, 0);// normalxy, 0, 0
frag_data[2] = vec4(encode_normal(screenspacewavef.xyz), 0.05, 0);// normalxy, 0, 0
}

18
indra/newview/app_settings/shaders/class1/effects/glowV.glsl
View File

@@ -26,7 +26,7 @@
uniform mat4 modelview_projection_matrix;
ATTRIBUTE vec3 position;
ATTRIBUTE vec2 texcoord0;
ATTRIBUTE vec2 texcoord1;
uniform vec2 glowDelta;
@@ -39,12 +39,12 @@ void main()
{
gl_Position = modelview_projection_matrix * vec4(position, 1.0);
vary_texcoord0.xy = texcoord0 + glowDelta*(-3.5);
vary_texcoord1.xy = texcoord0 + glowDelta*(-2.5);
vary_texcoord2.xy = texcoord0 + glowDelta*(-1.5);
vary_texcoord3.xy = texcoord0 + glowDelta*(-0.5);
vary_texcoord0.zw = texcoord0 + glowDelta*(0.5);
vary_texcoord1.zw = texcoord0 + glowDelta*(1.5);
vary_texcoord2.zw = texcoord0 + glowDelta*(2.5);
vary_texcoord3.zw = texcoord0 + glowDelta*(3.5);
vary_texcoord0.xy = texcoord1 + glowDelta*(-3.5);
vary_texcoord1.xy = texcoord1 + glowDelta*(-2.5);
vary_texcoord2.xy = texcoord1 + glowDelta*(-1.5);
vary_texcoord3.xy = texcoord1 + glowDelta*(-0.5);
vary_texcoord0.zw = texcoord1 + glowDelta*(0.5);
vary_texcoord1.zw = texcoord1 + glowDelta*(1.5);
vary_texcoord2.zw = texcoord1 + glowDelta*(2.5);
vary_texcoord3.zw = texcoord1 + glowDelta*(3.5);
}

4
indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
View File

@@ -39,6 +39,6 @@ VARYING vec2 vary_texcoord1;
void main()
{
frag_color = texture2D(glowMap, vary_texcoord0.xy) +
texture2DRect(screenMap, vary_texcoord1.xy);
frag_color = texture2D(glowMap, vary_texcoord1.xy) +
texture2DRect(screenMap, vary_texcoord0.xy);
}

4
indra/newview/app_settings/shaders/class1/lighting/lightWaterF.glsl
View File

@@ -39,10 +39,10 @@ void default_lighting_water()
{
vec4 color = diffuseLookup(vary_texcoord0.xy) * vertex_color;
if(color.a < .004)
/*if(color.a < .004)
{
discard;
}
}*/
color.rgb = atmosLighting(color.rgb);