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

Revert "Formula fix" 

This reverts commit 8435a2c970.
This commit is contained in:
Dander7BD 2014-01-28 11:43:24 +01:00
parent 8435a2c970
commit 78706f9929
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Code/OysterPhysics3D/OysterPhysics3D.h
View File

@ -59,20 +59,11 @@ namespace Oyster { namespace Physics3D
/****************************************************************** /******************************************************************
* Returns the world tangential momentum at worldPos, of a mass in rotation. * Returns the world tangential momentum at worldPos, of a mass in rotation.
* G = ( H x r ) / ( |H| * |r|^2 ) <-> H = r x G
* @todo TODO: improve doc * @todo TODO: improve doc
******************************************************************/ ******************************************************************/
inline ::Oyster::Math::Float4 TangentialLinearMomentum( const ::Oyster::Math::Float4 &angularMomentum, const ::Oyster::Math::Float4 &worldOffset ) inline ::Oyster::Math::Float4 TangentialLinearMomentum( const ::Oyster::Math::Float4 &angularMomentum, const ::Oyster::Math::Float4 &worldOffset )
{ {
::Oyster::Math::Float magnitudeH_squared = angularMomentum.Dot( angularMomentum ); return ::Oyster::Math::Float4( angularMomentum.xyz.Cross(worldOffset.xyz), 0.0f ) /= worldOffset.Dot( worldOffset );
if( magnitudeH_squared > 0 )
{
return ::Oyster::Math::Float4( angularMomentum.xyz.Cross(worldOffset.xyz), 0.0f ) /= ( (::Oyster::Math::Float)::std::sqrt(magnitudeH_squared) * worldOffset.Dot( worldOffset ) );
}
else
{
return ::Oyster::Math::Float4::null;
}
} }
/****************************************************************** /******************************************************************