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

consolidate button work in progress

meow-7.2.2
Dave Parks 2010-02-09 12:26:09 -06:00
parent 22bcd0e0ea
commit 2cb5b0b66e
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/llmath/llvolume.cpp
View File

@ -5468,6 +5468,25 @@ void LLVolumeFace::createBinormals()
}
}
void LLVolumeFace::appendFace(const LLVolumeFace& face, LLMatrix4& transform, LLMatrix4& norm_transform)
{
for (U32 i = 0; i < face.mVertices.size(); ++i)
{
VertexData v = face.mVertices[i];
v.mPosition *= mat;
v.mNormal *= norm_transform;
mVertices.push_back(v);
}
U16 offset = mIndices.size();
for (U32 i = 0; i < face.mIndices.size(); ++i)
{
mIndices.push_back(face.mIndices[i]+offset);
}
}
BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
{
LLMemType m1(LLMemType::MTYPE_VOLUME);

2
indra/llmath/llvolume.h
View File

@ -805,6 +805,8 @@ public:
BOOL create(LLVolume* volume, BOOL partial_build = FALSE);
void createBinormals();
void appendFace(const LLVolumeFace& face);
class VertexData
{
public: