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

better property names

Browse source
This commit is contained in:
luiscuenca 2018-09-13 15:22:18 -07:00
parent 6a9a898b62
commit c5669ef1f5
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/avatar/MyAvatar.cpp
View file

@ -149,8 +149,8 @@ MyAvatar::MyAvatar(QThread* thread) :
}); });
connect(_skeletonModel.get(), &Model::rigReady, this, &Avatar::rigReady); connect(_skeletonModel.get(), &Model::rigReady, this, &Avatar::rigReady);
connect(_skeletonModel.get(), &Model::rigReset, this, &Avatar::rigReset); connect(_skeletonModel.get(), &Model::rigReset, this, &Avatar::rigReset);
connect(&_skeletonModel->getRig(), &Rig::onLoadComplete, this, &MyAvatar::updateCollisionCapsule); connect(&_skeletonModel->getRig(), &Rig::onLoadComplete, this, &MyAvatar::updateCollisionCapsuleCache);
connect(this, &MyAvatar::sensorToWorldScaleChanged, this, &MyAvatar::updateCollisionCapsule); connect(this, &MyAvatar::sensorToWorldScaleChanged, this, &MyAvatar::updateCollisionCapsuleCache);
using namespace recording; using namespace recording;
_skeletonModel->flagAsCauterized(); _skeletonModel->flagAsCauterized();
@ -3309,7 +3309,7 @@ bool MyAvatar::getCollisionsEnabled() {
return _characterController.computeCollisionGroup() != BULLET_COLLISION_GROUP_COLLISIONLESS; return _characterController.computeCollisionGroup() != BULLET_COLLISION_GROUP_COLLISIONLESS;
} }
void MyAvatar::updateCollisionCapsule() { void MyAvatar::updateCollisionCapsuleCache() {
glm::vec3 start, end; glm::vec3 start, end;
float radius; float radius;
getCapsule(start, end, radius); getCapsule(start, end, radius);
@ -3317,12 +3317,12 @@ void MyAvatar::updateCollisionCapsule() {
capsule["start"] = vec3toVariant(start); capsule["start"] = vec3toVariant(start);
capsule["end"] = vec3toVariant(end); capsule["end"] = vec3toVariant(end);
capsule["radius"] = QVariant(radius); capsule["radius"] = QVariant(radius);
_capsuleShape.set(capsule); _collisionCapsuleCache.set(capsule);
} }
// thread safe // thread safe
QVariantMap MyAvatar::getCollisionCapsule() const { QVariantMap MyAvatar::getCollisionCapsule() const {
return _capsuleShape.get(); return _collisionCapsuleCache.get();
} }
void MyAvatar::setCharacterControllerEnabled(bool enabled) { void MyAvatar::setCharacterControllerEnabled(bool enabled) {

2
interface/src/avatar/MyAvatar.h
View file

@ -1505,7 +1505,7 @@ signals:
private slots: private slots:
void leaveDomain(); void leaveDomain();
void updateCollisionCapsule(); void updateCollisionCapsuleCache();
protected: protected:
virtual void beParentOfChild(SpatiallyNestablePointer newChild) const override; virtual void beParentOfChild(SpatiallyNestablePointer newChild) const override;

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

@ -1444,7 +1444,7 @@ protected:
ThreadSafeValueCache<glm::mat4> _farGrabLeftMatrixCache { glm::mat4() }; ThreadSafeValueCache<glm::mat4> _farGrabLeftMatrixCache { glm::mat4() };
ThreadSafeValueCache<glm::mat4> _farGrabMouseMatrixCache { glm::mat4() }; ThreadSafeValueCache<glm::mat4> _farGrabMouseMatrixCache { glm::mat4() };
ThreadSafeValueCache<QVariantMap> _capsuleShape { QVariantMap() }; ThreadSafeValueCache<QVariantMap> _collisionCapsuleCache{ QVariantMap() };
int getFauxJointIndex(const QString& name) const; int getFauxJointIndex(const QString& name) const;