Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:36:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More fixes for clang & gcc

Browse source 
C++14 issues, I think.
This commit is contained in:
Simon Walton 2018-07-27 11:34:08 -07:00
parent 4d559bbaee
commit 3d390203e2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -5475,7 +5475,7 @@ void Application::update(float deltaTime) {
// we haven't yet enabled physics. we wait until we think we have all the collision information // we haven't yet enabled physics. we wait until we think we have all the collision information
// for nearby entities before starting bullet up. // for nearby entities before starting bullet up.
quint64 now = usecTimestampNow(); quint64 now = usecTimestampNow();
const int PHYSICS_CHECK_TIMEOUT = 2 * USECS_PER_SECOND; //const int PHYSICS_CHECK_TIMEOUT = 2 * USECS_PER_SECOND;
auto entityTreeRenderer = getEntities(); auto entityTreeRenderer = getEntities();
if (entityTreeRenderer && _octreeProcessor.octreeSequenceIsComplete(entityTreeRenderer->getLastOctreeMessageSequence()) ) { if (entityTreeRenderer && _octreeProcessor.octreeSequenceIsComplete(entityTreeRenderer->getLastOctreeMessageSequence()) ) {
/*if (now - _lastPhysicsCheckTime > PHYSICS_CHECK_TIMEOUT || _fullSceneReceivedCounter > _fullSceneCounterAtLastPhysicsCheck) {*/ /*if (now - _lastPhysicsCheckTime > PHYSICS_CHECK_TIMEOUT || _fullSceneReceivedCounter > _fullSceneCounterAtLastPhysicsCheck) {*/

4
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -130,8 +130,8 @@ void OctreePacketProcessor::resetCompletionSequenceNumber() {
} }
namespace { namespace {
template<typename T> constexpr bool lessThanWraparound(int a, int b) { template<typename T> bool lessThanWraparound(int a, int b) {
static const int MAX_T_VALUE = std::numeric_limits<T>::max(); constexpr int MAX_T_VALUE = std::numeric_limits<T>::max();
if (b < a) { if (b < a) {
b += MAX_T_VALUE; b += MAX_T_VALUE;
} }