mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-10 23:38:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote

Browse Source 
* 'feature/remote' of openspace.itn.liu.se:/openspace:
  added buffering of samples and changed how samples are handled when received. fixed a bug where client did not regain control after host disconnected
This commit is contained in:
Joakim Kilby
2015-06-18 10:45:41 +02:00
parent 8f1f2dafa9 ca3628e505
commit 45c7053729
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/interaction/interactionhandler.cpp
View File

@@ -254,7 +254,9 @@ InteractionHandler::InteractionHandler()
, _invertRotation(false)
, _keyboardController(nullptr)
, _mouseController(nullptr)
, _currentKeyframeTime(-1.0)
{
//add 4 dummy keyframes
network::Keyframe kf;
kf._timeStamp = -std::numeric_limits<double>::max();
_keyframes.assign(4, kf);
@@ -353,18 +355,23 @@ void InteractionHandler::update(double deltaTime) {
_mouseController->update(deltaTime);
_keyframeMutex.lock();
//if the target keyframe has a valid timestamp and time within range
if (_keyframes[1]._timeStamp > 0.0){// && _currentKeyframeTime <= _keyframes[2]._timeStamp){
if (_keyframes.size() > 4){ //wait until enough samples are buffered
ghoul::Interpolator<ghoul::Interpolators::CatmullRom> positionInterpCR;
ghoul::Interpolator<ghoul::Interpolators::Linear> positionInterpLin;
ghoul::Interpolator<ghoul::Interpolators::Linear> quatInterpLin;
//interval check
if (_currentKeyframeTime < _keyframes[1]._timeStamp){
_currentKeyframeTime = _keyframes[1]._timeStamp;
}
double t0 = _keyframes[1]._timeStamp;
double t1 = _keyframes[2]._timeStamp;
double fact = (_currentKeyframeTime - t0) / (t1 - t0);
if (fact > 1.0){
printf("%f\n", fact);
fact = fmin(1.0, fact);
//fact = fmin(1.0, fact);
}
//glm::dvec4 v = positionInterpCR.interpolate(fact, _keyframes[0]._position.dvec4(), _keyframes[1]._position.dvec4(), _keyframes[2]._position.dvec4(), _keyframes[3]._position.dvec4());
glm::dvec4 v = positionInterpLin.interpolate(fact, _keyframes[1]._position.dvec4(), _keyframes[2]._position.dvec4());
@@ -372,19 +379,19 @@ void InteractionHandler::update(double deltaTime) {
glm::quat q = quatInterpLin.interpolate(fact, _keyframes[1]._viewRotationQuat, _keyframes[2]._viewRotationQuat);
//printf("---fact: %f\nT0: %f, T1%f\n, CURR:%f---\n", fact, t0, t1, _currentKeyframeTime);
//printf("Fact: %f\n", fact);
_camera->setPosition(pos);
_camera->setViewRotationMatrix(glm::mat4_cast(q));
_currentKeyframeTime += deltaTime;
_currentKeyframeTime = std::fmin(_currentKeyframeTime, t1);
//we're done with this sample interval
if (_currentKeyframeTime >= _keyframes[2]._timeStamp){
_keyframes.erase(_keyframes.begin());
_currentKeyframeTime = _keyframes[1]._timeStamp;
}
}
_keyframeMutex.unlock();
// printf("%f\n %f\n %f\n %f\n", _keyframes[0]._timeStamp, _keyframes[1]._timeStamp, _keyframes[2]._timeStamp, _keyframes[3]._timeStamp);
// printf("Current keys:\n, %s\n %s\n %s\n %s\n\n\n", _keyframes[0].to_string().c_str(), _keyframes[1].to_string().c_str(), _keyframes[2].to_string().c_str(), _keyframes[3].to_string().c_str());
}
void InteractionHandler::setFocusNode(SceneGraphNode* node) {
@@ -959,9 +966,13 @@ bool InteractionHandler::invertRotation() const {
void InteractionHandler::addKeyframe(const network::Keyframe &kf){
_keyframeMutex.lock();
_keyframes.erase(_keyframes.begin());
//save a maximum of 10 samples (1 seconds of buffer)
if (_keyframes.size() >= 10){
_keyframes.erase(_keyframes.begin());
}
_keyframes.push_back(kf);
_currentKeyframeTime = _keyframes[1]._timeStamp;
_keyframeMutex.unlock();
}

7
src/network/osparallelconnection.cpp
View File

@@ -312,6 +312,13 @@ namespace openspace {
_isHost.store(true);
_broadcastThread = new (std::nothrow) std::thread(&OSParallelConnection::broadcast, this);
}
//@TODO fix this to a more permanent solution
Keyframe kf;
kf._timeStamp = -1.0;
OsEng.interactionHandler()->addKeyframe(kf);
OsEng.interactionHandler()->addKeyframe(kf);
OsEng.interactionHandler()->addKeyframe(kf);
OsEng.interactionHandler()->addKeyframe(kf);
}
else{
//we were broadcasting but should stop now