diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lldrawpoolterrain.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/linden/indra/newview/lldrawpoolterrain.h b/linden/indra/newview/lldrawpoolterrain.h index b75d7cf..57fab9e 100644 --- a/linden/indra/newview/lldrawpoolterrain.h +++ b/linden/indra/newview/lldrawpoolterrain.h | |||
@@ -30,10 +30,22 @@ | |||
30 | 30 | ||
31 | #include "lldrawpool.h" | 31 | #include "lldrawpool.h" |
32 | 32 | ||
33 | class LLDrawPoolTerrain : public LLDrawPool | 33 | class LLDrawPoolTerrain : public LLFacePool |
34 | { | 34 | { |
35 | LLPointer<LLViewerImage> mTexturep; | 35 | LLPointer<LLViewerImage> mTexturep; |
36 | public: | 36 | public: |
37 | enum | ||
38 | { | ||
39 | VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | | ||
40 | LLVertexBuffer::MAP_NORMAL | | ||
41 | LLVertexBuffer::MAP_TEXCOORD | | ||
42 | LLVertexBuffer::MAP_TEXCOORD2 | | ||
43 | LLVertexBuffer::MAP_COLOR | ||
44 | }; | ||
45 | |||
46 | virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } | ||
47 | static S32 getDetailMode(); | ||
48 | |||
37 | LLDrawPoolTerrain(LLViewerImage *texturep); | 49 | LLDrawPoolTerrain(LLViewerImage *texturep); |
38 | virtual ~LLDrawPoolTerrain(); | 50 | virtual ~LLDrawPoolTerrain(); |
39 | 51 | ||
@@ -43,7 +55,7 @@ public: | |||
43 | /*virtual*/ void render(S32 pass = 0); | 55 | /*virtual*/ void render(S32 pass = 0); |
44 | /*virtual*/ void prerender(); | 56 | /*virtual*/ void prerender(); |
45 | /*virtual*/ void renderForSelect(); | 57 | /*virtual*/ void renderForSelect(); |
46 | /*virtual*/ void dirtyTexture(const LLViewerImage *texturep); | 58 | /*virtual*/ void dirtyTextures(const std::set<LLViewerImage*>& textures); |
47 | /*virtual*/ LLViewerImage *getTexture(); | 59 | /*virtual*/ LLViewerImage *getTexture(); |
48 | /*virtual*/ LLViewerImage *getDebugTexture(); | 60 | /*virtual*/ LLViewerImage *getDebugTexture(); |
49 | /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display | 61 | /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display |