From cc22ffc6d799544e8f2a9dfed6813081d908c88d Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 13 Oct 2017 17:17:49 -0700 Subject: Watter settings active and start of new joystick button type. --- indra/newview/lldrawpoolwater.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index aeeba179d6..55f892d249 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -46,9 +46,8 @@ 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 -- cgit v1.2.3 From a0598b12656cdcf22ba95cacd01b5ff36f8f1b26 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Mon, 11 Jun 2018 17:46:16 +0100 Subject: Fix water fog consolidation in underwater shaders. Add plumbing facilities to allow current and next moon textures to be passed to moon shader. Modify moon shader to blend between current and next moon textures by blend factor. --- indra/newview/lldrawpoolwater.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 55f892d249..5df84bc8f0 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -37,7 +37,6 @@ class LLWaterSurface; class LLDrawPoolWater: public LLFacePool { protected: - LLPointer mHBTex[2]; LLPointer mWaterImagep; LLPointer mOpaqueWaterImagep; LLPointer mWaterNormp; -- cgit v1.2.3 From 34865c4bb5cd12219606f44748159fe7cbeea264 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 13 Jun 2018 00:51:39 +0100 Subject: Mods to hook up water settings to water normals for rendering with support for current to next blending. Modify LLSettingsFoo::buildDefaultFoo to use a static and avoid re-validation of default sky/water/daycycle settings. Remove all references to gSun/MoonTextureId globals (they should come from sky settings now). --- indra/newview/lldrawpoolwater.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 5df84bc8f0..3c1587885e 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -37,9 +37,10 @@ class LLWaterSurface; class LLDrawPoolWater: public LLFacePool { protected: - LLPointer mWaterImagep; - LLPointer mOpaqueWaterImagep; - LLPointer mWaterNormp; + LLPointer mWaterImagep[2]; + LLPointer mWaterNormp[2]; + + LLPointer mOpaqueWaterImagep; public: static BOOL sSkipScreenCopy; @@ -81,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(); }; -- cgit v1.2.3 From 862b8f72dc4d89e88b0c03992dad393aff9451a5 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 18 Sep 2018 20:31:26 +0100 Subject: SL-9685 Make sure legacy opaque water texture ID is assigned so it can be bound for lowest graphics use. --- indra/newview/lldrawpoolwater.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 3c1587885e..f14ac1f6d2 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -83,7 +83,7 @@ public: void shade(); void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); - void setOpaqueTexture(); + void setOpaqueTexture(const LLUUID& opaqueTextureId); void setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId); protected: -- cgit v1.2.3 From deb6110098569fb90ca7e5073c2e98fabbb23a82 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 30 Jan 2019 13:26:35 -0800 Subject: Eliminate helper GLSL modules depending on further GLSL modules to give Intel HD x000 compiler a fighting chance. More WIP for edge-specific water shader for 9996. --- indra/newview/lldrawpoolwater.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index f14ac1f6d2..f94baefc41 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -33,6 +33,7 @@ class LLFace; class LLHeavenBody; class LLWaterSurface; +class LLGLSLShader; class LLDrawPoolWater: public LLFacePool { @@ -81,6 +82,7 @@ public: void renderReflection(LLFace* face); void shade(); + void shade2(bool edge, LLGLSLShader* shader, const LLColor3& light_diffuse, const LLVector3& light_dir, F32 light_exp); void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); void setOpaqueTexture(const LLUUID& opaqueTextureId); -- cgit v1.2.3 From 898c9f44218353b3bf71b78ffce02662b4927625 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 13 Mar 2019 13:21:48 -0700 Subject: Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR. --- indra/newview/lldrawpoolwater.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index f94baefc41..d436557e1c 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -47,8 +47,6 @@ public: static BOOL sSkipScreenCopy; static BOOL sNeedsReflectionUpdate; static BOOL sNeedsDistortionUpdate; -// static LLVector3 sLightDir; -// static LLColor4 sWaterFogColor; static F32 sWaterFogEnd; enum -- cgit v1.2.3