From f45edabe478eb2e5ed899377f541875cbd566977 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 22 Aug 2018 23:02:16 +0100 Subject: MAINT-9026 hook up sun/moon scale to settingsvo and render code --- indra/newview/llvosky.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/newview/llvosky.h') diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index d8039b7f80..4943c48f7c 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -236,7 +236,7 @@ public: void setSunDirectionCFR(const LLVector3 &sun_direction); void setMoonDirectionCFR(const LLVector3 &moon_direction); - bool updateHeavenlyBodyGeometry(LLDrawable *drawable, const S32 side, LLHeavenBody& hb, const LLVector3 &up, const LLVector3 &right); + bool updateHeavenlyBodyGeometry(LLDrawable *drawable, F32 scale, const S32 side, LLHeavenBody& hb, const LLVector3 &up, const LLVector3 &right); void updateReflectionGeometry(LLDrawable *drawable, F32 H, const LLHeavenBody& HB); F32 getWorldScale() const { return mWorldScale; } @@ -278,6 +278,9 @@ public: void setCloudNoiseTextures(const LLUUID& cloud_noise_texture, const LLUUID& cloud_noise_texture_next); void setBloomTextures(const LLUUID& bloom_texture, const LLUUID& bloom_texture_next); + void setSunScale(F32 sun_scale); + void setMoonScale(F32 sun_scale); + void forceSkyUpdate(void) { mForceUpdate = TRUE; } public: @@ -297,6 +300,9 @@ protected: LLPointer mCloudNoiseTexturep[2]; LLPointer mBloomTexturep[2]; + F32 mSunScale = 1.0f; + F32 mMoonScale = 1.0f; + static S32 sResolution; static S32 sTileResX; static S32 sTileResY; -- cgit v1.2.3