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

pass avatar parent information through avatar-mixer

Browse source
This commit is contained in:
Seth Alves 2015-10-22 13:44:04 -07:00
parent 778dc8dc15
commit f6fe503c51
4 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarManager.cpp
View file

@ -151,7 +151,7 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
while (fadingIterator != _avatarFades.end()) { while (fadingIterator != _avatarFades.end()) {
auto avatar = std::static_pointer_cast<Avatar>(*fadingIterator); auto avatar = std::static_pointer_cast<Avatar>(*fadingIterator);
avatar->withWriteLock([&] { avatar->withWriteLock([&] {
avatar->setTargetScale(avatar->getAvatarScale() * SHRINK_RATE, true); avatar->setTargetScale(avatar->getAvatarScale() * SHRINK_RATE);
if (avatar->getTargetScale() < MIN_FADE_SCALE) { if (avatar->getTargetScale() < MIN_FADE_SCALE) {
avatar->removeFromScene(*fadingIterator, scene, pendingChanges); avatar->removeFromScene(*fadingIterator, scene, pendingChanges);
fadingIterator = _avatarFades.erase(fadingIterator); fadingIterator = _avatarFades.erase(fadingIterator);

29
libraries/avatars/src/AvatarData.cpp
View file

@ -135,15 +135,15 @@ float AvatarData::getTargetScale() const {
return _targetScale; return _targetScale;
} }
void AvatarData::setTargetScale(float targetScale, bool overideReferential) { void AvatarData::setTargetScale(float targetScale) {
_targetScale = targetScale; _targetScale = targetScale;
} }
void AvatarData::setClampedTargetScale(float targetScale, bool overideReferential) { void AvatarData::setClampedTargetScale(float targetScale) {
targetScale = glm::clamp(targetScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE); targetScale = glm::clamp(targetScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
setTargetScale(targetScale, overideReferential); setTargetScale(targetScale);
qCDebug(avatars) << "Changed scale to " << _targetScale; qCDebug(avatars) << "Changed scale to " << _targetScale;
} }
@ -214,14 +214,18 @@ QByteArray AvatarData::toByteArray(bool cullSmallChanges, bool sendAll) {
setAtBit(bitItems, IS_EYE_TRACKER_CONNECTED); setAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
} }
// referential state // referential state
if (false) { SpatiallyNestablePointer parent = getParentPointer();
setAtBit(bitItems, HAS_REFERENTIAL); // XXX leaving this for later use if (parent) {
setAtBit(bitItems, HAS_REFERENTIAL);
} }
*destinationBuffer++ = bitItems; *destinationBuffer++ = bitItems;
// XXX leaving this for later use if (parent) {
if (false) { QByteArray referentialAsBytes = parent->getID().toRfc4122();
// destinationBuffer += _referential->packReferential(destinationBuffer); memcpy(destinationBuffer, referentialAsBytes.data(), referentialAsBytes.size());
destinationBuffer += referentialAsBytes.size();
memcpy(destinationBuffer, &_parentJointIndex, sizeof(_parentJointIndex));
destinationBuffer += sizeof(_parentJointIndex);
} }
// If it is connected, pack up the data // If it is connected, pack up the data
@ -541,8 +545,15 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
_headData->_isEyeTrackerConnected = oneAtBit(bitItems, IS_EYE_TRACKER_CONNECTED); _headData->_isEyeTrackerConnected = oneAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
bool hasReferential = oneAtBit(bitItems, HAS_REFERENTIAL); bool hasReferential = oneAtBit(bitItems, HAS_REFERENTIAL);
// XXX leaving this for later use Referential
if (hasReferential) { if (hasReferential) {
const int sizeOfPackedUuid = 16;
QByteArray referentialAsBytes((const char*)sourceBuffer, sizeOfPackedUuid);
_parentID = QUuid::fromRfc4122(referentialAsBytes);
sourceBuffer += sizeOfPackedUuid;
memcpy(&_parentJointIndex, sourceBuffer, sizeof(_parentJointIndex));
sourceBuffer += sizeof(_parentJointIndex);
} else {
_parentID = QUuid();
} }
if (_headData->_isFaceTrackerConnected) { if (_headData->_isFaceTrackerConnected) {

4
libraries/avatars/src/AvatarData.h
View file

@ -223,8 +223,8 @@ public:
// Scale // Scale
float getTargetScale() const; float getTargetScale() const;
void setTargetScale(float targetScale, bool overideReferential = false); void setTargetScale(float targetScale);
void setClampedTargetScale(float targetScale, bool overideReferential = false); void setClampedTargetScale(float targetScale);
// Hand State // Hand State
Q_INVOKABLE void setHandState(char s) { _handState = s; } Q_INVOKABLE void setHandState(char s) { _handState = s; }

2
libraries/shared/src/SpatiallyNestable.h
View file

@ -70,13 +70,13 @@ protected:
QUuid _id; QUuid _id;
QUuid _parentID; // what is this thing's transform relative to? QUuid _parentID; // what is this thing's transform relative to?
quint16 _parentJointIndex; // which joint of the parent is this relative to? quint16 _parentJointIndex; // which joint of the parent is this relative to?
SpatiallyNestablePointer getParentPointer() const;
mutable SpatiallyNestableWeakPointer _parent; mutable SpatiallyNestableWeakPointer _parent;
QVector<SpatiallyNestableWeakPointer> _children; QVector<SpatiallyNestableWeakPointer> _children;
private: private:
Transform _transform; // this is to be combined with parent's world-transform to produce this' world-transform. Transform _transform; // this is to be combined with parent's world-transform to produce this' world-transform.
SpatiallyNestablePointer getParentPointer() const;
// these are so we can return by reference // these are so we can return by reference
mutable glm::vec3 _absolutePositionCache; mutable glm::vec3 _absolutePositionCache;