AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rain speed / Snow speed / Weather falloff are not hardcoded.

Browse Source
This commit is contained in:
UnknownShadow200 2016-05-12 09:34:00 +10:00
parent febad36b60
commit 4401823fab
3 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ClassicalSharp/Events/WorldEvents.cs
View File

@ -49,6 +49,9 @@ namespace ClassicalSharp.Events {
CloudsColour,
FogColour,
SunlightColour,
ShadowlightColour,
ShadowlightColour,
RainSpeed,
SnowSpeed,
}
}

68
ClassicalSharp/Map/WorldEnv.cs
View File

@ -25,9 +25,18 @@ namespace ClassicalSharp.Map {
/// <summary> Height of the clouds in world space. </summary>
public int CloudHeight;
/// <summary> How fast clouds should travel across the map, defaults to 1. </summary>
/// <summary> Modifier of how fast clouds travel across the world, defaults to 1. </summary>
public float CloudsSpeed = 1;
/// <summary> Modifier of how fast rain falls, defaults to 1. </summary>
public float RainSpeed = 1;
/// <summary> Modifier of how fast snow falls, defaults to 1. </summary>
public float SnowSpeed = 1;
/// <summary> Modifier of how fast rain/snow fades, defaults to 1. </summary>
public float WeatherFade = 1;
/// <summary> Colour applied to blocks located in direct sunlight. </summary>
public FastColour Sunlight;
public FastColour SunlightXSide, SunlightZSide, SunlightYBottom;
@ -47,7 +56,7 @@ namespace ClassicalSharp.Map {
/// <summary> Height of the map edge in world space. </summary>
public int EdgeHeight;
/// <summary> Block that surrounds the map that fills the bottom of the map horizontally,
/// <summary> Block that surrounds the map that fills the bottom of the map horizontally,
/// fills part of the vertical sides of the map, and also surrounds map the map horizontally. (default bedrock) </summary>
public Block SidesBlock = Block.Bedrock;
@ -67,6 +76,9 @@ namespace ClassicalSharp.Map {
EdgeBlock = Block.StillWater;
SidesBlock = Block.Bedrock;
CloudsSpeed = 1;
RainSpeed = 1;
SnowSpeed = 1;
WeatherFade = 1;
ResetLight();
SkyCol = DefaultSkyColour;
@ -84,8 +96,8 @@ namespace ClassicalSharp.Map {
ref SunlightZSide, ref SunlightYBottom );
}
/// <summary> Sets the sides block to the given block, and raises the
/// EnvVariableChanged event with the variable 'SidesBlock'. </summary>
/// <summary> Sets sides block to the given block, and raises
/// EnvVariableChanged event with variable 'SidesBlock'. </summary>
public void SetSidesBlock( Block block ) {
if( block == SidesBlock ) return;
if( block == (Block)BlockInfo.MaxDefinedBlock ) {
@ -96,8 +108,8 @@ namespace ClassicalSharp.Map {
game.WorldEvents.RaiseEnvVariableChanged( EnvVar.SidesBlock );
}
/// <summary> Sets the edge block to the given block, and raises the
/// EnvVariableChanged event with the variable 'EdgeBlock'. </summary>
/// <summary> Sets edge block to the given block, and raises
/// EnvVariableChanged event with variable 'EdgeBlock'. </summary>
public void SetEdgeBlock( Block block ) {
if( block == EdgeBlock ) return;
if( block == (Block)BlockInfo.MaxDefinedBlock ) {
@ -108,32 +120,40 @@ namespace ClassicalSharp.Map {
game.WorldEvents.RaiseEnvVariableChanged( EnvVar.EdgeBlock );
}
/// <summary> Sets the height of the clouds in world space, and raises the
/// EnvVariableChanged event with the variable 'CloudsLevel'. </summary>
/// <summary> Sets clouds height in world space, and raises
/// EnvVariableChanged event with variable 'CloudsLevel'. </summary>
public void SetCloudsLevel( int level ) { Set( level, ref CloudHeight, EnvVar.CloudsLevel ); }
/// <summary> Sets the current clouds speed, and raises the
/// EnvVariableChanged event with the variable 'CloudsSpeed'. </summary>
/// <summary> Sets clouds speed, and raises EnvVariableChanged
/// event with variable 'CloudsSpeed'. </summary>
public void SetCloudsSpeed( float speed ) { Set( speed, ref CloudsSpeed, EnvVar.CloudsSpeed ); }
/// <summary> Sets the height of the map edges in world space, and raises the
/// EnvVariableChanged event with the variable 'EdgeLevel'. </summary>
/// <summary> Sets rain speed and raises EnvVariableChanged
/// event with variable 'RainSpeed'. </summary>
public void SetRainSpeed( float speed ) { Set( speed, ref RainSpeed, EnvVar.RainSpeed ); }
/// <summary> Sets snow speed, and raises EnvVariableChanged
/// event with variable 'SnowSpeed'. </summary>
public void SetSnowSpeed( float speed ) { Set( speed, ref SnowSpeed, EnvVar.SnowSpeed ); }
/// <summary> Sets height of the map edges in world space, and raises
/// EnvVariableChanged event with variable 'EdgeLevel'. </summary>
public void SetEdgeLevel( int level ) { Set( level, ref EdgeHeight, EnvVar.EdgeLevel ); }
/// <summary> Sets the current sky colour, and raises the
/// EnvVariableChanged event with the variable 'SkyColour'. </summary>
/// <summary> Sets tsky colour, and raises
/// EnvVariableChanged event with variable 'SkyColour'. </summary>
public void SetSkyColour( FastColour col ) { Set( col, ref SkyCol, EnvVar.SkyColour ); }
/// <summary> Sets the current fog colour, and raises the
/// EnvVariableChanged event with the variable 'FogColour'. </summary>
/// <summary> Sets fog colour, and raises
/// EnvVariableChanged event with variable 'FogColour'. </summary>
public void SetFogColour( FastColour col ) { Set( col, ref FogCol, EnvVar.FogColour ); }
/// <summary> Sets the current clouds colour, and raises the
/// EnvVariableChanged event with the variable 'CloudsColour'. </summary>
/// <summary> Sets clouds colour, and raises
/// EnvVariableChanged event with variable 'CloudsColour'. </summary>
public void SetCloudsColour( FastColour col ) { Set( col, ref CloudsCol, EnvVar.CloudsColour ); }
/// <summary> Sets the current sunlight colour, and raises the
/// EnvVariableChanged event with the variable 'SunlightColour'. </summary>
/// <summary> Sets sunlight colour, and raises
/// EnvVariableChanged event with variable 'SunlightColour'. </summary>
public void SetSunlight( FastColour col ) {
if( col == Sunlight ) return;
Sunlight = col;
@ -143,8 +163,8 @@ namespace ClassicalSharp.Map {
game.WorldEvents.RaiseEnvVariableChanged( EnvVar.SunlightColour );
}
/// <summary> Sets the current shadowlight colour, and raises the
/// EnvVariableChanged event with the variable 'ShadowlightColour'. </summary>
/// <summary> Sets current shadowlight colour, and raises
/// EnvVariableChanged event with variable 'ShadowlightColour'. </summary>
public void SetShadowlight( FastColour col ) {
if( col == Shadowlight ) return;
Shadowlight = col;
@ -154,8 +174,8 @@ namespace ClassicalSharp.Map {
game.WorldEvents.RaiseEnvVariableChanged( EnvVar.ShadowlightColour );
}
/// <summary> Sets the current weather, and raises the
/// EnvVariableChanged event with the variable 'Weather'. </summary>
/// <summary> Sets weather, and raises
/// EnvVariableChanged event with variable 'Weather'. </summary>
public void SetWeather( Weather weather ) {
if( weather == Weather ) return;
Weather = weather;

12
ClassicalSharp/Rendering/WeatherRenderer.cs
View File

@ -43,8 +43,10 @@ namespace ClassicalSharp.Renderers {
Vector3I pos = Vector3I.Floor( camPos );
bool moved = pos != lastPos;
lastPos = pos;
WorldEnv env = game.World.Env;
float speed = weather == Weather.Rainy ? 1f : 0.20f;
float speed = weather == Weather.Rainy ?
1.0f * env.RainSpeed : 0.2f * env.SnowSpeed;
vOffset = -(float)game.accumulator * speed;
rainAcc += deltaTime;
bool particles = weather == Weather.Rainy;
@ -61,7 +63,10 @@ namespace ClassicalSharp.Renderers {
if( particles && (rainAcc >= 0.25 || moved) )
game.ParticleManager.AddRainParticle( new Vector3( pos.X + dx, rainY, pos.Z + dz ) );
col.A = (byte)Math.Max( 0, AlphaAt( dx * dx + dz * dz ) );
float alpha = AlphaAt( dx * dx + dz * dz );
Utils.Clamp( ref alpha, 0, 0xFF );
col.A = (byte)alpha;
MakeRainForSquare( pos.X + dx, rainY, height, pos.Z + dz, col, ref index );
}
}
@ -78,7 +83,8 @@ namespace ClassicalSharp.Renderers {
float AlphaAt( float x ) {
// Wolfram Alpha: fit {0,178},{1,169},{4,147},{9,114},{16,59},{25,9}
return 0.05f * x * x - 7 * x + 178;
float falloff = 0.05f * x * x - 7 * x;
return 178 + falloff * game.World.Env.WeatherFade;
}
void MakeRainForSquare( int x, float y, float height, int z, FastColour col, ref int index ) {