Make cloud rendering use textures defined in sky settings and add code to shaders to lerp between current and next cloud texture.

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h
index d6d294de6a..d7f7700dd0 100644
--- a/indra/newview/llvosky.h
+++ b/indra/newview/llvosky.h
@@ -272,9 +272,16 @@ public:
 	LLViewerTexture*	getSunTex() const					{ return mSunTexturep[0];   }
 	LLViewerTexture*	getMoonTex() const					{ return mMoonTexturep[0];  }
 	LLViewerTexture*	getBloomTex() const					{ return mBloomTexturep;    }
+    LLViewerTexture*	getCloudNoiseTex() const			{ return mCloudNoiseTexturep[0]; }
+
+    LLViewerTexture*	getSunTexNext() const					{ return mSunTexturep[1];   }
+	LLViewerTexture*	getMoonTexNext() const					{ return mMoonTexturep[1];  }
+	LLViewerTexture*	getBloomTexNext() const					{ return mBloomTexturep;    }
+    LLViewerTexture*	getCloudNoiseTexNext() const			{ return mCloudNoiseTexturep[1]; }
 
     void setSunTextures(const LLUUID& sun_texture, const LLUUID& sun_texture_next);
     void setMoonTextures(const LLUUID& moon_texture, const LLUUID& moon_texture_next);
+    void setCloudNoiseTextures(const LLUUID& cloud_noise_texture, const LLUUID& cloud_noise_texture_next);
 
 	void forceSkyUpdate(void)							{ mForceUpdate = TRUE; }
 
@@ -292,6 +299,7 @@ protected:
 
 	LLPointer<LLViewerFetchedTexture> mSunTexturep[2];
 	LLPointer<LLViewerFetchedTexture> mMoonTexturep[2];
+    LLPointer<LLViewerFetchedTexture> mCloudNoiseTexturep[2];
 	LLPointer<LLViewerFetchedTexture> mBloomTexturep;
 
 	static S32			sResolution;