Bugfixes. Should fix bizarre cam behavior and lighting issues on carved/hollowed prims.

This commit is contained in:
Shyotl
2011-07-20 15:07:58 -05:00
parent bc221a573e
commit fe0cd9f702
5 changed files with 7 additions and 5 deletions

View File

@@ -692,7 +692,7 @@ public:
if (lt != 0x7)
{
OCT_ERRS << "!!! ELEMENT EXCEEDS RANGE OF SPATIAL PARTITION !!!" << llendl;
//OCT_ERRS << "!!! ELEMENT EXCEEDS RANGE OF SPATIAL PARTITION !!!" << llendl;
return false;
}

View File

@@ -3819,7 +3819,7 @@ S32 LLVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& en
LLVector4a pos[3];
pos[0].load3(face.mVertices[index1].mPosition.mV);
pos[1].load3(face.mVertices[index2].mPosition.mV);
pos[2].load3(face.mVertices[index2].mPosition.mV);
pos[2].load3(face.mVertices[index3].mPosition.mV);
if (LLTriangleRayIntersect(pos[0],
pos[1],
pos[2],
@@ -4973,7 +4973,7 @@ BOOL LLVolumeFace::createCap(LLVolume* volume, BOOL partial_build)
LLVector4a pos[2];
pos[0].load3(mVertices[0].mPosition.mV);
pos[1].load3(mVertices[0].mPosition.mV);
pos[1].load3(mVertices[1].mPosition.mV);
LLVector4a normal;
LLVector4a d0, d1;

View File

@@ -191,7 +191,7 @@ public:
void setSpatialExtents(const LLVector4a& min, const LLVector4a& max);
void setPositionGroup(const LLVector4a& pos);
void setRenderType(S32 type) { mRenderType = type; }
BOOL isRenderType(S32 type) { return mRenderType == type; }
S32 getRenderType() { return mRenderType; }

View File

@@ -927,7 +927,7 @@ void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_po
LLVector4a normal4a;
normal4a.load3(vf.mVertices[0].mNormal.mV);
LLVector4a binormal4a;
binormal4a.load3(vf.mVertices[0].mNormal.mV);
binormal4a.load3(vf.mVertices[0].mBinormal.mV);
LLVector2 projected_binormal;
planarProjection(projected_binormal, normal4a, *vf.mCenter, binormal4a);
projected_binormal -= LLVector2(0.5f, 0.5f); // this normally happens in xform()

View File

@@ -2914,6 +2914,8 @@ void LLViewerObject::setScale(const LLVector3 &scale, BOOL damped)
void LLViewerObject::updateSpatialExtents(LLVector4a& newMin, LLVector4a &newMax)
{
if(mDrawable.isNull())
return;
LLVector4a center;
center.load3(getRenderPosition().mV);
LLVector4a size;