TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-26 01:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for Issue #130 for Decals and Smoothing Groups

Browse source
This commit is contained in:
DavidWyand-GG 2012-11-08 16:56:22 -05:00
parent 9a76293991
commit a803398eb0
5 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Engine/source/collision/clippedPolyList.cpp
View file

@ -74,6 +74,11 @@ bool ClippedPolyList::isEmpty() const
//----------------------------------------------------------------------------
U32 ClippedPolyList::addPoint(const Point3F& p)
{
return addPointAndNormal( p, Point3F::Zero );
}
U32 ClippedPolyList::addPointAndNormal(const Point3F& p, const Point3F& normal)
{
mVertexList.increment();
Vertex& v = mVertexList.last();
@ -82,6 +87,14 @@ U32 ClippedPolyList::addPoint(const Point3F& p)
v.point.z = p.z * mScale.z;
mMatrix.mulP(v.point);
mNormalList.increment();
VectorF& n = mNormalList.last();
n = normal;
if ( !n.isZero() )
mMatrix.mulV(n);
AssertFatal(mNormalList.size() == mVertexList.size(), "Normals count does not match vertex count!");
// Build the plane mask
register U32 mask = 1;
register S32 count = mPlaneList.size();
@ -242,6 +255,13 @@ void ClippedPolyList::end()
VectorF vv = v2 - v1;
F32 t = -mPlaneList[p].distToPlane(v1) / mDot(mPlaneList[p],vv);
mNormalList.increment();
VectorF& n1 = mNormalList[mIndexList[i1]];
VectorF& n2 = mNormalList[mIndexList[i1]];
VectorF nn = mLerp( n1, n2, t );
nn.normalizeSafe();
mNormalList.last() = nn;
mIndexList.push_back/*_noresize*/(mVertexList.size() - 1);
Vertex& iv = mVertexList.last();
iv.point.x = v1.x + vv.x * t;
@ -343,12 +363,14 @@ void ClippedPolyList::cullUnusedVerts()
if ( !result )
{
mVertexList.setSize( i );
mNormalList.setSize( i );
break;
}
// Erase unused verts.
numDeleted = (k-1) - i + 1;
mVertexList.erase( i, numDeleted );
mNormalList.erase( i, numDeleted );
// Find any references to vertices after those deleted
// in the mIndexList and correct with an offset
@ -407,7 +429,7 @@ void ClippedPolyList::generateNormals()
{
PROFILE_SCOPE( ClippedPolyList_GenerateNormals );
mNormalList.setSize( mVertexList.size() );
AssertFatal(mNormalList.size() == mVertexList.size(), "Normals count does not match vertex count!");
U32 i, polyCount;
VectorF normal;
@ -418,6 +440,10 @@ void ClippedPolyList::generateNormals()
U32 n = 0;
for ( ; normalIter != mNormalList.end(); normalIter++, n++ )
{
// Skip normals that already have values.
if ( !normalIter->isZero() )
continue;
// Average all the face normals which
// share this vertex index.
indexIter = mIndexList.begin();