diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:43:28 +0300 | 
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:56:09 +0300 | 
| commit | 1b68f71348ecf3983b76b40d7940da8377f049b7 (patch) | |
| tree | 2974eddaef130a067c26033d60a59fc790365b3d /indra/newview/app_settings/shaders/class1/avatar | |
| parent | af4ea94efc1999f3b19fd8d643d0331f0b77e265 (diff) | |
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/avatar')
6 files changed, 114 insertions, 114 deletions
| diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl index b631ecb7d2..ad9240a6af 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarF.glsl @@ -1,34 +1,34 @@ -/**  +/**   * @file avatarF.glsl   *   * $LicenseInfo:firstyear=2007&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2007, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ -  +  void default_lighting(); -void main()  +void main()  { -	default_lighting(); +    default_lighting();  } -	 + diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl index 374469ce2f..cdf661893c 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarSkinV.glsl @@ -1,28 +1,28 @@ -/**  +/**   * @file avatarSkinV.glsl   *   * $LicenseInfo:firstyear=2007&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2007, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ -  +  in vec4 weight; @@ -30,20 +30,20 @@ uniform vec4 matrixPalette[45];  mat4 getSkinnedTransform()  { -	mat4 ret; -	int i = int(floor(weight.x)); -	float x = fract(weight.x); -		 -	ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], x); -	ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x); -	ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x); -	ret[3] = vec4(0,0,0,1); +    mat4 ret; +    int i = int(floor(weight.x)); +    float x = fract(weight.x); + +    ret[0] = mix(matrixPalette[i+0], matrixPalette[i+1], x); +    ret[1] = mix(matrixPalette[i+15],matrixPalette[i+16], x); +    ret[2] = mix(matrixPalette[i+30],matrixPalette[i+31], x); +    ret[3] = vec4(0,0,0,1); -	return ret; +    return ret;  #ifdef IS_AMD_CARD -	// If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts. -	vec4 dummy1 = matrixPalette[0]; -	vec4 dummy2 = matrixPalette[44]; +    // If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts. +    vec4 dummy1 = matrixPalette[0]; +    vec4 dummy2 = matrixPalette[44];  #endif  } diff --git a/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl b/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl index 9adc68e62b..1c3fdfe2a2 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/avatarV.glsl @@ -1,24 +1,24 @@ -/**  +/**   * @file avatarV.glsl   *   * $LicenseInfo:firstyear=2007&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2007, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ @@ -40,30 +40,30 @@ void calcAtmospherics(vec3 inPositionEye);  void main()  { -	vary_texcoord0 = texcoord0; -				 -	vec4 pos; -	vec3 norm; -	 -	vec4 pos_in = vec4(position.xyz, 1.0); - -	mat4 trans = getSkinnedTransform(); -	pos.x = dot(trans[0], pos_in); -	pos.y = dot(trans[1], pos_in); -	pos.z = dot(trans[2], pos_in); -	pos.w = 1.0; -	 -	norm.x = dot(trans[0].xyz, normal); -	norm.y = dot(trans[1].xyz, normal); -	norm.z = dot(trans[2].xyz, normal); -	norm = normalize(norm); -		 -	gl_Position = projection_matrix * pos; -	 -	calcAtmospherics(pos.xyz); - -	vec4 col = calcLighting(pos.xyz, norm, color); -	vertex_color = col;  +    vary_texcoord0 = texcoord0; + +    vec4 pos; +    vec3 norm; + +    vec4 pos_in = vec4(position.xyz, 1.0); + +    mat4 trans = getSkinnedTransform(); +    pos.x = dot(trans[0], pos_in); +    pos.y = dot(trans[1], pos_in); +    pos.z = dot(trans[2], pos_in); +    pos.w = 1.0; + +    norm.x = dot(trans[0].xyz, normal); +    norm.y = dot(trans[1].xyz, normal); +    norm.z = dot(trans[2].xyz, normal); +    norm = normalize(norm); + +    gl_Position = projection_matrix * pos; + +    calcAtmospherics(pos.xyz); + +    vec4 col = calcLighting(pos.xyz, norm, color); +    vertex_color = col;  } diff --git a/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl b/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl index 4296e551db..57d3695dcd 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/eyeballF.glsl @@ -1,34 +1,34 @@ -/**  +/**   * @file eyeballF.glsl   *   * $LicenseInfo:firstyear=2007&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2007, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ -  +  void default_lighting(); -void main()  +void main()  { -	default_lighting(); +    default_lighting();  } -	 + diff --git a/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl b/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl index 837074f08c..df05473b04 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/eyeballV.glsl @@ -1,24 +1,24 @@ -/**  +/**   * @file eyeballV.glsl   *   * $LicenseInfo:firstyear=2007&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2007, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ @@ -41,19 +41,19 @@ void calcAtmospherics(vec3 inPositionEye);  void main()  { -	//transform vertex -	vec3 pos = (modelview_matrix * vec4(position.xyz, 1.0)).xyz; -	gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); -	vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; -	 -	 -	vec3 norm = normalize(normal_matrix * normal); -		 -	calcAtmospherics(pos.xyz); - -	vec4 specular = vec4(1.0); -	vec4 color = calcLightingSpecular(pos, norm, diffuse_color, specular);	 -	vertex_color = color; +    //transform vertex +    vec3 pos = (modelview_matrix * vec4(position.xyz, 1.0)).xyz; +    gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); +    vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; + + +    vec3 norm = normalize(normal_matrix * normal); + +    calcAtmospherics(pos.xyz); + +    vec4 specular = vec4(1.0); +    vec4 color = calcLightingSpecular(pos, norm, diffuse_color, specular); +    vertex_color = color;  } diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl index 0817076dd5..67f84ecaec 100644 --- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl +++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl @@ -1,66 +1,66 @@ -/**  +/**   * @file objectSkinV.glsl   * $LicenseInfo:firstyear=2007&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2007, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ -in vec4 weight4;   +in vec4 weight4;  uniform mat3x4 matrixPalette[MAX_JOINTS_PER_MESH_OBJECT];  mat4 getObjectSkinnedTransform()  { -	int i; -	 -	vec4 w = fract(weight4); -	vec4 index = floor(weight4); -	 +    int i; + +    vec4 w = fract(weight4); +    vec4 index = floor(weight4); +      index = min(index, vec4(MAX_JOINTS_PER_MESH_OBJECT-1));      index = max(index, vec4( 0.0));      w *= 1.0/(w.x+w.y+w.z+w.w); -	 -	int i1 = int(index.x); -	int i2 = int(index.y); -	int i3 = int(index.z); -	int i4 = int(index.w); -	mat3 mat = mat3(matrixPalette[i1])*w.x; -		 mat += mat3(matrixPalette[i2])*w.y; -		 mat += mat3(matrixPalette[i3])*w.z; -		 mat += mat3(matrixPalette[i4])*w.w; +    int i1 = int(index.x); +    int i2 = int(index.y); +    int i3 = int(index.z); +    int i4 = int(index.w); + +    mat3 mat = mat3(matrixPalette[i1])*w.x; +         mat += mat3(matrixPalette[i2])*w.y; +         mat += mat3(matrixPalette[i3])*w.z; +         mat += mat3(matrixPalette[i4])*w.w; + +    vec3 trans = vec3(matrixPalette[i1][0].w,matrixPalette[i1][1].w,matrixPalette[i1][2].w)*w.x; +         trans += vec3(matrixPalette[i2][0].w,matrixPalette[i2][1].w,matrixPalette[i2][2].w)*w.y; +         trans += vec3(matrixPalette[i3][0].w,matrixPalette[i3][1].w,matrixPalette[i3][2].w)*w.z; +         trans += vec3(matrixPalette[i4][0].w,matrixPalette[i4][1].w,matrixPalette[i4][2].w)*w.w; -	vec3 trans = vec3(matrixPalette[i1][0].w,matrixPalette[i1][1].w,matrixPalette[i1][2].w)*w.x; -		 trans += vec3(matrixPalette[i2][0].w,matrixPalette[i2][1].w,matrixPalette[i2][2].w)*w.y; -		 trans += vec3(matrixPalette[i3][0].w,matrixPalette[i3][1].w,matrixPalette[i3][2].w)*w.z; -		 trans += vec3(matrixPalette[i4][0].w,matrixPalette[i4][1].w,matrixPalette[i4][2].w)*w.w; +    mat4 ret; -	mat4 ret; +    ret[0] = vec4(mat[0], 0); +    ret[1] = vec4(mat[1], 0); +    ret[2] = vec4(mat[2], 0); +    ret[3] = vec4(trans, 1.0); -	ret[0] = vec4(mat[0], 0); -	ret[1] = vec4(mat[1], 0); -	ret[2] = vec4(mat[2], 0); -	ret[3] = vec4(trans, 1.0); -				 -	return ret; +    return ret;  #ifdef IS_AMD_CARD     // If it's AMD make sure the GLSL compiler sees the arrays referenced once by static index. Otherwise it seems to optimise the storage awawy which leads to unfun crashes and artifacts. | 
