From efc260c8cba71502e9acf2c36b16916f7f9b0154 Mon Sep 17 00:00:00 2001
From: nsubiron <nsubiron@cvc.uab.es>
Date: Wed, 17 May 2017 16:53:42 +0100
Subject: [PATCH] #31 Add wind and default values to the weather description

---
 Source/Carla/WeatherDescription.cpp |  8 +++++
 Source/Carla/WeatherDescription.h   | 46 ++++++++++++++++++++---------
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/Source/Carla/WeatherDescription.cpp b/Source/Carla/WeatherDescription.cpp
index ec49cec04..59c906c52 100644
--- a/Source/Carla/WeatherDescription.cpp
+++ b/Source/Carla/WeatherDescription.cpp
@@ -55,6 +55,10 @@ void FWeatherDescription::ReadFromConfigFile(const IniFile &ConfigFile, const FS
   LoadPrecipitationType(ConfigFile, *Section, TEXT("PrecipitationType"), PrecipitationType);
   CARLA_LOAD_FROM_INI(Float, PrecipitationAmount)
   CARLA_LOAD_FROM_INI(Float, PrecipitationAccumulation)
+  // Wind.
+  CARLA_LOAD_FROM_INI(Bool, bWind)
+  CARLA_LOAD_FROM_INI(Float, WindIntensity)
+  CARLA_LOAD_FROM_INI(Float, WindAngle)
 #undef CARLA_LOAD_FROM_INI
 }
 
@@ -84,5 +88,9 @@ void FWeatherDescription::WriteToConfigFile(IniFile &ConfigFile) const
   ConfigFile.SetString(*Section, TEXT("PrecipitationType"), PrecipitationTypeToString(PrecipitationType));
   CARLA_WRITE_TO_INI(Float, PrecipitationAmount)
   CARLA_WRITE_TO_INI(Float, PrecipitationAccumulation)
+  // Wind.
+  CARLA_WRITE_TO_INI(Bool, bWind)
+  CARLA_WRITE_TO_INI(Float, WindIntensity)
+  CARLA_WRITE_TO_INI(Float, WindAngle)
 #undef CARLA_WRITE_TO_INI
 }
diff --git a/Source/Carla/WeatherDescription.h b/Source/Carla/WeatherDescription.h
index f820a6ec2..3f6f96cfa 100644
--- a/Source/Carla/WeatherDescription.h
+++ b/Source/Carla/WeatherDescription.h
@@ -46,19 +46,19 @@ struct FWeatherDescription
 
   /**  */
   UPROPERTY(Category = "Weather|Sun", EditAnywhere, BlueprintReadWrite, meta=(ClampMin = "0.0", ClampMax = "100.0"))
-  float SunBrightness;
+  float SunBrightness = 50.0f;
 
   /**  */
   UPROPERTY(Category = "Weather|Sun", EditAnywhere, BlueprintReadWrite, meta=(ClampMin = "0.0", ClampMax = "100.0"))
-  float SunDirectionalLightIntensity;
+  float SunDirectionalLightIntensity = 5.0f;
 
   /**  */
   UPROPERTY(Category = "Weather|Sun", EditAnywhere, BlueprintReadWrite)
-  FLinearColor SunDirectionalLightColor;
+  FLinearColor SunDirectionalLightColor = FLinearColor(255.0f, 240.0f, 195.0f);
 
   /**  */
   UPROPERTY(Category = "Weather|Sun", EditAnywhere, BlueprintReadWrite, meta=(ClampMin = "0.0", ClampMax = "100.0"))
-  float SunIndirectLightIntensity;
+  float SunIndirectLightIntensity = 6.0f;
 
   /// @}
   // ===========================================================================
@@ -68,35 +68,35 @@ struct FWeatherDescription
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite, meta=(ClampMin = "0.0", ClampMax = "100.0"))
-  float CloudOpacity;
+  float CloudOpacity = 10.0f;
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite, meta=(ClampMin = "0.0", ClampMax = "100.0"))
-  float HorizontFalloff;
+  float HorizontFalloff = 3.0f;
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite)
-  FLinearColor ZenithColor;
+  FLinearColor ZenithColor = FLinearColor(0.0340f, 0.1092f, 0.2950f);
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite)
-  FLinearColor HorizonColor;
+  FLinearColor HorizonColor = FLinearColor(0.6599f, 0.8622f, 1.0f);
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite)
-  FLinearColor CloudColor;
+  FLinearColor CloudColor = FLinearColor(0.8558f, 0.9190f, 1.0f);
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite)
-  FLinearColor OverallSkyColor;
+  FLinearColor OverallSkyColor = FLinearColor(1.0f, 1.0f, 1.0f);
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite, meta=(ClampMin = "0.0", ClampMax = "100.0"))
-  float SkyLightIntensity;
+  float SkyLightIntensity = 4.0f;
 
   /**  */
   UPROPERTY(Category = "Weather|Sky", EditAnywhere, BlueprintReadWrite)
-  FLinearColor SkyLightColor;
+  FLinearColor SkyLightColor = FLinearColor(0.1950f, 0.1851f, 0.1413f, 0.0f);
 
   /// @}
   // ===========================================================================
@@ -114,11 +114,29 @@ struct FWeatherDescription
 
   /**  */
   UPROPERTY(Category = "Weather|Precipitation", EditAnywhere, BlueprintReadWrite, meta=(EditCondition="bPrecipitation", ClampMin = "0.0", ClampMax = "100.0"))
-  float PrecipitationAmount = 0.0f;
+  float PrecipitationAmount = 50.0f;
 
   /**  */
   UPROPERTY(Category = "Weather|Precipitation", EditAnywhere, BlueprintReadWrite, meta=(EditCondition="bPrecipitation", ClampMin = "0.0", ClampMax = "100.0"))
-  float PrecipitationAccumulation = 0.0f;
+  float PrecipitationAccumulation = 50.0f;
+
+  /// @}
+  // ===========================================================================
+  /// @name Weather - Wind
+  // ===========================================================================
+  /// @{
+
+  /**  */
+  UPROPERTY(Category = "Weather|Wind", EditAnywhere, BlueprintReadWrite)
+  bool bWind = false;
+
+  /**  */
+  UPROPERTY(Category = "Weather|Wind", EditAnywhere, BlueprintReadWrite, meta=(EditCondition="bWind", ClampMin = "0.0", ClampMax = "100.0"))
+  float WindIntensity = 20.0f;
+
+  /**  */
+  UPROPERTY(Category = "Weather|Wind", EditAnywhere, BlueprintReadWrite, meta=(EditCondition="bWind", ClampMin = "-180.0", ClampMax = "180.0"))
+  float WindAngle = 0.0f;
 
   /// @}
 };