From ae7ca56b402809d84bf22affdcb6c9bd5799dedb Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Tue, 18 Mar 2014 00:04:27 -0700 Subject: [PATCH 1/2] reduce mouse picking strength --- .../FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Demos3/bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp b/Demos3/bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp index a9f1a4765..e03afcdd9 100644 --- a/Demos3/bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp +++ b/Demos3/bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp @@ -234,7 +234,7 @@ bool Bullet2MultiBodyDemo::mouseButtonCallback(int button, int state, float x, f btPoint2PointConstraint* p2p = new btPoint2PointConstraint(*body,localPivot); m_dynamicsWorld->addConstraint(p2p,true); m_pickedConstraint = p2p; - btScalar mousePickClamping = 30.f; + btScalar mousePickClamping = 10.f; p2p->m_setting.m_impulseClamp = mousePickClamping; //very weak constraint for picking 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 //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; world->addMultiBodyConstraint(p2p); From 71c34eb33237dcbea73e6841d1343159c09c2815 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 20 Mar 2014 22:10:58 -0700 Subject: [PATCH 2/2] =?UTF-8?q?fix=20a=20nasty=20bug,=20due=20to=20uniniti?= =?UTF-8?q?alized=20variable,=20sometimes=20the=20value=20was=20nan=20and?= =?UTF-8?q?=20the=20=3D=3D=20passed,=20leading=20to=20some=20OpenGL=20erro?= =?UTF-8?q?r=20later=20on=20due=20to=20glScissors=20failing=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- btgui/Gwen/Controls/Canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/btgui/Gwen/Controls/Canvas.cpp b/btgui/Gwen/Controls/Canvas.cpp index 6860634d9..777228c6f 100644 --- a/btgui/Gwen/Controls/Canvas.cpp +++ b/btgui/Gwen/Controls/Canvas.cpp @@ -19,7 +19,7 @@ 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 ); SetSkin( pSkin );