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

code review

Browse source
This commit is contained in:
Seth Alves 2017-05-11 10:13:15 -07:00
parent 4042e2bceb
commit 80e6edda0c
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1611,13 +1611,14 @@ bool EntityTree::sendEntitiesOperation(OctreeElementPointer element, void* extra
if (oldID.isNull()) { if (oldID.isNull()) {
return EntityItemID(); return EntityItemID();
} }
if (args->map->contains(oldID)) {
return EntityItemID(args->map->value(oldID)); QHash<EntityItemID, EntityItemID>::iterator iter = args->map->find(oldID);
} else { if (iter == args->map->end()) {
EntityItemID newID = QUuid::createUuid(); EntityItemID newID = QUuid::createUuid();
args->map->insert(oldID, newID); args->map->insert(oldID, newID);
return newID; return newID;
} }
return iter.value();
}; };
entityTreeElement->forEachEntity([&args, &getMapped, &element](EntityItemPointer item) { entityTreeElement->forEachEntity([&args, &getMapped, &element](EntityItemPointer item) {

2
libraries/physics/src/ObjectActionMotor.cpp
View file

@ -27,6 +27,8 @@ ObjectActionMotor::ObjectActionMotor(const QUuid& id, EntityItemPointer ownerEnt
#if WANT_DEBUG #if WANT_DEBUG
qCDebug(physics) << "ObjectActionMotor::ObjectActionMotor"; qCDebug(physics) << "ObjectActionMotor::ObjectActionMotor";
#endif #endif
qCWarning(physics) << "action type \"motor\" doesn't yet work.";
} }
ObjectActionMotor::~ObjectActionMotor() { ObjectActionMotor::~ObjectActionMotor() {

6
libraries/physics/src/ObjectConstraintSlider.cpp
View file

@ -108,8 +108,8 @@ btTypedConstraint* ObjectConstraintSlider::getConstraint() {
axisInB = glm::normalize(axisInB); axisInB = glm::normalize(axisInB);
} }
glm::quat rotA = glm::rotation(glm::vec3(1.0f, 0.0f, 0.0f), axisInA); glm::quat rotA = glm::rotation(DEFAULT_SLIDER_AXIS, axisInA);
glm::quat rotB = glm::rotation(glm::vec3(1.0f, 0.0f, 0.0f), axisInB); glm::quat rotB = glm::rotation(DEFAULT_SLIDER_AXIS, axisInB);
btTransform frameInA(glmToBullet(rotA), glmToBullet(pointInA)); btTransform frameInA(glmToBullet(rotA), glmToBullet(pointInA));
btTransform frameInB(glmToBullet(rotB), glmToBullet(pointInB)); btTransform frameInB(glmToBullet(rotB), glmToBullet(pointInB));
@ -123,7 +123,7 @@ btTypedConstraint* ObjectConstraintSlider::getConstraint() {
} else { } else {
// This slider is between an entity and the world-frame. // This slider is between an entity and the world-frame.
glm::quat rot = glm::rotation(glm::vec3(1.0f, 0.0f, 0.0f), axisInA); glm::quat rot = glm::rotation(DEFAULT_SLIDER_AXIS, axisInA);
btTransform frameInA(glmToBullet(rot), glmToBullet(pointInA)); btTransform frameInA(glmToBullet(rot), glmToBullet(pointInA));

10
libraries/physics/src/ObjectDynamic.cpp
View file

@ -32,10 +32,14 @@ void ObjectDynamic::remapIDs(QHash<EntityItemID, EntityItemID>& map) {
} }
if (!_otherID.isNull()) { if (!_otherID.isNull()) {
if (!map.contains(_otherID)) { QHash<EntityItemID, EntityItemID>::iterator iter = map.find(_otherID);
map.insert(_otherID, QUuid::createUuid()); if (iter == map.end()) {
// not found, add it
_otherID = QUuid::createUuid();
map.insert(_otherID, _otherID);
} else {
_otherID = iter.value();
} }
_otherID = map.value(_otherID);
} }
}); });
} }