Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 14:42:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15163 from danteruiz/fix-laser-scaling

Browse source 
Case 21499: Lasers are offset in front of hands after scaling avatar down then relaunching
This commit is contained in:
Shannon Romano 2019-03-21 13:13:18 -07:00 committed by GitHub
commit 33e73953eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/MyAvatar.h
View file

@ -1122,6 +1122,7 @@ public:
float getUserEyeHeight() const;
virtual SpatialParentTree* getParentTree() const override;
virtual glm::vec3 scaleForChildren() const override { return glm::vec3(getSensorToWorldScale()); }
const QUuid& getSelfID() const { return AVATAR_SELF_ID; }

6
libraries/shared/src/NestableTransformNode.h
View file

@ -20,8 +20,10 @@ public:
_jointIndex(jointIndex) {
auto nestablePointer = _spatiallyNestable.lock();
if (nestablePointer) {
glm::vec3 nestableDimensions = getActualScale(nestablePointer);
_baseScale = glm::max(glm::vec3(0.001f), nestableDimensions);
if (nestablePointer->getNestableType() != NestableType::Avatar) {
glm::vec3 nestableDimensions = getActualScale(nestablePointer);
_baseScale = glm::max(glm::vec3(0.001f), nestableDimensions);
}
}
}