A majority of vectorization done. Note that it's INCOMPLETE. LLVolumeFace and LLVertexBuffer haven't been updated, so it's very dirty(and buggy) at those transitions. Compiles on windoze.
This commit is contained in:
@@ -1274,7 +1274,7 @@ void LLVOTree::updateRadius()
|
||||
mDrawable->setRadius(32.0f);
|
||||
}
|
||||
|
||||
void LLVOTree::updateSpatialExtents(LLVector3& newMin, LLVector3& newMax)
|
||||
void LLVOTree::updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
|
||||
{
|
||||
F32 radius = getScale().length()*0.05f;
|
||||
LLVector3 center = getRenderPosition();
|
||||
@@ -1284,9 +1284,11 @@ void LLVOTree::updateSpatialExtents(LLVector3& newMin, LLVector3& newMax)
|
||||
|
||||
center += LLVector3(0, 0, size.mV[2]) * getRotation();
|
||||
|
||||
newMin.set(center-size);
|
||||
newMax.set(center+size);
|
||||
mDrawable->setPositionGroup(center);
|
||||
newMin.load3((center-size).mV);
|
||||
newMax.load3((center+size).mV);
|
||||
LLVector4a pos;
|
||||
pos.load3(center.mV);
|
||||
mDrawable->setPositionGroup(pos);
|
||||
}
|
||||
|
||||
BOOL LLVOTree::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
|
||||
@@ -1299,8 +1301,13 @@ BOOL LLVOTree::lineSegmentIntersect(const LLVector3& start, const LLVector3& end
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
const LLVector3* ext = mDrawable->getSpatialExtents();
|
||||
const LLVector4a* exta = mDrawable->getSpatialExtents();
|
||||
|
||||
//VECTORIZE THIS
|
||||
LLVector3 ext[2];
|
||||
ext[0].set(exta[0].getF32ptr());
|
||||
ext[1].set(exta[1].getF32ptr());
|
||||
|
||||
LLVector3 center = (ext[1]+ext[0])*0.5f;
|
||||
LLVector3 size = (ext[1]-ext[0]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user