Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 04:27:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed build errors for mac and linux

Browse source
This commit is contained in:
amantley 2018-07-09 15:09:45 -07:00
parent a2f8e024fb
commit cb421fd5b0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -112,14 +112,14 @@ MyAvatar::MyAvatar(QThread* thread) :
_hmdSensorMatrix(), _hmdSensorMatrix(),
_hmdSensorOrientation(), _hmdSensorOrientation(),
_hmdSensorPosition(), _hmdSensorPosition(),
_recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE),
_bodySensorMatrix(), _bodySensorMatrix(),
_goToPending(false), _goToPending(false),
_goToPosition(), _goToPosition(),
_goToOrientation(), _goToOrientation(),
_prevShouldDrawHead(true), _prevShouldDrawHead(true),
_audioListenerMode(FROM_HEAD), _audioListenerMode(FROM_HEAD),
_hmdAtRestDetector(glm::vec3(0), glm::quat()), _hmdAtRestDetector(glm::vec3(0), glm::quat())
_recentModeReadings(MODE_READINGS_RING_BUFFER_SIZE)
{ {
// give the pointer to our head to inherited _headData variable from AvatarData // give the pointer to our head to inherited _headData variable from AvatarData

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

@ -883,7 +883,7 @@ public:
virtual void rebuildCollisionShape() override; virtual void rebuildCollisionShape() override;
const glm::vec2& getHeadControllerFacingMovingAverage() const { return _headControllerFacingMovingAverage; } const glm::vec2& getHeadControllerFacingMovingAverage() const { return _headControllerFacingMovingAverage; }
const float getCurrentStandingHeight() const { return _currentStandingHeight; } float getCurrentStandingHeight() const { return _currentStandingHeight; }
void setCurrentStandingHeight(float newMode) { _currentStandingHeight = newMode; } void setCurrentStandingHeight(float newMode) { _currentStandingHeight = newMode; }
const glm::quat getAverageHeadRotation() const { return _averageHeadRotation; } const glm::quat getAverageHeadRotation() const { return _averageHeadRotation; }
void setAverageHeadRotation(glm::quat rotation) { _averageHeadRotation = rotation; } void setAverageHeadRotation(glm::quat rotation) { _averageHeadRotation = rotation; }