From 6f60ae2c0210fc17cdf9feeff72b774c0c594299 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Tue, 3 Nov 2015 08:34:16 +1100 Subject: [PATCH] Make rain/snow fade out properly and make them much higher (looks nicer), fix update checking to the point it can now download to update.zip. --- ClassicalSharp/Rendering/WeatherRenderer.cs | 4 ++-- Launcher2/WebService/UpdateCheckTask.cs | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ClassicalSharp/Rendering/WeatherRenderer.cs b/ClassicalSharp/Rendering/WeatherRenderer.cs index 6bc2972f1..8f2ed2d43 100644 --- a/ClassicalSharp/Rendering/WeatherRenderer.cs +++ b/ClassicalSharp/Rendering/WeatherRenderer.cs @@ -41,7 +41,7 @@ namespace ClassicalSharp { for( int dx = -extent; dx <= extent; dx++ ) { for( int dz = -extent; dz <= extent; dz++ ) { int rainY = Math.Max( pos.Y, GetRainHeight( pos.X + dx, pos.Z + dz ) + 1 ); - int height = Math.Min( 6 - ( rainY - pos.Y ), 6 ); + int height = Math.Min( 20 - (rainY - pos.Y), 20 ); if( height <= 0 ) continue; col.A = (byte)Math.Max( 0, AlphaAt( dx * dx + dz * dz ) ); @@ -61,7 +61,7 @@ namespace ClassicalSharp { float AlphaAt( float x ) { // Wolfram Alpha: fit {0,178},{1,169},{4,147},{9,114},{16,59},{25,9} - return 0.05f * x * x - 8 * x + 178; + return 0.05f * x * x - 7 * x + 178; } void MakeRainForSquare( int x, int y, int height, int z, FastColour col, ref int index ) { diff --git a/Launcher2/WebService/UpdateCheckTask.cs b/Launcher2/WebService/UpdateCheckTask.cs index 8c3014fa8..9e4c8ac5c 100644 --- a/Launcher2/WebService/UpdateCheckTask.cs +++ b/Launcher2/WebService/UpdateCheckTask.cs @@ -35,19 +35,19 @@ namespace Launcher2 { void CheckUpdates() { var response = GetHtml( UpdatesUri, UpdatesUri ); foreach( string line in response ) { - Console.WriteLine( line ); - if( line.StartsWith( "latest.", ordinal ) ) { + if( line.StartsWith( @"