mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 05:23:33 +02:00
smart pointer
This commit is contained in:
parent
e94199acad
commit
c3754d6369
2 changed files with 4 additions and 4 deletions
|
@ -1186,8 +1186,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
|
||||||
_entityEditSender.setMyAvatar(myAvatar.get());
|
_entityEditSender.setMyAvatar(myAvatar.get());
|
||||||
|
|
||||||
// The entity octree will have to know about MyAvatar for the parentJointName import
|
// The entity octree will have to know about MyAvatar for the parentJointName import
|
||||||
getEntities()->getTree()->setMyAvatar(myAvatar.get());
|
getEntities()->getTree()->setMyAvatar(myAvatar);
|
||||||
_entityClipboard->setMyAvatar(myAvatar.get());
|
_entityClipboard->setMyAvatar(myAvatar);
|
||||||
|
|
||||||
// For now we're going to set the PPS for outbound packets to be super high, this is
|
// For now we're going to set the PPS for outbound packets to be super high, this is
|
||||||
// probably not the right long term solution. But for now, we're going to do this to
|
// probably not the right long term solution. But for now, we're going to do this to
|
||||||
|
|
|
@ -278,7 +278,7 @@ public:
|
||||||
QByteArray computeEncryptedNonce(const QString& certID, const QString ownerKey);
|
QByteArray computeEncryptedNonce(const QString& certID, const QString ownerKey);
|
||||||
bool verifyDecryptedNonce(const QString& certID, const QString& decryptedNonce, EntityItemID& id);
|
bool verifyDecryptedNonce(const QString& certID, const QString& decryptedNonce, EntityItemID& id);
|
||||||
|
|
||||||
void setMyAvatar(AvatarData* myAvatar) { _myAvatar = myAvatar; }
|
void setMyAvatar(std::shared_ptr<AvatarData> myAvatar) { _myAvatar = myAvatar; }
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void deletingEntity(const EntityItemID& entityID);
|
void deletingEntity(const EntityItemID& entityID);
|
||||||
|
@ -386,7 +386,7 @@ private:
|
||||||
void sendChallengeOwnershipRequestPacket(const QByteArray& certID, const QByteArray& encryptedText, const QByteArray& nodeToChallenge, const SharedNodePointer& senderNode);
|
void sendChallengeOwnershipRequestPacket(const QByteArray& certID, const QByteArray& encryptedText, const QByteArray& nodeToChallenge, const SharedNodePointer& senderNode);
|
||||||
void validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation);
|
void validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation);
|
||||||
|
|
||||||
AvatarData* _myAvatar{ nullptr };
|
std::shared_ptr<AvatarData> _myAvatar{ nullptr };
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // hifi_EntityTree_h
|
#endif // hifi_EntityTree_h
|
||||||
|
|
Loading…
Reference in a new issue