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

fix lasers scale issue

Browse source
This commit is contained in:
danteruiz 2019-03-12 14:26:59 -07:00
parent a7e3495cfb
commit 6303f61cc3
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; float getUserEyeHeight() const;
virtual SpatialParentTree* getParentTree() const override; virtual SpatialParentTree* getParentTree() const override;
virtual glm::vec3 scaleForChildren() const override { return glm::vec3(getSensorToWorldScale()); }
const QUuid& getSelfID() const { return AVATAR_SELF_ID; } const QUuid& getSelfID() const { return AVATAR_SELF_ID; }

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

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