From e00ef220dacb4f5301d084f5171d6f024df19831 Mon Sep 17 00:00:00 2001 From: algoworks Date: Tue, 8 Aug 2017 14:01:28 -0700 Subject: [PATCH 1/3] 3 file changes, build directory --- interface/src/Application.cpp | 2 +- libraries/physics/src/EntityMotionState.cpp | 2 +- libraries/physics/src/PhysicsEngine.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ceded99f40..0e2f7ca55d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -242,7 +242,7 @@ static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SI static const uint32_t INVALID_FRAME = UINT32_MAX; -static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation +static const float PHYSICS_READY_RANGE = 1.0f; // how far from avatar to check for entities that aren't ready for simulation static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index f02dcee8f6..93ef140f30 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -531,7 +531,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ } if (!_body->isStaticOrKinematicObject()) { - const float DYNAMIC_LINEAR_VELOCITY_THRESHOLD = 0.05f; // 5 cm/sec + const float DYNAMIC_LINEAR_VELOCITY_THRESHOLD = 0.02f; // 5 cm/sec const float DYNAMIC_ANGULAR_VELOCITY_THRESHOLD = 0.087266f; // ~5 deg/sec bool movingSlowlyLinear = diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index a64796308e..1dba0e9a07 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -441,7 +441,7 @@ const CollisionEvents& PhysicsEngine::getCollisionEvents() { while (contactItr != _contactMap.end()) { ContactInfo& contact = contactItr->second; ContactEventType type = contact.computeType(_numContactFrames); - const btScalar SIGNIFICANT_DEPTH = -0.002f; // penetrations have negative distance + const btScalar SIGNIFICANT_DEPTH = -0.008f; // penetrations have negative distance if (type != CONTACT_EVENT_TYPE_CONTINUE || (contact.distance < SIGNIFICANT_DEPTH && contact.readyForContinue(_numContactFrames))) { From 6f1bb6abe28df76956db1be8e55e007f745fa3e7 Mon Sep 17 00:00:00 2001 From: Hisham Qayum Date: Thu, 31 Aug 2017 14:29:03 -0800 Subject: [PATCH 2/3] wallet icon now has white background, diff design --- .../resources/icons/tablet-icons/wallet-a.svg | 181 +---------- .../resources/icons/tablet-icons/wallet-i.svg | 290 +----------------- 2 files changed, 15 insertions(+), 456 deletions(-) diff --git a/interface/resources/icons/tablet-icons/wallet-a.svg b/interface/resources/icons/tablet-icons/wallet-a.svg index 4a0bab4b33..50ea64848f 100644 --- a/interface/resources/icons/tablet-icons/wallet-a.svg +++ b/interface/resources/icons/tablet-icons/wallet-a.svg @@ -1,180 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - HFC - + \ No newline at end of file diff --git a/interface/resources/icons/tablet-icons/wallet-i.svg b/interface/resources/icons/tablet-icons/wallet-i.svg index 2a16ecf973..4e27e41b44 100644 --- a/interface/resources/icons/tablet-icons/wallet-i.svg +++ b/interface/resources/icons/tablet-icons/wallet-i.svg @@ -1,276 +1,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - HFC - + + + + + + + + From ff6217069b7b16f5c94ccc4c21b55e968e98012d Mon Sep 17 00:00:00 2001 From: Hisham Qayum Date: Thu, 31 Aug 2017 17:30:24 -0800 Subject: [PATCH 3/3] reverting some unneeded code changes --- interface/src/Application.cpp | 2 +- libraries/physics/src/EntityMotionState.cpp | 2 +- libraries/physics/src/PhysicsEngine.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index b48ef22763..88003bb10f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -319,7 +319,7 @@ static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SI static const uint32_t INVALID_FRAME = UINT32_MAX; -static const float PHYSICS_READY_RANGE = 1.0f; // how far from avatar to check for entities that aren't ready for simulation +static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 93ef140f30..f02dcee8f6 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -531,7 +531,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ } if (!_body->isStaticOrKinematicObject()) { - const float DYNAMIC_LINEAR_VELOCITY_THRESHOLD = 0.02f; // 5 cm/sec + const float DYNAMIC_LINEAR_VELOCITY_THRESHOLD = 0.05f; // 5 cm/sec const float DYNAMIC_ANGULAR_VELOCITY_THRESHOLD = 0.087266f; // ~5 deg/sec bool movingSlowlyLinear = diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index 1dba0e9a07..a64796308e 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -441,7 +441,7 @@ const CollisionEvents& PhysicsEngine::getCollisionEvents() { while (contactItr != _contactMap.end()) { ContactInfo& contact = contactItr->second; ContactEventType type = contact.computeType(_numContactFrames); - const btScalar SIGNIFICANT_DEPTH = -0.008f; // penetrations have negative distance + const btScalar SIGNIFICANT_DEPTH = -0.002f; // penetrations have negative distance if (type != CONTACT_EVENT_TYPE_CONTINUE || (contact.distance < SIGNIFICANT_DEPTH && contact.readyForContinue(_numContactFrames))) {