mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 05:17:02 +02:00
resolve conflicts on merge with huffman/baseball
This commit is contained in:
commit
f07314f4ef
3 changed files with 4 additions and 8 deletions
|
@ -41,7 +41,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
|
||||||
case PacketType::EntityAdd:
|
case PacketType::EntityAdd:
|
||||||
case PacketType::EntityEdit:
|
case PacketType::EntityEdit:
|
||||||
case PacketType::EntityData:
|
case PacketType::EntityData:
|
||||||
return VERSION_ENTITIES_POLYLINE_TEXTURE;
|
return VERSION_ENTITIES_ACTIONS_PER_HAND_OFFSET;
|
||||||
case PacketType::AvatarData:
|
case PacketType::AvatarData:
|
||||||
case PacketType::BulkAvatarData:
|
case PacketType::BulkAvatarData:
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -159,7 +159,7 @@ const PacketVersion VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP = 46;
|
||||||
const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP = 47;
|
const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP = 47;
|
||||||
const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP_BIS = 48;
|
const PacketVersion VERSION_ENTITIES_KEYLIGHT_PROPERTIES_GROUP_BIS = 48;
|
||||||
const PacketVersion VERSION_ENTITIES_PARTICLES_ADDITIVE_BLENDING = 49;
|
const PacketVersion VERSION_ENTITIES_PARTICLES_ADDITIVE_BLENDING = 49;
|
||||||
const PacketVersion VERSION_ENTITIES_ACTIONS_PER_HAND_OFFSET = 50;
|
const PacketVersion VERSION_ENTITIES_POLYLINE_TEXTURE = 50;
|
||||||
const PacketVersion VERSION_ENTITIES_POLYLINE_TEXTURE = 51;
|
const PacketVersion VERSION_ENTITIES_ACTIONS_PER_HAND_OFFSET = 51;
|
||||||
|
|
||||||
#endif // hifi_PacketHeaders_h
|
#endif // hifi_PacketHeaders_h
|
||||||
|
|
|
@ -135,11 +135,7 @@ void ObjectMotionState::updateCCDConfiguration() {
|
||||||
btVector3 center;
|
btVector3 center;
|
||||||
btScalar radius;
|
btScalar radius;
|
||||||
_shape->getBoundingSphere(center, radius);
|
_shape->getBoundingSphere(center, radius);
|
||||||
_body->setCcdMotionThreshold(radius * RADIUS_MOTION_THRESHOLD_MULTIPLIER);
|
_body->setCcdMotionThreshold(radius / 4.0f);
|
||||||
|
|
||||||
// TODO: Ideally the swept sphere radius would be contained by the object. Using the bounding sphere
|
|
||||||
// radius works well for spherical objects, but may cause issues with other shapes. For arbitrary
|
|
||||||
// objects we may want to consider a different approach, such as grouping rigid bodies together.
|
|
||||||
_body->setCcdSweptSphereRadius(radius);
|
_body->setCcdSweptSphereRadius(radius);
|
||||||
} else {
|
} else {
|
||||||
// Disable CCD
|
// Disable CCD
|
||||||
|
|
Loading…
Reference in a new issue