Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6017 from ZappoMan/animationGroupSettings

Browse source 
fix a bunch of warnings
This commit is contained in:
Andrew Meadows 2015-10-07 15:50:20 -07:00
commit ef58238c66
7 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/Application.cpp
View file

@ -4751,24 +4751,6 @@ mat4 Application::getEyeProjection(int eye) const {
return _viewFrustum.getProjection();
}
mat4 Application::getEyePose(int eye) const {
if (isHMDMode()) {
auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
float IPDScale = hmdInterface->getIPDScale();
auto displayPlugin = getActiveDisplayPlugin();
mat4 headPose = displayPlugin->getHeadPose();
mat4 eyeToHead = displayPlugin->getEyeToHeadTransform((Eye)eye);
{
vec3 eyeOffset = glm::vec3(eyeToHead[3]);
// Apply IPD scaling
mat4 eyeOffsetTransform = glm::translate(mat4(), eyeOffset * -1.0f * IPDScale);
eyeToHead[3] = vec4(eyeOffset, 1.0);
}
return eyeToHead * headPose;
}
return mat4();
}
mat4 Application::getEyeOffset(int eye) const {
// FIXME invert?
return getActiveDisplayPlugin()->getEyeToHeadTransform((Eye)eye);

1
interface/src/Application.h
View file

@ -198,7 +198,6 @@ public:
// TODO: carry that information on the Camera as a setting
bool isHMDMode() const;
glm::mat4 getHMDSensorPose() const;
glm::mat4 getEyePose(int eye) const;
glm::mat4 getEyeOffset(int eye) const;
glm::mat4 getEyeProjection(int eye) const;

2
libraries/entities/src/AnimationPropertyGroup.cpp
View file

@ -249,6 +249,8 @@ bool AnimationPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyF
processedBytes += bytesRead;
Q_UNUSED(somethingChanged);
return true;
}

2
libraries/entities/src/AtmospherePropertyGroup.cpp
View file

@ -108,6 +108,8 @@ bool AtmospherePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& property
processedBytes += bytesRead;
Q_UNUSED(somethingChanged);
return true;
}

2
libraries/entities/src/SkyboxPropertyGroup.cpp
View file

@ -66,6 +66,8 @@ bool SkyboxPropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlag
processedBytes += bytesRead;
Q_UNUSED(somethingChanged);
return true;
}

2
libraries/entities/src/StagePropertyGroup.cpp
View file

@ -121,6 +121,8 @@ bool StagePropertyGroup::decodeFromEditPacket(EntityPropertyFlags& propertyFlags
processedBytes += bytesRead;
Q_UNUSED(somethingChanged);
return true;
}

2
libraries/networking/src/udt/PacketQueue.cpp
View file

@ -55,7 +55,7 @@ PacketQueue::PacketPointer PacketQueue::takePacket() {
}
unsigned int PacketQueue::nextIndex() {
_currentIndex = (++_currentIndex) % _channels.size();
_currentIndex = (_currentIndex + 1) % _channels.size();
return _currentIndex;
}