Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1 from bulletphysics/master

Browse Source 
update to latest
This commit is contained in:
erwincoumans
2014-03-20 22:14:17 -07:00
parent cfb06f9cd3 71c34eb332
commit 4afe403e35
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos3/bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp
View File

@@ -234,7 +234,7 @@ bool Bullet2MultiBodyDemo::mouseButtonCallback(int button, int state, float x, f
btPoint2PointConstraint* p2p = new btPoint2PointConstraint(*body,localPivot); btPoint2PointConstraint* p2p = new btPoint2PointConstraint(*body,localPivot);
m_dynamicsWorld->addConstraint(p2p,true); m_dynamicsWorld->addConstraint(p2p,true);
m_pickedConstraint = p2p; m_pickedConstraint = p2p;
btScalar mousePickClamping = 30.f; btScalar mousePickClamping = 10.f;
p2p->m_setting.m_impulseClamp = mousePickClamping; p2p->m_setting.m_impulseClamp = mousePickClamping;
//very weak constraint for picking //very weak constraint for picking
p2p->m_setting.m_tau = 0.001f; p2p->m_setting.m_tau = 0.001f;
@@ -256,7 +256,7 @@ bool Bullet2MultiBodyDemo::mouseButtonCallback(int button, int state, float x, f
//so we try to avoid it by clamping the maximum impulse (force) that the mouse pick can apply //so we try to avoid it by clamping the maximum impulse (force) that the mouse pick can apply
//it is not satisfying, hopefully we find a better solution (higher order integrator, using joint friction using a zero-velocity target motor with limited force etc?) //it is not satisfying, hopefully we find a better solution (higher order integrator, using joint friction using a zero-velocity target motor with limited force etc?)
p2p->setMaxAppliedImpulse(20*scaling); p2p->setMaxAppliedImpulse(2*scaling);
btMultiBodyDynamicsWorld* world = (btMultiBodyDynamicsWorld*) m_dynamicsWorld; btMultiBodyDynamicsWorld* world = (btMultiBodyDynamicsWorld*) m_dynamicsWorld;
world->addMultiBodyConstraint(p2p); world->addMultiBodyConstraint(p2p);

2
btgui/Gwen/Controls/Canvas.cpp
View File

@@ -19,7 +19,7 @@
using namespace Gwen::Controls; using namespace Gwen::Controls;
Canvas::Canvas( Gwen::Skin::Base* pSkin ) : BaseClass( NULL ), m_bAnyDelete( false ) Canvas::Canvas( Gwen::Skin::Base* pSkin ) : BaseClass( NULL ), m_bAnyDelete( false ),m_fScale(-1)
{ {
SetBounds( 0, 0, 10000, 10000 ); SetBounds( 0, 0, 10000, 10000 );
SetSkin( pSkin ); SetSkin( pSkin );