livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-616 Fix for particles not rendering.

meow-7.2.2
Dave Parks 2012-05-23 11:11:14 -05:00
parent 42cdb4a4b2
commit cea270c50a
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lldrawpoolalpha.cpp
View File

@ -407,7 +407,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
if ((params.mVertexBuffer->getTypeMask() & mask) != mask)
{ //FIXME!
//llwarns << "Missing required components, skipping render batch." << llendl;
llwarns << "Missing required components, skipping render batch." << llendl;
continue;
}

11
indra/newview/llvopartgroup.cpp
View File

@ -69,8 +69,15 @@ void LLVOPartGroup::restoreGL()
//indices and texcoords are always the same, set once
LLStrider<U16> indicesp;
sVB->getIndexStrider(indicesp);
LLStrider<LLVector4a> verticesp;
sVB->getIndexStrider(indicesp);
sVB->getVertexStrider(verticesp);
LLVector4a v;
v.set(0,0,0,0);
U16 vert_offset = 0;
for (U32 i = 0; i < LL_MAX_PARTICLE_COUNT; i++)
@ -83,6 +90,8 @@ void LLVOPartGroup::restoreGL()
*indicesp++ = vert_offset + 3;
*indicesp++ = vert_offset + 2;
*verticesp++ = v;
vert_offset += 4;
}

9
indra/newview/llvopartgroup.h
View File

@ -52,10 +52,11 @@ public:
enum
{
VERTEX_DATA_MASK = (1 << LLVertexBuffer::TYPE_VERTEX) |
(1 << LLVertexBuffer::TYPE_NORMAL) |
(1 << LLVertexBuffer::TYPE_TEXCOORD0) |
(1 << LLVertexBuffer::TYPE_COLOR)
VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX |
LLVertexBuffer::MAP_NORMAL |
LLVertexBuffer::MAP_TEXCOORD0 |
LLVertexBuffer::MAP_COLOR |
LLVertexBuffer::MAP_TEXTURE_INDEX
};
LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);