Merge pull request rbray89#49 from WazWaz/master

Adds UVNoise for clouds.
brandonson · May 16, 2016 · 0c6fdac · 0c6fdac
2 parents bbe4325 + 02d3a6c
commit 0c6fdac
Show file tree

Hide file tree

Showing 8 changed files with 198,770 additions and 175,861 deletions.
diff --git a/Atmosphere/CloudsObject.cs b/Atmosphere/CloudsObject.cs
@@ -20,13 +20,21 @@ public class CloudsMaterial : MaterialManager
         [ConfigItem]
         TextureWrapper _DetailTex;
         [ConfigItem]
+        TextureWrapper _UVNoiseTex;
+        [ConfigItem]
         float _DetailScale = 200f;
         [ConfigItem, InverseScaled]
         float _DetailDist = 0.000002f;
         [ConfigItem, InverseScaled]
         float _DistFade = 1.0f;
         [ConfigItem, InverseScaled]
         float _DistFadeVert = 0.00004f;
+        [ConfigItem]
+        float _UVNoiseScale = 0.01f;
+        [ConfigItem]
+        float _UVNoiseStrength = 0.002f;
+        [ConfigItem]
+        Vector2 _UVNoiseAnimation = new Vector2(0.4f, 0.2f);
     }
 
     [ConfigName("name")]

diff --git a/ContentConfigs/GameData/BoulderCo/Atmosphere/Textures/uvnoise1.dds b/ContentConfigs/GameData/BoulderCo/Atmosphere/Textures/uvnoise1.dds
diff --git a/ContentConfigs/GameData/BoulderCo/Atmosphere/clouds.cfg b/ContentConfigs/GameData/BoulderCo/Atmosphere/clouds.cfg
@@ -9,6 +9,8 @@ EVE_CLOUDS
 		settings
 		{
 			_DetailTex = BoulderCo/Atmosphere/Textures/detail1
+			_DetailScale = 30
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
 			_MainTex
 			{
 				value = BoulderCo/Atmosphere/Textures/fair
@@ -49,7 +51,8 @@ EVE_CLOUDS
 		settings
 		{
 			_DetailTex = BoulderCo/Atmosphere/Textures/detail1
-			_DetailScale = 100
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
+			_DetailScale = 20
 			_Color = 102,102,153,255
 			_MainTex
 			{
@@ -89,7 +92,11 @@ EVE_CLOUDS
 		settings
 		{
 			_DetailTex = BoulderCo/Atmosphere/Textures/detail1
-			_DetailScale = 100
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
+			_UVNoiseScale = 0.05
+			_UVNoiseStrength = 0.005
+			_UVNoiseAnimation = 0.5,0.02
+			_DetailScale = 20
 			_Color = 150,150,150,255
 			_MainTex
 			{
@@ -133,6 +140,7 @@ EVE_CLOUDS
 		{
 			_MainTex = BoulderCo/Atmosphere/Textures/eve1
 			_DetailTex = BoulderCo/Atmosphere/Textures/detaileve1
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
 			_DetailScale = 120
 			_DistFade = 1
 			_DistFadeVert = 4E-05
@@ -182,6 +190,7 @@ EVE_CLOUDS
 		{
 			_MainTex = BoulderCo/Atmosphere/Textures/eve1
 			_DetailTex = BoulderCo/Atmosphere/Textures/detaileve1
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
 			_DetailScale = 120
 			_DistFade = 1
 			_DistFadeVert = 4E-05
@@ -228,6 +237,7 @@ EVE_CLOUDS
 		{
 			_MainTex = BoulderCo/Atmosphere/Textures/eve1
 			_DetailTex = BoulderCo/Atmosphere/Textures/detaileve1
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
 			_DetailScale = 120
 			_DistFade = 1
 			_DistFadeVert = 4E-05
@@ -277,6 +287,7 @@ EVE_CLOUDS
 		{
 			_MainTex = BoulderCo/Atmosphere/Textures/eve1
 			_DetailTex = BoulderCo/Atmosphere/Textures/detaileve1
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
 			_DetailScale = 120
 			_DistFade = 1
 			_DistFadeVert = 4E-05
@@ -323,6 +334,7 @@ EVE_CLOUDS
 		{
 			_MainTex = BoulderCo/Atmosphere/Textures/eve1
 			_DetailTex = BoulderCo/Atmosphere/Textures/detaileve1
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
 			_DetailScale = 120
 			_DistFade = 1
 			_DistFadeVert = 4E-05
@@ -370,6 +382,10 @@ EVE_CLOUDS
 		settings
 		{
 			_DetailTex = BoulderCo/Atmosphere/Textures/detaileve1
+			_UVNoiseTex = BoulderCo/Atmosphere/Textures/uvnoise1
+			_UVNoiseScale = 0.1
+			_UVNoiseStrength = 0.007
+			_UVNoiseAnimation = 1,0.1
 			_DetailScale = 120
 			_Color = 26,43,16,255
 			_MainTex