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

Fixing merge

Browse source
This commit is contained in:
Bradley Austin Davis 2015-08-06 11:52:38 -07:00
parent 7e60aee1bf
commit 985bdb2190
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,8 +44,6 @@ public:
void update(float deltaTime);
void preRender(RenderArgs* renderArgs);
void updateFromTrackers(float deltaTime);
const glm::mat4& getHMDSensorMatrix() const { return _hmdSensorMatrix; }
const glm::vec3& getHMDSensorPosition() const { return _hmdSensorPosition; }
const glm::quat& getHMDSensorOrientation() const { return _hmdSensorOrientation; }

5
interface/src/ui/overlays/Overlays.cpp
View file

@ -123,7 +123,6 @@ void Overlays::renderHUD(RenderArgs* renderArgs) {
}
}
<<<<<<< HEAD
void Overlays::disable() {
QWriteLocker lock(&_lock);
_enabled = false;
@ -132,7 +131,8 @@ void Overlays::disable() {
void Overlays::enable() {
QWriteLocker lock(&_lock);
_enabled = true;
=======
}
Overlay::Pointer Overlays::getOverlay(unsigned int id) const {
if (_overlaysHUD.contains(id)) {
return _overlaysHUD[id];
@ -141,7 +141,6 @@ Overlay::Pointer Overlays::getOverlay(unsigned int id) const {
return _overlaysWorld[id];
}
return nullptr;
>>>>>>> master
}
unsigned int Overlays::addOverlay(const QString& type, const QScriptValue& properties) {