Remove the vertical fog

Improves the AoS 0.75 compatibility.

Resources/Shaders/BasicBlock.vs

@@ -1,21 +1,21 @@
 /*
  Copyright (c) 2013 yvt
- 
+
  This file is part of OpenSpades.
- 
+
  OpenSpades is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenSpades 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 General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenSpades.  If not, see <http://www.gnu.org/licenses/>.
- 
+
  */
 
 
@@ -24,6 +24,7 @@ uniform mat4 projectionViewMatrix;
 uniform mat4 viewMatrix;
 uniform vec3 chunkPosition;
 uniform float fogDistance;
+uniform vec3 viewOriginVector;
 
 // --- Vertex attribute ---
 // [x, y, z]
@@ -50,23 +51,24 @@ void PrepareForShadowForMap(vec3 vertexCoord, vec3 fixedVertexCoord, vec3 normal
 vec4 FogDensity(float poweredLength);
 
 void main() {
-	
+
 	vec4 vertexPos = vec4(chunkPosition, 1.);
-	
+
 	vertexPos.xyz += positionAttribute.xyz;
-	
+
 	gl_Position = projectionViewMatrix * vertexPos;
-	
+
 	color = colorAttribute;
 	color.xyz *= color.xyz; // linearize
-	
+
 	// ambient occlusion
 	ambientOcclusionCoord = (ambientOcclusionCoordAttribute + .5) * (1. / 256.);
 
 	vec4 viewPos = viewMatrix * vertexPos;
-	float distance = dot(viewPos.xyz, viewPos.xyz);
-	fogDensity = FogDensity(distance).xyz;
-
+	vec2 horzRelativePos = vertexPos.xy - viewOriginVector.xy;
+	float horzDistance = dot(horzRelativePos, horzRelativePos);
+	fogDensity = FogDensity(horzDistance).xyz;
+
 	vec3 fixedPosition = chunkPosition;
 	fixedPosition += fixedPositionAttribute * 0.5;
 	fixedPosition += normalAttribute * 0.1;

Resources/Shaders/BasicBlockDynamicLit.vs

@@ -1,21 +1,21 @@
 /*
  Copyright (c) 2013 yvt
- 
+
  This file is part of OpenSpades.
- 
+
  OpenSpades is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenSpades 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 General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenSpades.  If not, see <http://www.gnu.org/licenses/>.
- 
+
  */
 
 
@@ -24,6 +24,7 @@ uniform mat4 projectionViewMatrix;
 uniform mat4 viewMatrix;
 uniform vec3 chunkPosition;
 uniform float fogDistance;
+uniform vec3 viewOriginVector;
 
 // --- Vertex attribute ---
 // [x, y, z]
@@ -43,23 +44,24 @@ void PrepareForDynamicLightNoBump(vec3 vertexCoord, vec3 normal);
 vec4 FogDensity(float poweredLength);
 
 void main() {
-	
+
 	vec4 vertexPos = vec4(chunkPosition, 1.);
-	
+
 	vertexPos.xyz += positionAttribute.xyz;
-	
+
 	gl_Position = projectionViewMatrix * vertexPos;
-	
+
 	color = colorAttribute;
 	color.xyz *= color.xyz; // linearize
-	
+
 	vec4 viewPos = viewMatrix * vertexPos;
-	float distance = dot(viewPos.xyz, viewPos.xyz);
-	fogDensity = FogDensity(distance).xyz;
-
+	vec2 horzRelativePos = vertexPos.xy - viewOriginVector.xy;
+	float horzDistance = dot(horzRelativePos, horzRelativePos);
+	fogDensity = FogDensity(horzDistance).xyz;
+
 	vec3 normal = normalAttribute;
 	vec3 shadowVertexPos = vertexPos.xyz;
-	
+
 	PrepareForDynamicLightNoBump(shadowVertexPos, normal);
 }
 

Resources/Shaders/BasicBlockPhys.vs

@@ -1,21 +1,21 @@
 /*
  Copyright (c) 2013 yvt
- 
+
  This file is part of OpenSpades.
- 
+
  OpenSpades is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenSpades 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 General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenSpades.  If not, see <http://www.gnu.org/licenses/>.
- 
+
  */
 
 
@@ -24,6 +24,7 @@ uniform mat4 projectionViewMatrix;
 uniform mat4 viewMatrix;
 uniform vec3 chunkPosition;
 uniform float fogDistance;
+uniform vec3 viewOriginVector;
 
 // --- Vertex attribute ---
 // [x, y, z]
@@ -52,36 +53,37 @@ void PrepareForShadowForMap(vec3 vertexCoord, vec3 fixedVertexCoord, vec3 normal
 vec4 FogDensity(float poweredLength);
 
 void main() {
-	
+
 	vec4 vertexPos = vec4(chunkPosition, 1.);
-	
+
 	vertexPos.xyz += positionAttribute.xyz;
-	
+
 	gl_Position = projectionViewMatrix * vertexPos;
-	
+
 	color = colorAttribute;
 	color.xyz *= color.xyz; // linearize
-	
+
 	// lambert reflection
 	vec3 sunDir = normalize(vec3(0, -1., -1.));
 	color.w = dot(sunDir, normalAttribute);
-	
-	
+
+
 	// ambient occlusion
 	ambientOcclusionCoord = (ambientOcclusionCoordAttribute + .5) * (1. / 256.);
 
 	vec4 viewPos = viewMatrix * vertexPos;
-	float distance = dot(viewPos.xyz, viewPos.xyz);
-	fogDensity = FogDensity(distance).xyz;
-
+	vec2 horzRelativePos = vertexPos.xy - viewOriginVector.xy;
+	float horzDistance = dot(horzRelativePos, horzRelativePos);
+	fogDensity = FogDensity(horzDistance).xyz;
+
 	vec3 fixedPosition = chunkPosition;
 	fixedPosition += fixedPositionAttribute * 0.5;
 	fixedPosition += normalAttribute * 0.1;
 
 	vec3 normal = normalAttribute;
 	vec3 shadowVertexPos = vertexPos.xyz;
 	PrepareForShadowForMap(shadowVertexPos, fixedPosition, normal);
-	
+
 	// used for diffuse lighting
 	viewSpaceCoord = viewPos.xyz;
 	viewSpaceNormal = (viewMatrix * vec4(normal, 0.)).xyz;

Resources/Shaders/LongSprite.vs

@@ -1,28 +1,29 @@
 /*
  Copyright (c) 2013 yvt
- 
+
  This file is part of OpenSpades.
- 
+
  OpenSpades is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenSpades 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 General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenSpades.  If not, see <http://www.gnu.org/licenses/>.
- 
+
  */
 
 
 uniform mat4 projectionViewMatrix;
 uniform mat4 viewMatrix;
 uniform vec3 rightVector;
 uniform vec3 upVector;
+uniform vec3 viewOriginVector;
 
 uniform float fogDistance;
 
@@ -38,18 +39,19 @@ vec4 FogDensity(float poweredLength);
 
 void main() {
 	vec3 pos = positionAttribute.xyz;
-	
+
 	gl_Position = projectionViewMatrix * vec4(pos,1.);
-	
+
 	color = colorAttribute;
-	
+
 	texCoord = texCoordAttribute;
-	
+
 	// fog.
 	// FIXME: cannot gamma correct because sprite may be
 	// alpha-blended.
 	vec4 viewPos = viewMatrix * vec4(pos,1.);
-	float distance = dot(viewPos.xyz, viewPos.xyz);
-	fogDensity = FogDensity(distance);
+	vec2 horzRelativePos = pos.xy - viewOriginVector.xy;
+	float horzDistance = dot(horzRelativePos, horzRelativePos);
+	fogDensity = FogDensity(horzDistance);
 }
 

Resources/Shaders/OptimizedVoxelModel.vs

@@ -1,21 +1,21 @@
 /*
  Copyright (c) 2013 yvt
- 
+
  This file is part of OpenSpades.
- 
+
  OpenSpades is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  OpenSpades 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 General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with OpenSpades.  If not, see <http://www.gnu.org/licenses/>.
- 
+
  */
 
 
@@ -28,6 +28,7 @@ uniform vec3 modelOrigin;
 uniform float fogDistance;
 uniform vec3 sunLightDirection;
 uniform vec2 texScale;
+uniform vec3 viewOriginVector;
 
 // [x, y, z]
 attribute vec3 positionAttribute;
@@ -48,27 +49,28 @@ void PrepareForShadow(vec3 worldOrigin, vec3 normal);
 vec4 FogDensity(float poweredLength);
 
 void main() {
-	
+
 	vec4 vertexPos = vec4(positionAttribute.xyz, 1.);
-	
+
 	vertexPos.xyz += modelOrigin;
-	
+
 	gl_Position = projectionViewModelMatrix * vertexPos;
-	
+
 	textureCoord = textureCoordAttribute.xyxy * vec4(texScale.xy, vec2(1.));
-	
+
 	// direct sunlight
 	vec3 normal = normalAttribute;
 	normal = (modelNormalMatrix * vec4(normal, 1.)).xyz;
 	normal = normalize(normal);
 	float sunlight = dot(normal, sunLightDirection);
 	sunlight = max(sunlight, 0.);
 	flatShading = sunlight;
-	
+
 	vec4 viewPos = viewModelMatrix * vertexPos;
-	float distance = dot(viewPos.xyz, viewPos.xyz);
-	fogDensity = FogDensity(distance).xyz;
-
+	vec2 horzRelativePos = (modelMatrix * vertexPos).xy - viewOriginVector.xy;
+	float horzDistance = dot(horzRelativePos, horzRelativePos);
+	fogDensity = FogDensity(horzDistance).xyz;
+
 	PrepareForShadow((modelMatrix * vertexPos).xyz, normal);
 }