diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-08-26 11:46:05 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-08-26 11:46:05 -0700 |
| commit | 00eddaf23fbe6761e6a78500b42d076f7a1551fa (patch) | |
| tree | 6f29c8c9f5c20ac29dd1704b44dfced27ab3f764 /indra/newview/llvosky.h | |
| parent | 1f656735d339fc4d83da86efbb400af1361c27db (diff) | |
| parent | d195a3b08d664a98c17a81ec43aa84707631a234 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvosky.h')
| -rw-r--r-- | indra/newview/llvosky.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvosky.h b/indra/newview/llvosky.h index 5f27085599..b1a01a9366 100644 --- a/indra/newview/llvosky.h +++ b/indra/newview/llvosky.h @@ -288,7 +288,7 @@ public: void setSunScale(F32 sun_scale); void setMoonScale(F32 sun_scale); - void forceSkyUpdate(void) { mForceUpdate = TRUE; } + void forceSkyUpdate(void); public: LLFace *mFace[FACE_COUNT]; @@ -337,10 +337,10 @@ protected: F32 mWind; bool mInitialized; - bool mForceUpdate; //flag to force instantaneous update of cubemap - LLVector3 mLastSunLightingDirection; - LLVector3 mLastMoonLightingDirection; - LLColor3 mLastTotalAmbient; + bool mForceUpdate; + bool mNeedUpdate; // flag to force update of cubemap + S32 mCubeMapUpdateStage; // state of cubemap uodate: -1 idle; 0-5 per-face updates; 6 finalizing + F32 mAmbientScale; LLColor3 mNightColorShift; F32 mInterpVal; |