Skip to content

Commit 0383b14

Browse files
committed
Again fixed physics on x64
infinity != max
1 parent aad0793 commit 0383b14

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/xrPhysics/Physics.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#include "StdAfx.h"
2+
3+
#include <limits>
4+
25
#include "PHDynamicData.h"
36
#include "Physics.h"
47
#include "tri-colliderknoopc/dTriList.h"
@@ -22,7 +25,6 @@ extern CPHWorld* ph_world;
2225
///////////////////////////////////////////////////////////////////
2326

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

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

250252
if (pushing_neg)
251-
surface.mu = dInfinity;
253+
surface.mu = std::numeric_limits<dReal>::max();
252254

253255
if (do_collide && collided_contacts < MAX_CONTACTS)
254256
{

0 commit comments

Comments
 (0)