diff options
Diffstat (limited to 'indra/newview/lldrawpoolwater.h')
| -rw-r--r-- | indra/newview/lldrawpoolwater.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index aeeba179d6..3c1587885e 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -37,18 +37,17 @@ class LLWaterSurface; class LLDrawPoolWater: public LLFacePool { protected: - LLPointer<LLViewerTexture> mHBTex[2]; - LLPointer<LLViewerTexture> mWaterImagep; - LLPointer<LLViewerTexture> mOpaqueWaterImagep; - LLPointer<LLViewerTexture> mWaterNormp; + LLPointer<LLViewerTexture> mWaterImagep[2]; + LLPointer<LLViewerTexture> mWaterNormp[2]; + + LLPointer<LLViewerTexture> mOpaqueWaterImagep; public: static BOOL sSkipScreenCopy; static BOOL sNeedsReflectionUpdate; static BOOL sNeedsDistortionUpdate; - static LLVector3 sLightDir; - - static LLColor4 sWaterFogColor; +// static LLVector3 sLightDir; +// static LLColor4 sWaterFogColor; static F32 sWaterFogEnd; enum @@ -83,6 +82,10 @@ public: void renderReflection(LLFace* face); void shade(); + void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); + void setOpaqueTexture(); + void setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId); + protected: void renderOpaqueLegacyWater(); }; |