From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 2 Mar 2007 21:25:50 +0000 Subject: merge release@58699 beta-1-14-0@58707 -> release --- indra/newview/lldrawpoolavatar.h | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'indra/newview/lldrawpoolavatar.h') diff --git a/indra/newview/lldrawpoolavatar.h b/indra/newview/lldrawpoolavatar.h index 0d706b012b..e0b1f2098d 100644 --- a/indra/newview/lldrawpoolavatar.h +++ b/indra/newview/lldrawpoolavatar.h @@ -13,7 +13,7 @@ class LLVOAvatar; -class LLDrawPoolAvatar : public LLDrawPool +class LLDrawPoolAvatar : public LLFacePool { protected: S32 mNumFaces; @@ -24,21 +24,48 @@ public: SHADER_LEVEL_CLOTH = 3 }; + enum + { + VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | + LLVertexBuffer::MAP_NORMAL | + LLVertexBuffer::MAP_TEXCOORD | + LLVertexBuffer::MAP_WEIGHT | + LLVertexBuffer::MAP_CLOTHWEIGHT | + LLVertexBuffer::MAP_BINORMAL + + }; + + virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } + + virtual S32 getVertexShaderLevel() const; + LLDrawPoolAvatar(); + static LLMatrix4& getModelView(); + /*virtual*/ LLDrawPool *instancePool(); + /*virtual*/ S32 getNumPasses(); + /*virtual*/ void beginRenderPass(S32 pass); + /*virtual*/ void endRenderPass(S32 pass); /*virtual*/ void prerender(); /*virtual*/ void render(S32 pass = 0); /*virtual*/ void renderForSelect(); - /*virtual*/ S32 rebuild(); + void beginRigid(); + void beginFootShadow(); + void beginSkinned(); + + void endRigid(); + void endFootShadow(); + void endSkinned(); + /*virtual*/ LLViewerImage *getDebugTexture(); /*virtual*/ LLColor3 getDebugColor() const; // For AGP debug display virtual S32 getMaterialAttribIndex() { return 0; } - void renderAvatars(LLVOAvatar *single_avatar, BOOL no_shaders = FALSE); // renders only one avatar if single_avatar is not null. + void renderAvatars(LLVOAvatar *single_avatar, S32 pass = -1); // renders only one avatar if single_avatar is not null. }; -- cgit v1.2.3