Commit 5dc32ae2 authored by Rye Mutt's avatar Rye Mutt 🍞
Browse files

Clean up some member variable shadowing in particles

parent e6c0e1ce
......@@ -872,6 +872,8 @@ namespace LLInitParam
const Param* getParamFromHandle(const param_handle_t param_handle) const
{
if (param_handle == 0) return nullptr;
const uintptr_t baseblock_address = reinterpret_cast<uintptr_t>(this);
return reinterpret_cast<const Param*>(baseblock_address + param_handle);
}
......
......@@ -469,28 +469,28 @@ BOOL LLViewerJointMesh::updateLOD(F32 pixel_area, BOOL activate)
}
// static
void LLViewerJointMesh::updateGeometry(LLFace *mFace, LLPolyMesh *mMesh)
void LLViewerJointMesh::updateGeometry(LLFace* facep, LLPolyMesh* mesh)
{
LLStrider<LLVector3> o_vertices;
LLStrider<LLVector3> o_normals;
//get vertex and normal striders
LLVertexBuffer* buffer = mFace->getVertexBuffer();
LLVertexBuffer* buffer = facep->getVertexBuffer();
buffer->getVertexStrider(o_vertices, 0);
buffer->getNormalStrider(o_normals, 0);
F32* __restrict vert = o_vertices[0].mV;
F32* __restrict norm = o_normals[0].mV;
const F32* __restrict weights = mMesh->getWeights();
const LLVector4a* __restrict coords = (LLVector4a*) mMesh->getCoords();
const LLVector4a* __restrict normals = (LLVector4a*) mMesh->getNormals();
const F32* __restrict weights = mesh->getWeights();
const LLVector4a* __restrict coords = (LLVector4a*)mesh->getCoords();
const LLVector4a* __restrict normals = (LLVector4a*)mesh->getNormals();
U32 offset = mMesh->mFaceVertexOffset*4;
U32 offset = mesh->mFaceVertexOffset*4;
vert += offset;
norm += offset;
for (U32 index = 0; index < mMesh->getNumVertices(); index++)
for (U32 index = 0; index < mesh->getNumVertices(); index++)
{
// equivalent to joint = floorf(weights[index]);
S32 joint = _mm_cvtt_ss2si(_mm_load_ss(weights+index));
......
......@@ -76,9 +76,7 @@ LLViewerPart::LLViewerPart() :
mPartID(0),
mLastUpdateTime(0.f),
mSkipOffset(0.f),
mImagep(NULL),
mStartGlow(0.f),
mEndGlow(0.f)
mImagep(NULL)
{
mPartSourcep = NULL;
mParent = NULL;
......
......@@ -74,8 +74,6 @@ public:
LLVector3 mAxis;
LLColor4 mColor;
LLVector2 mScale;
F32 mStartGlow;
F32 mEndGlow;
LLColor4U mGlow;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment