Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:17:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4459 from ctrlaltdavid/20400

Browse source 
CR for 20400 - Name tags going through the head
This commit is contained in:
Brad Hefta-Gaub 2015-03-17 21:54:13 -07:00
commit 53ae4b48bc
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/avatar/Avatar.cpp
View file

@ -1013,16 +1013,18 @@ float Avatar::getSkeletonHeight() const {
} }
float Avatar::getHeadHeight() const { float Avatar::getHeadHeight() const {
Extents extents = getHead()->getFaceModel().getBindExtents(); Extents extents = getHead()->getFaceModel().getMeshExtents();
if (!extents.isEmpty()) { if (!extents.isEmpty()) {
return extents.maximum.y - extents.minimum.y; return extents.maximum.y - extents.minimum.y;
} }
extents = _skeletonModel.getMeshExtents();
glm::vec3 neckPosition; glm::vec3 neckPosition;
glm::vec3 headPosition; if (!extents.isEmpty() && _skeletonModel.getNeckPosition(neckPosition)) {
if (_skeletonModel.getNeckPosition(neckPosition) && _skeletonModel.getHeadPosition(headPosition)) { return extents.maximum.y / 2.0f - neckPosition.y + _position.y;
return glm::distance(neckPosition, headPosition);
} }
const float DEFAULT_HEAD_HEIGHT = 0.1f;
const float DEFAULT_HEAD_HEIGHT = 0.25f;
return DEFAULT_HEAD_HEIGHT; return DEFAULT_HEAD_HEIGHT;
} }