summaryrefslogtreecommitdiff
path: root/indra/newview/llenvironment.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-09-29 16:46:39 -0700
committerRider Linden <rider@lindenlab.com>2017-09-29 16:46:39 -0700
commit23916be3dac32beebb17e0b9336b34176265783d (patch)
tree466780dfffa2be5eb6579acc0d87693c75a83635 /indra/newview/llenvironment.h
parentb8541cddccaa86e90ed9b072b620dcd4ba1acd20 (diff)
Moon is showing, sun still not working.
Diffstat (limited to 'indra/newview/llenvironment.h')
-rw-r--r--indra/newview/llenvironment.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index 0e8f39b4bf..a1bdf2c38c 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -48,8 +48,6 @@ public:
void update(const LLViewerCamera * cam);
- LLVector4 getRotatedLightDir() const { return mRotatedLight; }
-
void updateGLVariablesForSettings(LLGLSLShader *shader, const LLSettingsBase::ptr_t &psetting);
void updateShaderUniforms(LLGLSLShader *shader);
@@ -63,6 +61,9 @@ public:
inline F32 getSceneLightStrength() const { return mSceneLightStrength; }
inline void setSceneLightStrength(F32 light_strength) { mSceneLightStrength = light_strength; }
+ inline LLVector4 getLightDirection() const { return LLVector4(mCurrentSky->getLightDirection(), 0.0f); }
+ inline LLVector4 getClampedLightDirection() const { return LLVector4(mCurrentSky->getClampedLightDirection(), 0.0f); }
+ inline LLVector4 getRotatedLight() const { return mRotatedLight; }
private:
static const F32 SUN_DELTA_YAW;
@@ -70,7 +71,6 @@ private:
typedef std::map<std::string, LLSettingsSky::ptr_t> NamedSkyMap_t;
typedef std::map<LLUUID, LLSettingsSky::ptr_t> AssetSkyMap_t;
- LLVector4 mRotatedLight;
LLVector2 mCloudScrollDelta; // cumulative cloud delta
LLSettingsSky::ptr_t mCurrentSky;
@@ -79,6 +79,7 @@ private:
AssetSkyMap_t mSkysById;
F32 mSceneLightStrength;
+ LLVector4 mRotatedLight;
void addSky(const LLUUID &id, const LLSettingsSky::ptr_t &sky);
void removeSky(const std::string &name);