Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

coding standard

Browse source
This commit is contained in:
Seth Alves 2015-04-21 18:36:06 -07:00
parent 284215d46a
commit cde64893af
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityTree.cpp
View file

@ -25,7 +25,7 @@
#include "RecurseOctreeToMapOperator.h" #include "RecurseOctreeToMapOperator.h"
const quint64 SIMULATOR_CHANGE_LOCKOUT_PERIOD = 0.2 * USECS_PER_SECOND; const quint64 SIMULATOR_CHANGE_LOCKOUT_PERIOD = (quint64)(0.2f * USECS_PER_SECOND);
EntityTree::EntityTree(bool shouldReaverage) : EntityTree::EntityTree(bool shouldReaverage) :

4
libraries/physics/src/EntityMotionState.cpp
View file

@ -18,7 +18,7 @@
#include "PhysicsHelpers.h" #include "PhysicsHelpers.h"
#include "PhysicsLogging.h" #include "PhysicsLogging.h"
static const float MEASURED_ACCELERATION_CLOSE_TO_ZERO = 0.05; static const float MEASURED_ACCELERATION_CLOSE_TO_ZERO = 0.05f;
QSet<EntityItem*>* _outgoingEntityList; QSet<EntityItem*>* _outgoingEntityList;
@ -215,7 +215,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
EntityItemProperties properties = _entity->getProperties(); EntityItemProperties properties = _entity->getProperties();
if (glm::length(_measuredAcceleration) < MEASURED_ACCELERATION_CLOSE_TO_ZERO) { if (glm::length(_measuredAcceleration) < MEASURED_ACCELERATION_CLOSE_TO_ZERO) {
_entity->setAcceleration(glm::vec3(0)); _entity->setAcceleration(glm::vec3(0.0f));
} else { } else {
_entity->setAcceleration(_entity->getGravity()); _entity->setAcceleration(_entity->getGravity());
} }