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

temporarily removed references to keyframes in interactionhandler.

Browse Source 
changed how keyframes are encoded/decoded and sent in osparallelconnection
This commit is contained in:
Joakim Kilby
2015-06-17 11:18:50 +02:00
parent 9d6b9a3ad1
commit 4e4cf4cd6a
4 changed files with 59 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/osparallelconnection.cpp
View File

@@ -262,11 +262,11 @@ namespace openspace {
}
void OSParallelConnection::decodeDataMessage(){
printf("Data message received!\n");
// printf("Data message received!\n");
int result;
uint16_t msglen;
std::vector<char> buffer;
buffer.reserve(sizeof(msglen));
buffer.resize(sizeof(msglen));
result = receiveData(_clientSocket, buffer, sizeof(msglen), 0);
if (result <= 0){
@@ -277,13 +277,19 @@ namespace openspace {
msglen = (*(reinterpret_cast<uint16_t*>(buffer.data())));
buffer.clear();
buffer.reserve(msglen);
buffer.resize(msglen);
result = receiveData(_clientSocket, buffer, msglen, 0);
if (result <= 0){
//error
return;
}
network::Keyframe kf;
kf.deserialize(buffer);
printf("--- %f ---\n", kf._timeStamp);
// OsEng.interactionHandler()->addKeyframe(kf);
}
void OSParallelConnection::decodeHostInfoMessage(){
@@ -516,9 +522,10 @@ namespace openspace {
kf._viewRotationQuat = glm::quat_cast(OsEng.interactionHandler()->camera()->viewRotationMatrix());
kf._timeStamp = Time::ref().currentTime();
std::string msg = kf.to_string();
uint16_t msglen = static_cast<uint16_t>(msg.length());
std::vector<char> kfBuffer;
kf.serialize(kfBuffer);
uint16_t msglen = static_cast<uint16_t>(kfBuffer.size());
std::vector<char> buffer;
buffer.reserve(headerSize + sizeof(msglen) + msglen);
@@ -536,7 +543,7 @@ namespace openspace {
buffer.insert(buffer.end(), reinterpret_cast<char*>(&msglen), reinterpret_cast<char*>(&msglen) + sizeof(msglen));
//actual message
buffer.insert(buffer.end(), msg.begin(), msg.end());
buffer.insert(buffer.end(), kfBuffer.begin(), kfBuffer.end());
//send message
send(_clientSocket, buffer.data(), buffer.size(), 0);