xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update ivp submodule

Browse source
This commit is contained in:
nillerusr 2022-04-16 10:07:38 +03:00
parent 0a6d81245a
commit 3afa6329a4
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ivp

@ -1 +1 @@
Subproject commit 82849306f728db57868d7a82fe7bcff333eb468c Subproject commit e83263d03e0f46f69c94d1881d76f65bbdc03487

7
vphysics/physics_object.cpp
View file

@ -177,6 +177,11 @@ void CPhysicsObject::Wake( void )
m_pObject->ensure_in_simulation(); m_pObject->ensure_in_simulation();
} }
void CPhysicsObject::WakeNow( void )
{
m_pObject->ensure_in_simulation_now();
}
// supported // supported
void CPhysicsObject::Sleep( void ) void CPhysicsObject::Sleep( void )
{ {
@ -643,7 +648,6 @@ void CPhysicsObject::SetInertia( const Vector &inertia )
ri.k[2] = IVP_Inline_Math::fabsd(ri.k[2]); ri.k[2] = IVP_Inline_Math::fabsd(ri.k[2]);
if( ri.k[0] > 1e14f ) ri.k[0] = 1e14f; if( ri.k[1] > 1e14f ) ri.k[1] = 1e14f; if( ri.k[2] > 1e14f ) ri.k[2] = 1e14f; if( ri.k[0] > 1e14f ) ri.k[0] = 1e14f; if( ri.k[1] > 1e14f ) ri.k[1] = 1e14f; if( ri.k[2] > 1e14f ) ri.k[2] = 1e14f;
if( ri.k[0] <= 0 ) ri.k[0] = 1.f; if( ri.k[1] <= 0 ) ri.k[1] = 1.f; if( ri.k[2] <= 0 ) ri.k[2] = 1.f;
m_pObject->get_core()->set_rotation_inertia( &ri ); m_pObject->get_core()->set_rotation_inertia( &ri );
} }
@ -1092,7 +1096,6 @@ void GetWorldCoordFromSynapse( IVP_Synapse_Friction *pfriction, IVP_U_Point &wor
world.set(pfriction->get_contact_point()->get_contact_point_ws()); world.set(pfriction->get_contact_point()->get_contact_point_ws());
} }
bool CPhysicsObject::GetContactPoint( Vector *contactPoint, IPhysicsObject **contactObject ) const bool CPhysicsObject::GetContactPoint( Vector *contactPoint, IPhysicsObject **contactObject ) const
{ {
IVP_Synapse_Friction *pfriction = m_pObject->get_first_friction_synapse(); IVP_Synapse_Friction *pfriction = m_pObject->get_first_friction_synapse();

1
vphysics/physics_object.h
View file

@ -112,6 +112,7 @@ public:
unsigned short GetGameIndex( void ) const; unsigned short GetGameIndex( void ) const;
void Wake(); void Wake();
void WakeNow();
void Sleep(); void Sleep();
void RecheckCollisionFilter(); void RecheckCollisionFilter();
void RecheckContactPoints(); void RecheckContactPoints();

14
vphysics/vcollide_parse.cpp
View file

@ -175,12 +175,7 @@ void CVPhysicsParse::ParseSolid( solid_t *pSolid, IVPhysicsKeyHandler *unknownKe
else if ( !Q_stricmp( key, "inertia" ) ) else if ( !Q_stricmp( key, "inertia" ) )
{ {
float inertia = atof(value); float inertia = atof(value);
if( inertia > 1e14f ) pSolid->params.inertia = (inertia > 1e14f) ? 1e14f : inertia;
pSolid->params.inertia = 1e14f;
else if( inertia <= 0 )
pSolid->params.inertia = 1.f;
else
pSolid->params.inertia = inertia;
} }
else if ( !Q_stricmp( key, "damping" ) ) else if ( !Q_stricmp( key, "damping" ) )
{ {
@ -475,12 +470,7 @@ void CVPhysicsParse::ParseVehicleWheel( vehicle_wheelparams_t &wheel )
else if ( !Q_stricmp( key, "inertia" ) ) else if ( !Q_stricmp( key, "inertia" ) )
{ {
float inertia = atof(value); float inertia = atof(value);
if( inertia > 1e14f ) wheel.inertia = (inertia > 1e14f) ? 1e14f : inertia;
wheel.inertia = 1e14f;
else if( inertia <= 0 )
wheel.inertia = 1.f;
else
wheel.inertia = inertia;
} }
else if ( !Q_stricmp( key, "damping" ) ) else if ( !Q_stricmp( key, "damping" ) )
{ {