Skip to content

Commit

Permalink
Again fixed physics on x64
Browse files Browse the repository at this point in the history
infinity != max
  • Loading branch information
Xottab-DUTY committed Jun 18, 2018
1 parent aad0793 commit 0383b14
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/xrPhysics/Physics.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#include "StdAfx.h"

#include <limits>

#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderknoopc/dTriList.h"
Expand All @@ -22,7 +25,6 @@ extern CPHWorld* ph_world;
///////////////////////////////////////////////////////////////////

#include "ExtendedGeom.h"
// union dInfBytes dInfinityValue = {{0,0,0x80,0x7f}};
// PhysicsStepTimeCallback *physics_step_time_callback = 0;

const float default_w_limit = 9.8174770f; //(M_PI/16.f/(fixed_step=0.02f));
Expand Down Expand Up @@ -248,7 +250,7 @@ IC static int CollideIntoGroup(
}

if (pushing_neg)
surface.mu = dInfinity;
surface.mu = std::numeric_limits<dReal>::max();

if (do_collide && collided_contacts < MAX_CONTACTS)
{
Expand Down

1 comment on commit 0383b14

@ForserX
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Дошло наконец...

Please sign in to comment.