mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 02:48:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

GCC compile fix

Browse Source
This commit is contained in:
Alexander Bock
2019-08-22 09:39:01 +02:00
parent 21d799dd29
commit 5675a495b0
2 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/interaction/externinteraction.cpp
View File

@@ -40,42 +40,39 @@
#include <ghoul/logging/logmanager.h>
namespace {
const uint32_t ProtocolVersion = 3;
const size_t MaxLatencyDiffs = 64;
const char* _loggerCat = "ExternInteraction";
constexpr const uint32_t ProtocolVersion = 3;
constexpr const size_t MaxLatencyDiffs = 64;
constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = {
"BufferTime",
"Buffer Time",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = {
"BufferTime",
"Buffer Time",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = {
"TimeKeyframeInterval",
"Time keyframe interval",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = {
"TimeKeyframeInterval",
"Time keyframe interval",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = {
"CameraKeyframeInterval",
"Camera Keyframe interval",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo TimeToleranceInfo = {
"TimeTolerance",
"Time tolerance",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = {
"CameraKeyframeInterval",
"Camera Keyframe interval",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo TimeToleranceInfo = {
"TimeTolerance",
"Time tolerance",
"" // @TODO Missing documentation
};
} // namespace
namespace openspace {
ExternInteraction::ExternInteraction()
: properties::PropertyOwner({ "ExternInteration", "External Interaction" })
{
}
{}
void ExternInteraction::cameraInteraction(datamessagestructures::CameraKeyframe kf) {
interaction::KeyframeNavigator::CameraPose pose;

1
src/interaction/websocketinputstate.cpp
View File

@@ -26,6 +26,7 @@
#include <ghoul/misc/invariants.h>
#include <ghoul/misc/stringconversion.h>
#include <algorithm>
#include <map>
#include <numeric>