Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -806,19 +806,19 @@ glm::vec3 EntityScriptingInterface::localCoordsToVoxelCoords(const QUuid& entity · 805 unmodified lines | |||
| 806 | } | 806 | } |
| 807 | } | 807 | } |
| 808 | 808 | ||
| 809 | glm::vec3 EntityScriptingInterface::getJointTranslation(const QUuid& entityID, int jointIndex) { | 809 | glm::vec3 EntityScriptingInterface::getAbsoluteJointTranslationInObjectFrame(const QUuid& entityID, int jointIndex) { |
| 810 | if (auto entity = checkForTreeEntityAndTypeMatch(entityID, EntityTypes::Model)) { | 810 | if (auto entity = checkForTreeEntityAndTypeMatch(entityID, EntityTypes::Model)) { |
| 811 | auto modelEntity = std::dynamic_pointer_cast<ModelEntityItem>(entity); | 811 | auto modelEntity = std::dynamic_pointer_cast<ModelEntityItem>(entity); |
| 812 | return modelEntity->getJointTranslation(jointIndex); | 812 | return modelEntity->getAbsoluteJointTranslationInObjectFrame(jointIndex); |
| 813 | } else { | 813 | } else { |
| 814 | return glm::vec3(0.0f); | 814 | return glm::vec3(0.0f); |
| 815 | } | 815 | } |
| 816 | } | 816 | } |
| 817 | 817 | ||
| 818 | glm::quat EntityScriptingInterface::getJointRotation(const QUuid& entityID, int jointIndex) { | 818 | glm::quat EntityScriptingInterface::getAbsoluteJointRotationInObjectFrame(const QUuid& entityID, int jointIndex) { |
| 819 | if (auto entity = checkForTreeEntityAndTypeMatch(entityID, EntityTypes::Model)) { | 819 | if (auto entity = checkForTreeEntityAndTypeMatch(entityID, EntityTypes::Model)) { |
| 820 | auto modelEntity = std::dynamic_pointer_cast<ModelEntityItem>(entity); | 820 | auto modelEntity = std::dynamic_pointer_cast<ModelEntityItem>(entity); |
| 821 | return modelEntity->getJointRotation(jointIndex); | 821 | return modelEntity->getAbsoluteJointRotationInObjectFrame(jointIndex); |
| 822 | } else { | 822 | } else { |
| 823 | return glm::quat(); | 823 | return glm::quat(); |
| 824 | } | 824 | } |