From bc04d1b4779ce391381fd3c864b22644f9be749a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 4 May 2016 09:01:26 +1200 Subject: [PATCH 1/3] Increase maximum friction value from 0.99 to 0.9999 --- libraries/entities/src/EntityItemPropertiesDefaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h index aa4fb5c619..cfdc39dfd8 100644 --- a/libraries/entities/src/EntityItemPropertiesDefaults.h +++ b/libraries/entities/src/EntityItemPropertiesDefaults.h @@ -65,7 +65,7 @@ const float ENTITY_ITEM_MAX_RESTITUTION = 0.99f; const float ENTITY_ITEM_DEFAULT_RESTITUTION = 0.5f; const float ENTITY_ITEM_MIN_FRICTION = 0.0f; -const float ENTITY_ITEM_MAX_FRICTION = 0.99f; +const float ENTITY_ITEM_MAX_FRICTION = 0.9999f; const float ENTITY_ITEM_DEFAULT_FRICTION = 0.5f; const bool ENTITY_ITEM_DEFAULT_COLLISIONLESS = false; From d1064bf5ea7a84ce9c086c80d2811964675adc8a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 4 May 2016 10:58:33 +1200 Subject: [PATCH 2/3] Increase maximum friction to 1.0 - bullet can handle it --- libraries/entities/src/EntityItemPropertiesDefaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h index cfdc39dfd8..ce5826af0d 100644 --- a/libraries/entities/src/EntityItemPropertiesDefaults.h +++ b/libraries/entities/src/EntityItemPropertiesDefaults.h @@ -65,7 +65,7 @@ const float ENTITY_ITEM_MAX_RESTITUTION = 0.99f; const float ENTITY_ITEM_DEFAULT_RESTITUTION = 0.5f; const float ENTITY_ITEM_MIN_FRICTION = 0.0f; -const float ENTITY_ITEM_MAX_FRICTION = 0.9999f; +const float ENTITY_ITEM_MAX_FRICTION = 1.0f; const float ENTITY_ITEM_DEFAULT_FRICTION = 0.5f; const bool ENTITY_ITEM_DEFAULT_COLLISIONLESS = false; From 4b05d8ed951373cdf0e49147b1a695dbaa853c7c Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 5 May 2016 07:50:15 +1200 Subject: [PATCH 3/3] Increase maximum friction to 10.0 - Bullet's maximum --- libraries/entities/src/EntityItemPropertiesDefaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h index ce5826af0d..d5d44bb4a8 100644 --- a/libraries/entities/src/EntityItemPropertiesDefaults.h +++ b/libraries/entities/src/EntityItemPropertiesDefaults.h @@ -65,7 +65,7 @@ const float ENTITY_ITEM_MAX_RESTITUTION = 0.99f; const float ENTITY_ITEM_DEFAULT_RESTITUTION = 0.5f; const float ENTITY_ITEM_MIN_FRICTION = 0.0f; -const float ENTITY_ITEM_MAX_FRICTION = 1.0f; +const float ENTITY_ITEM_MAX_FRICTION = 10.0f; const float ENTITY_ITEM_DEFAULT_FRICTION = 0.5f; const bool ENTITY_ITEM_DEFAULT_COLLISIONLESS = false;