Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 11:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sync

Browse source
This commit is contained in:
Seth Alves 2015-04-24 14:09:10 -07:00
parent ad85837b5a
commit fea8d84618
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/entities/src/EntityItem.cpp
View file

@ -620,6 +620,8 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
_angularVelocity = saveAngularVelocity;
_gravity = saveGravity;
_acceleration = saveAcceleration;
} else {
qDebug() << "accepting update";
}
return bytesRead;
@ -1100,7 +1102,7 @@ void EntityItem::updatePositionInDomainUnits(const glm::vec3& value) {
}
void EntityItem::updatePosition(const glm::vec3& value) {
if (false && value == _previousPositionFromServer) {
if (/* false && */ value == _previousPositionFromServer) {
_position = value;
} else if (glm::distance(_position, value) > MIN_POSITION_DELTA) {
_position = value;
@ -1122,7 +1124,7 @@ void EntityItem::updateDimensions(const glm::vec3& value) {
}
void EntityItem::updateRotation(const glm::quat& rotation) {
if (false && rotation == _previousRotationFromServer) {
if (/* false && */ rotation == _previousRotationFromServer) {
_rotation = rotation;
} else if (glm::abs(glm::dot(_rotation, rotation)) < MIN_ALIGNMENT_DOT) {
_rotation = rotation;
@ -1161,7 +1163,7 @@ void EntityItem::updateVelocityInDomainUnits(const glm::vec3& value) {
}
void EntityItem::updateVelocity(const glm::vec3& value) {
if (false && value == _previousVelocityFromServer) {
if (/* false && */ value == _previousVelocityFromServer) {
if (glm::length(value) < MIN_VELOCITY_DELTA) {
_velocity = ENTITY_ITEM_ZERO_VEC3;
} else {
@ -1191,7 +1193,7 @@ void EntityItem::updateGravityInDomainUnits(const glm::vec3& value) {
}
void EntityItem::updateGravity(const glm::vec3& value) {
if (false && value == _previousGravityFromServer) {
if (/* false && */ value == _previousGravityFromServer) {
_gravity = value;
} else if (glm::distance(_gravity, value) > MIN_GRAVITY_DELTA) {
_gravity = value;
@ -1201,7 +1203,7 @@ void EntityItem::updateGravity(const glm::vec3& value) {
}
void EntityItem::updateAcceleration(const glm::vec3& value) {
if (false && value == _previousAccelerationFromServer) {
if (/* false && */ value == _previousAccelerationFromServer) {
_acceleration = value;
} else if (glm::distance(_acceleration, value) > MIN_ACCELERATION_DELTA) {
_acceleration = value;
@ -1211,7 +1213,7 @@ void EntityItem::updateAcceleration(const glm::vec3& value) {
}
void EntityItem::updateAngularVelocity(const glm::vec3& value) {
if (false && value == _previousAngularVelocityFromServer) {
if (/* false && */ value == _previousAngularVelocityFromServer) {
if (glm::length(value) < MIN_SPIN_DELTA) {
_angularVelocity = ENTITY_ITEM_ZERO_VEC3;
} else {

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

@ -195,16 +195,17 @@ float EntityMotionState::computeMass(const ShapeInfo& shapeInfo) const {
}
bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) {
if (getShouldClaimSimulationOwnership()) {
return true;
}
bool baseResult = this->ObjectMotionState::shouldSendUpdate(simulationFrame);
if (!baseResult) {
return false;
}
if (getShouldClaimSimulationOwnership()) {
qDebug() << "shouldSendUpdate due to claiming ownership";
return true;
}
auto nodeList = DependencyManager::get<NodeList>();
const QUuid& myNodeID = nodeList->getSessionUUID();
const QUuid& simulatorID = _entity->getSimulatorID();
@ -303,7 +304,11 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
setShouldClaimSimulationOwnership(false);
} else if (simulatorID == myNodeID && zeroSpeed && zeroSpin) {
// we are the simulator and the entity has stopped. give up "simulator" status
// _entity->setSimulatorID(QUuid());
_entity->setSimulatorID(QUuid());
properties.setSimulatorID(QUuid());
} else if (simulatorID == myNodeID && !_body->isActive()) {
// it's not active. don't keep simulation ownership.
_entity->setSimulatorID(QUuid());
properties.setSimulatorID(QUuid());
}
@ -340,7 +345,7 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
qCDebug(physics) << "EntityMotionState::sendUpdate()... calling queueEditEntityMessage()...";
#endif
qDebug() << "sending";
qDebug() << "sending" << _body->isActive() << (_entity->getSimulatorID() == myNodeID);
entityPacketSender->queueEditEntityMessage(PacketTypeEntityAddOrEdit, id, properties);
} else {
#ifdef WANT_DEBUG