diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-05 21:44:23 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-05 21:44:23 +0000 |
| commit | fc5a30a6949e6127a27f9bbadb51a287195145f6 (patch) | |
| tree | 182ada6abf5bc3655bee7647883b2659aa12b9a1 /indra/newview/llvosky.h | |
| parent | b030d7036f87d30babb4a8df8d256113f46182e9 (diff) | |
| parent | 5eed233618abd7020e130799be2abe0f986543f6 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #134)
SL-1925
Diffstat (limited to 'indra/newview/llvosky.h')
| -rw-r--r-- | indra/newview/llvosky.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index e465dcbe27..660db1e518 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -263,15 +263,18 @@ public: bool isReflFace(const LLFace* face) const { return face == mFace[FACE_REFLECTION]; } LLFace* getReflFace() const { return mFace[FACE_REFLECTION]; } - LLViewerTexture* getSunTex() const { return mSunTexturep[0]; } - LLViewerTexture* getMoonTex() const { return mMoonTexturep[0]; } - LLViewerTexture* getBloomTex() const { return mBloomTexturep[0]; } - LLViewerTexture* getCloudNoiseTex() const { return mCloudNoiseTexturep[0]; } + LLViewerTexture* getSunTex() const { return mSunTexturep[0]; } + LLViewerTexture* getMoonTex() const { return mMoonTexturep[0]; } + LLViewerTexture* getBloomTex() const { return mBloomTexturep[0]; } + LLViewerTexture* getCloudNoiseTex() const { return mCloudNoiseTexturep[0]; } - LLViewerTexture* getSunTexNext() const { return mSunTexturep[1]; } - LLViewerTexture* getMoonTexNext() const { return mMoonTexturep[1]; } - LLViewerTexture* getBloomTexNext() const { return mBloomTexturep[1]; } - LLViewerTexture* getCloudNoiseTexNext() const { return mCloudNoiseTexturep[1]; } + LLViewerTexture* getRainbowTex() const { return mRainbowMap; } + LLViewerTexture* getHaloTex() const { return mHaloMap; } + + LLViewerTexture* getSunTexNext() const { return mSunTexturep[1]; } + LLViewerTexture* getMoonTexNext() const { return mMoonTexturep[1]; } + LLViewerTexture* getBloomTexNext() const { return mBloomTexturep[1]; } + 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); @@ -299,6 +302,8 @@ protected: LLPointer<LLViewerFetchedTexture> mMoonTexturep[2]; LLPointer<LLViewerFetchedTexture> mCloudNoiseTexturep[2]; LLPointer<LLViewerFetchedTexture> mBloomTexturep[2]; + LLPointer<LLViewerFetchedTexture> mRainbowMap; + LLPointer<LLViewerFetchedTexture> mHaloMap; F32 mSunScale = 1.0f; F32 mMoonScale = 1.0f; |