From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/lldrawpoolwater.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index 3158b0a59b..c81b27cb34 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -44,9 +44,9 @@ protected: LLPointer mOpaqueWaterImagep; public: - static BOOL sSkipScreenCopy; - static BOOL sNeedsReflectionUpdate; - static BOOL sNeedsDistortionUpdate; + static bool sSkipScreenCopy; + static bool sNeedsReflectionUpdate; + static bool sNeedsDistortionUpdate; static F32 sWaterFogEnd; enum -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/lldrawpoolwater.h | 166 ++++++++++++++++++++-------------------- 1 file changed, 83 insertions(+), 83 deletions(-) (limited to 'indra/newview/lldrawpoolwater.h') diff --git a/indra/newview/lldrawpoolwater.h b/indra/newview/lldrawpoolwater.h index df678b14e5..f64477a059 100644 --- a/indra/newview/lldrawpoolwater.h +++ b/indra/newview/lldrawpoolwater.h @@ -1,83 +1,83 @@ -/** - * @file lldrawpoolwater.h - * @brief LLDrawPoolWater class definition - * - * $LicenseInfo:firstyear=2002&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLDRAWPOOLWATER_H -#define LL_LLDRAWPOOLWATER_H - -#include "lldrawpool.h" - - -class LLFace; -class LLHeavenBody; -class LLWaterSurface; -class LLGLSLShader; - -class LLDrawPoolWater final: public LLFacePool -{ -protected: - LLPointer mWaterImagep[2]; - LLPointer mWaterNormp[2]; - - LLPointer mOpaqueWaterImagep; - -public: - static bool sSkipScreenCopy; - static bool sNeedsReflectionUpdate; - static bool sNeedsDistortionUpdate; - static F32 sWaterFogEnd; - - enum - { - VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | - LLVertexBuffer::MAP_NORMAL | - LLVertexBuffer::MAP_TEXCOORD0 - }; - - virtual U32 getVertexDataMask() override { return VERTEX_DATA_MASK; } - - LLDrawPoolWater(); - /*virtual*/ ~LLDrawPoolWater(); - - S32 getNumPostDeferredPasses() override; - void beginPostDeferredPass(S32 pass) override; - void renderPostDeferred(S32 pass) override; - - void prerender() override; - - LLViewerTexture *getDebugTexture() override; - LLColor3 getDebugColor() const; // For AGP debug display - - void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); - void setOpaqueTexture(const LLUUID& opaqueTextureId); - void setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId); - -protected: - void renderOpaqueLegacyWater(); -}; - -void cgErrorCallback(); - -#endif // LL_LLDRAWPOOLWATER_H +/** + * @file lldrawpoolwater.h + * @brief LLDrawPoolWater class definition + * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLDRAWPOOLWATER_H +#define LL_LLDRAWPOOLWATER_H + +#include "lldrawpool.h" + + +class LLFace; +class LLHeavenBody; +class LLWaterSurface; +class LLGLSLShader; + +class LLDrawPoolWater final: public LLFacePool +{ +protected: + LLPointer mWaterImagep[2]; + LLPointer mWaterNormp[2]; + + LLPointer mOpaqueWaterImagep; + +public: + static bool sSkipScreenCopy; + static bool sNeedsReflectionUpdate; + static bool sNeedsDistortionUpdate; + static F32 sWaterFogEnd; + + enum + { + VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | + LLVertexBuffer::MAP_NORMAL | + LLVertexBuffer::MAP_TEXCOORD0 + }; + + virtual U32 getVertexDataMask() override { return VERTEX_DATA_MASK; } + + LLDrawPoolWater(); + /*virtual*/ ~LLDrawPoolWater(); + + S32 getNumPostDeferredPasses() override; + void beginPostDeferredPass(S32 pass) override; + void renderPostDeferred(S32 pass) override; + + void prerender() override; + + LLViewerTexture *getDebugTexture() override; + LLColor3 getDebugColor() const; // For AGP debug display + + void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId); + void setOpaqueTexture(const LLUUID& opaqueTextureId); + void setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId); + +protected: + void renderOpaqueLegacyWater(); +}; + +void cgErrorCallback(); + +#endif // LL_LLDRAWPOOLWATER_H -- cgit v1.2.3