History

EnitityItem smart pointers

ZappoMan committed 11 years ago

Commit 8b78fc41 parent 603528e69 files · +354 −302Browse files

Showing the changes to interface/src/avatar/ModelReferential.cpp (1 of 69 files). Show all

Unified · Split

interface/src/avatar/ModelReferential.cpp+7−7
@@ -30,7 +30,7 @@ ModelReferential::ModelReferential(Referential* referential, EntityTree* tree, A · 29 unmodified lines
30 return;30 return;
31 }31 }
32 32
33 const EntityItem* item = _tree->findEntityByID(_entityID);33 EntityItemPointer item = _tree->findEntityByID(_entityID);
34 if (item != NULL) {34 if (item != NULL) {
35 _lastRefDimension = item->getDimensions();35 _lastRefDimension = item->getDimensions();
36 _refRotation = item->getRotation();36 _refRotation = item->getRotation();
@@ -44,7 +44,7 @@ ModelReferential::ModelReferential(const QUuid& entityID, EntityTree* tree, Avat · 7 unmodified lines
44 _entityID(entityID),44 _entityID(entityID),
45 _tree(tree)45 _tree(tree)
46{46{
47 const EntityItem* item = _tree->findEntityByID(_entityID);47 EntityItemPointer item = _tree->findEntityByID(_entityID);
48 if (!isValid() || item == NULL) {48 if (!isValid() || item == NULL) {
49 qCDebug(interfaceapp) << "ModelReferential::constructor(): Not Valid";49 qCDebug(interfaceapp) << "ModelReferential::constructor(): Not Valid";
50 _isValid = false;50 _isValid = false;
@@ -61,7 +61,7 @@ ModelReferential::ModelReferential(const QUuid& entityID, EntityTree* tree, Avat · 10 unmodified lines
61}61}
62 62
63void ModelReferential::update() {63void ModelReferential::update() {
64 const EntityItem* item = _tree->findEntityByID(_entityID);64 EntityItemPointer item = _tree->findEntityByID(_entityID);
65 if (!isValid() || item == NULL || _avatar == NULL) {65 if (!isValid() || item == NULL || _avatar == NULL) {
66 return;66 return;
67 }67 }
@@ -105,7 +105,7 @@ JointReferential::JointReferential(Referential* referential, EntityTree* tree, A · 37 unmodified lines
105 return;105 return;
106 }106 }
107 107
108 const EntityItem* item = _tree->findEntityByID(_entityID);108 EntityItemPointer item = _tree->findEntityByID(_entityID);
109 const Model* model = getModel(item);109 const Model* model = getModel(item);
110 if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {110 if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {
111 _lastRefDimension = item->getDimensions();111 _lastRefDimension = item->getDimensions();
@@ -120,7 +120,7 @@ JointReferential::JointReferential(uint32_t jointIndex, const QUuid& entityID, E · 8 unmodified lines
120 _jointIndex(jointIndex)120 _jointIndex(jointIndex)
121{121{
122 _type = JOINT;122 _type = JOINT;
123 const EntityItem* item = _tree->findEntityByID(_entityID);123 EntityItemPointer item = _tree->findEntityByID(_entityID);
124 const Model* model = getModel(item);124 const Model* model = getModel(item);
125 if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {125 if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {
126 qCDebug(interfaceapp) << "JointReferential::constructor(): Not Valid";126 qCDebug(interfaceapp) << "JointReferential::constructor(): Not Valid";
@@ -139,7 +139,7 @@ JointReferential::JointReferential(uint32_t jointIndex, const QUuid& entityID, E · 12 unmodified lines
139}139}
140 140
141void JointReferential::update() {141void JointReferential::update() {
142 const EntityItem* item = _tree->findEntityByID(_entityID);142 EntityItemPointer item = _tree->findEntityByID(_entityID);
143 const Model* model = getModel(item);143 const Model* model = getModel(item);
144 if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {144 if (!isValid() || model == NULL || _jointIndex >= (uint32_t)(model->getJointStateCount())) {
145 return;145 return;
@@ -163,7 +163,7 @@ void JointReferential::update() { · 17 unmodified lines
163 }163 }
164}164}
165 165
166const Model* JointReferential::getModel(const EntityItem* item) {166const Model* JointReferential::getModel(EntityItemPointer item) {
167 EntityItemFBXService* fbxService = _tree->getFBXService();167 EntityItemFBXService* fbxService = _tree->getFBXService();
168 if (item != NULL && fbxService != NULL) {168 if (item != NULL && fbxService != NULL) {
169 return fbxService->getModelForEntityItem(item);169 return fbxService->getModelForEntityItem(item);