Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

getMeshes handles registration point

Browse source
This commit is contained in:
Seth Alves 2017-07-19 15:02:40 -07:00
parent 8a732e7d4b
commit be48268be8
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -1736,9 +1736,7 @@ glm::mat4 EntityScriptingInterface::getEntityTransform(const QUuid& entityID) {
if (entity) { if (entity) {
glm::mat4 translation = glm::translate(entity->getPosition()); glm::mat4 translation = glm::translate(entity->getPosition());
glm::mat4 rotation = glm::mat4_cast(entity->getRotation()); glm::mat4 rotation = glm::mat4_cast(entity->getRotation());
glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - result = translation * rotation;
entity->getRegistrationPoint());
result = translation * rotation /* * registration */;
} }
}); });
} }
@ -1753,9 +1751,7 @@ glm::mat4 EntityScriptingInterface::getEntityLocalTransform(const QUuid& entityI
if (entity) { if (entity) {
glm::mat4 translation = glm::translate(entity->getLocalPosition()); glm::mat4 translation = glm::translate(entity->getLocalPosition());
glm::mat4 rotation = glm::mat4_cast(entity->getLocalOrientation()); glm::mat4 rotation = glm::mat4_cast(entity->getLocalOrientation());
glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - result = translation * rotation;
entity->getRegistrationPoint());
result = translation * rotation * registration;
} }
}); });
} }

9
libraries/render-utils/src/Model.cpp
View file

@ -473,16 +473,9 @@ bool Model::getMeshes(MeshProxyList& result) {
Transform offset; Transform offset;
offset.setScale(_scale); offset.setScale(_scale);
// offset.postTranslate(_offset); offset.postTranslate(_offset);
glm::mat4 offsetMat = offset.getMatrix(); glm::mat4 offsetMat = offset.getMatrix();
Extents modelExtents = getUnscaledMeshExtents();
glm::vec3 dimensions = modelExtents.maximum - modelExtents.minimum;
const glm::vec3 DEFAULT_ENTITY_REGISTRATION_POINT = glm::vec3(0.5f, 0.5f, 0.5f);
glm::vec3 regis = (DEFAULT_ENTITY_REGISTRATION_POINT - _registrationPoint);
glm::vec3 regisOffset = dimensions * regis;
for (std::shared_ptr<const model::Mesh> mesh : meshes) { for (std::shared_ptr<const model::Mesh> mesh : meshes) {
if (!mesh) { if (!mesh) {
continue; continue;