NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated formula for BoxVsBox point of contact 

good enough approximation. Tested
This commit is contained in:
Dander7BD 2013-12-17 12:09:20 +01:00
parent ec6cd72f3c
commit a03568e19e
1 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Code/OysterPhysics3D/OysterCollision3D.cpp
View File

@ -224,165 +224,156 @@ namespace Oyster { namespace Collision3D { namespace Utility
/*****************************************************************
* Distance Alghorithm based on .. something Dan came up with
* pi = si * ( |t dot si| * (hA dot |si|) / (hA dot |si| + hB dot |si * RB|) )
* p = point of contact
* = ( p1 + p2 + ... + p13 + p14 ) / 5
* pi = si * ( (t dot si) * (hA dot |si|) / (hA dot |si| + hB dot |si * RB|) )
* p = estimated point of contact
* = ( p1 + p2 + ... + p5 + p6 ) / 2
*****************************************************************/
Float4 t = Float4( worldOffset, 0.0f ),
s = Float4::standard_unit_x,
hA = Float4( boundingOffsetA, 0.0f ),
hB = Float4( boundingOffsetB, 0.0f );
Float centerSeperation = Abs( t.Dot(s) ),
Float centerSeperation = t.Dot(s),
eA = hA.Dot( Abs(s) ),
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
Float4 sumPoints = s * ( centerSeperation * eA / edgeSeperation );
s = Float4::standard_unit_y;
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s * ( centerSeperation * eA / edgeSeperation );
s = Float4::standard_unit_z;
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s * ( centerSeperation * eA / edgeSeperation );
s = rotationB.v[0];
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s * ( centerSeperation * eA / edgeSeperation );
s = rotationB.v[1];
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s * ( centerSeperation * eA / edgeSeperation );
s = rotationB.v[2];
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s * ( centerSeperation * eA / edgeSeperation );
sumPoints += s * ( centerSeperation * eA / edgeSeperation ); // enough point of contact data gathered for approximative result.
s = Float4( Float3::standard_unit_x.Cross(rotationB.v[0].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_x.Cross(rotationB.v[1].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_x.Cross(rotationB.v[2].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_y.Cross(rotationB.v[0].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_y.Cross(rotationB.v[1].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_y.Cross(rotationB.v[2].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_z.Cross(rotationB.v[0].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_z.Cross(rotationB.v[1].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
s = Float4( Float3::standard_unit_z.Cross(rotationB.v[2].xyz), 0.0f );
centerSeperation = Abs( t.Dot(s) );
centerSeperation = t.Dot(s);
eA = hA.Dot( Abs(s) );
edgeSeperation = eA + hB.Dot( Abs(s * rotationB) );
if( centerSeperation > edgeSeperation )
if( Abs(centerSeperation) > edgeSeperation )
{ // no intersection
return false;
}
sumPoints += s.GetNormalized() * ( centerSeperation * eA / edgeSeperation );
worldPointOfContact = ((1.0f/5.0f) * sumPoints).xyz;
worldPointOfContact = (0.5f * sumPoints).xyz;
return true;
}
}