mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 05:29:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection

Browse Source 
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
This commit is contained in:
Emil Axelsson
2016-09-22 19:33:05 +02:00
parent 112fe7fc54 d8ca2965eb
commit cd325686ad
311 changed files with 12363 additions and 4144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/networkengine.cpp
View File

@@ -95,8 +95,8 @@ void NetworkEngine::publishStatusMessage() {
uint16_t messageSize = 0;
double time = Time::ref().currentTime();
std::string timeString = Time::ref().currentTimeUTC();
double time = Time::ref().j2000Seconds();
std::string timeString = Time::ref().UTC();
double delta = Time::ref().deltaTime();
messageSize += sizeof(time);

2
src/network/parallelconnection.cpp
View File

@@ -994,7 +994,7 @@ void ParallelConnection::sendTimeKeyframe() {
kf._dt = Time::ref().deltaTime();
kf._paused = Time::ref().paused();
kf._requiresTimeJump = _timeJumped;
kf._time = Time::ref().currentTime();
kf._time = Time::ref().j2000Seconds();
//timestamp as current runtime of OpenSpace instance
kf._timestamp = OsEng.runTime();