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

fixes merge issues

Browse source
This commit is contained in:
Thijs Wenker 2015-10-06 20:20:37 +02:00
parent 953ff6caa7
commit 3c6e9378c3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -4981,7 +4981,7 @@ mat4 Application::getEyeProjection(int eye) const {
mat4 Application::getEyePose(int eye) const { mat4 Application::getEyePose(int eye) const {
if (isHMDMode()) { if (isHMDMode()) {
return getActiveDisplayPlugin()->getEyePose((Eye)eye); return getActiveDisplayPlugin()->getEyePose((Eye)eye);
} }
return mat4(); return mat4();
} }
@ -4990,7 +4990,7 @@ mat4 Application::getEyeOffset(int eye) const {
if (isHMDMode()) { if (isHMDMode()) {
mat4 identity; mat4 identity;
return getActiveDisplayPlugin()->getView((Eye)eye, identity); return getActiveDisplayPlugin()->getView((Eye)eye, identity);
} }
return mat4(); return mat4();
} }

4
libraries/octree/src/OctreeHeadlessViewer.h
View file

@ -53,8 +53,8 @@ public slots:
void setMaxPacketsPerSecond(int maxPacketsPerSecond) { _maxPacketsPerSecond = maxPacketsPerSecond; } void setMaxPacketsPerSecond(int maxPacketsPerSecond) { _maxPacketsPerSecond = maxPacketsPerSecond; }
// getters for camera attributes // getters for camera attributes
const glm::vec3 getPosition() const { return _viewFrustum.getPosition(); } const glm::vec3& getPosition() const { return _viewFrustum.getPosition(); }
const glm::quat getOrientation() const { return _viewFrustum.getOrientation(); } const glm::quat& getOrientation() const { return _viewFrustum.getOrientation(); }
// getters for LOD and PPS // getters for LOD and PPS
float getVoxelSizeScale() const { return _voxelSizeScale; } float getVoxelSizeScale() const { return _voxelSizeScale; }