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