diff options
Diffstat (limited to 'indra/newview/lldrawpoolterrain.h')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.h | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/indra/newview/lldrawpoolterrain.h b/indra/newview/lldrawpoolterrain.h index 2c27733f37..13f031c8e7 100644 --- a/indra/newview/lldrawpoolterrain.h +++ b/indra/newview/lldrawpoolterrain.h @@ -1,25 +1,25 @@ -/** +/** * @file lldrawpoolterrain.h * @brief LLDrawPoolTerrain 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$ */ @@ -31,58 +31,60 @@ class LLDrawPoolTerrain : public LLFacePool { - LLPointer<LLViewerTexture> mTexturep; + LLPointer<LLViewerTexture> mTexturep; public: enum { VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | + LLVertexBuffer::MAP_TANGENT | // Only PBR terrain uses this currently LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_TEXCOORD1 - }; - - virtual U32 getVertexDataMask(); - static S32 getDetailMode(); + }; - LLDrawPoolTerrain(LLViewerTexture *texturep); - virtual ~LLDrawPoolTerrain(); + virtual U32 getVertexDataMask(); + LLDrawPoolTerrain(LLViewerTexture *texturep); + virtual ~LLDrawPoolTerrain(); - /*virtual*/ S32 getNumDeferredPasses() { return 1; } - /*virtual*/ void beginDeferredPass(S32 pass); - /*virtual*/ void endDeferredPass(S32 pass); - /*virtual*/ void renderDeferred(S32 pass); + /*virtual*/ S32 getNumDeferredPasses() { return 1; } + /*virtual*/ void beginDeferredPass(S32 pass); + /*virtual*/ void endDeferredPass(S32 pass); + /*virtual*/ void renderDeferred(S32 pass); - /*virtual*/ S32 getNumShadowPasses() { return 1; } - /*virtual*/ void beginShadowPass(S32 pass); - /*virtual*/ void endShadowPass(S32 pass); - /*virtual*/ void renderShadow(S32 pass); + /*virtual*/ S32 getNumShadowPasses() { return 1; } + /*virtual*/ void beginShadowPass(S32 pass); + /*virtual*/ void endShadowPass(S32 pass); + /*virtual*/ void renderShadow(S32 pass); - /*virtual*/ void prerender(); - /*virtual*/ void dirtyTextures(const std::set<LLViewerFetchedTexture*>& textures); - /*virtual*/ LLViewerTexture *getTexture(); - /*virtual*/ LLViewerTexture *getDebugTexture(); - /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display + /*virtual*/ void prerender(); + /*virtual*/ void dirtyTextures(const std::set<LLViewerFetchedTexture*>& textures); + /*virtual*/ LLViewerTexture *getTexture(); + /*virtual*/ LLViewerTexture *getDebugTexture(); + /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display - LLPointer<LLViewerTexture> mAlphaRampImagep; - LLPointer<LLViewerTexture> m2DAlphaRampImagep; - LLPointer<LLViewerTexture> mAlphaNoiseImagep; + LLPointer<LLViewerTexture> mAlphaRampImagep; + LLPointer<LLViewerTexture> m2DAlphaRampImagep; + LLPointer<LLViewerTexture> mAlphaNoiseImagep; - static S32 sDetailMode; - static F32 sDetailScale; // meters per texture + static S32 sPBRDetailMode; + static F32 sDetailScale; // textures per meter + static F32 sPBRDetailScale; // textures per meter protected: void boostTerrainDetailTextures(); - void renderSimple(); - void renderOwnership(); + void renderSimple(); + void renderOwnership(); - void renderFull2TU(); - void renderFull4TU(); - void renderFullShader(); - void drawLoop(); + void renderFull2TU(); + void renderFull4TU(); + void renderFullShader(); + void renderFullShaderTextures(); + void renderFullShaderPBR(BOOL local_materials = false); + void drawLoop(); private: - void hilightParcelOwners(); + void hilightParcelOwners(); }; #endif // LL_LLDRAWPOOLSIMPLE_H |