History

getMeshes handles registration point

Seth Alves committed 9 years ago

Commit be482681 parent 8a732e72 files · +3 −14Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−6
@@ -1736,9 +1736,7 @@ glm::mat4 EntityScriptingInterface::getEntityTransform(const QUuid& entityID) { · 1735 unmodified lines
17361736 if (entity) {
17371737 glm::mat4 translation = glm::translate(entity->getPosition());
17381738 glm::mat4 rotation = glm::mat4_cast(entity->getRotation());
1739− glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT -
1740− entity->getRegistrationPoint());
1741− result = translation * rotation /* * registration */;
1739+ result = translation * rotation;
17421740 }
17431741 });
17441742 }
@@ -1753,9 +1751,7 @@ glm::mat4 EntityScriptingInterface::getEntityLocalTransform(const QUuid& entityI · 8 unmodified lines
17531751 if (entity) {
17541752 glm::mat4 translation = glm::translate(entity->getLocalPosition());
17551753 glm::mat4 rotation = glm::mat4_cast(entity->getLocalOrientation());
1756− glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT -
1757− entity->getRegistrationPoint());
1758− result = translation * rotation * registration;
1754+ result = translation * rotation;
17591755 }
17601756 });
17611757 }