Skip to content

GitLab

Commit b0df510b authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Applying interface changes

parent c32c541a
Show whitespace changes
Inline Side-by-side
src/VANetClientImpl.cpp
View file @ b0df510b
...@@ -840,18 +840,18 @@ public: ...@@ -840,18 +840,18 @@ public:
m_pProtocol->ClientSetSoundReceiverRealWorldPose( iID, v3Pos, qOrient ); m_pProtocol->ClientSetSoundReceiverRealWorldPose( iID, v3Pos, qOrient );
}; };
inline VAQuat GetSoundReceiverRealWorldHeadAboveTorsoOrientation( const int iID ) const inline VAQuat GetSoundReceiverRealWorldTorsoOrientation( const int iID ) const
{ {
VA_REQUIRE_CONNECTED; VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE; VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientGetSoundReceiverRealWorldHeadAboveTorsoOrientation( iID ); return m_pProtocol->ClientGetSoundReceiverRealWorldTorsoOrientation( iID );
}; };
inline void SetSoundReceiverRealWorldHeadAboveTorsoOrientation( const int iID, const VAQuat& qOrient ) inline void SetSoundReceiverRealWorldTorsoOrientation( const int iID, const VAQuat& qOrient )
{ {
VA_REQUIRE_CONNECTED; VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE; VA_MUTAL_EXCLUDE;
m_pProtocol->ClientSetSoundReceiverRealWorldHeadAboveTorsoOrientation( iID, qOrient ); m_pProtocol->ClientSetSoundReceiverRealWorldTorsoOrientation( iID, qOrient );
}; };
inline void GetSoundReceiverRealWorldPositionOrientationVU( const int iID, VAVec3& v3Pos, VAVec3& v3View, VAVec3& v3Up ) const inline void GetSoundReceiverRealWorldPositionOrientationVU( const int iID, VAVec3& v3Pos, VAVec3& v3View, VAVec3& v3Up ) const
......
src/VANetNetworkProtocol.cpp
View file @ b0df510b
...@@ -231,8 +231,8 @@ void CVANetNetworkProtocol::ServerCallFunctionByMessageType( const int nMessageT ...@@ -231,8 +231,8 @@ void CVANetNetworkProtocol::ServerCallFunctionByMessageType( const int nMessageT
SERVER_FUNCTION_MAPPING( VA_NP_SET_SOUND_RECEIVER_GEOMETRY_MESH, ServerGetSoundReceiverGeometryMesh() ); SERVER_FUNCTION_MAPPING( VA_NP_SET_SOUND_RECEIVER_GEOMETRY_MESH, ServerGetSoundReceiverGeometryMesh() );
SERVER_FUNCTION_MAPPING( VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_POSE, ServerSetSoundReceiverRealWorldPose() ); SERVER_FUNCTION_MAPPING( VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_POSE, ServerSetSoundReceiverRealWorldPose() );
SERVER_FUNCTION_MAPPING( VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_POSE, ServerGetSoundReceiverRealWorldPose() ); SERVER_FUNCTION_MAPPING( VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_POSE, ServerGetSoundReceiverRealWorldPose() );
SERVER_FUNCTION_MAPPING( VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_HEAD_ABOVE_TORSO_ORIENTATION, ServerSetSoundReceiverRealWorldHeadAboveTorsoOrientation() ); SERVER_FUNCTION_MAPPING( VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_TORSO_ORIENTATION, ServerSetSoundReceiverRealWorldTorsoOrientation() );
SERVER_FUNCTION_MAPPING( VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_HEAD_ABOVE_TORSO_ORIENTATION, ServerGetSoundReceiverRealWorldHeadAboveTorsoOrientation() ); SERVER_FUNCTION_MAPPING( VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_TORSO_ORIENTATION, ServerGetSoundReceiverRealWorldTorsoOrientation() );
// Scene // Scene
SERVER_FUNCTION_MAPPING( VA_NP_SCENE_CREATE, ServerCreateScene() ); SERVER_FUNCTION_MAPPING( VA_NP_SCENE_CREATE, ServerCreateScene() );
...@@ -2580,36 +2580,36 @@ void CVANetNetworkProtocol::ServerSetSoundReceiverRealWorldPositionOrientationVU ...@@ -2580,36 +2580,36 @@ void CVANetNetworkProtocol::ServerSetSoundReceiverRealWorldPositionOrientationVU
m_pRealCore->SetSoundReceiverRealWorldPositionOrientationVU( iID, v3Pos, v3View, v3Up ); m_pRealCore->SetSoundReceiverRealWorldPositionOrientationVU( iID, v3Pos, v3View, v3Up );
} }
VAQuat CVANetNetworkProtocol::ClientGetSoundReceiverRealWorldHeadAboveTorsoOrientation( const int iID ) VAQuat CVANetNetworkProtocol::ClientGetSoundReceiverRealWorldTorsoOrientation( const int iID )
{ {
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_HEAD_ABOVE_TORSO_ORIENTATION, MESSAGE_WITH_ANSWER ); CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_TORSO_ORIENTATION, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iID ); pMsg->WriteInt( iID );
ClientSendCommand( pMsg ); ClientSendCommand( pMsg );
return pMsg->ReadQuat(); return pMsg->ReadQuat();
} }
void CVANetNetworkProtocol::ServerGetSoundReceiverRealWorldHeadAboveTorsoOrientation() void CVANetNetworkProtocol::ServerGetSoundReceiverRealWorldTorsoOrientation()
{ {
CVANetMessage* pMsg = ServerGetMessage(); CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt(); const int iID = pMsg->ReadInt();
const VAQuat qHATOOrient = m_pRealCore->GetSoundReceiverRealWorldHeadAboveTorsoOrientation( iID ); const VAQuat qHATOOrient = m_pRealCore->GetSoundReceiverRealWorldTorsoOrientation( iID );
pMsg->WriteQuat( qHATOOrient ); pMsg->WriteQuat( qHATOOrient );
} }
void CVANetNetworkProtocol::ClientSetSoundReceiverRealWorldHeadAboveTorsoOrientation( const int iID, const VAQuat& qOrient ) void CVANetNetworkProtocol::ClientSetSoundReceiverRealWorldTorsoOrientation( const int iID, const VAQuat& qOrient )
{ {
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_HEAD_ABOVE_TORSO_ORIENTATION, MESSAGE_ALLOWS_BUFFERING ); CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_TORSO_ORIENTATION, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID ); pMsg->WriteInt( iID );
pMsg->WriteQuat( qOrient ); pMsg->WriteQuat( qOrient );
ClientSendCommand( pMsg ); ClientSendCommand( pMsg );
} }
void CVANetNetworkProtocol::ServerSetSoundReceiverRealWorldHeadAboveTorsoOrientation() void CVANetNetworkProtocol::ServerSetSoundReceiverRealWorldTorsoOrientation()
{ {
CVANetMessage* pMsg = ServerGetMessage(); CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt(); const int iID = pMsg->ReadInt();
const VAQuat qHATOOrient = pMsg->ReadQuat(); const VAQuat qHATOOrient = pMsg->ReadQuat();
m_pRealCore->SetSoundReceiverRealWorldHeadAboveTorsoOrientation( iID, qHATOOrient ); m_pRealCore->SetSoundReceiverRealWorldTorsoOrientation( iID, qHATOOrient );
} }
......
src/VANetNetworkProtocol.h
View file @ b0df510b
...@@ -187,8 +187,8 @@ public: ...@@ -187,8 +187,8 @@ public:
static const int VA_NP_SET_SOUND_RECEIVER_GEOMETRY_MESH = 934; static const int VA_NP_SET_SOUND_RECEIVER_GEOMETRY_MESH = 934;
static const int VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_POSE = 935; static const int VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_POSE = 935;
static const int VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_POSE = 936; static const int VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_POSE = 936;
static const int VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_HEAD_ABOVE_TORSO_ORIENTATION = 937; static const int VA_NP_GET_SOUND_RECEIVER_REAL_WORLD_TORSO_ORIENTATION = 937;
static const int VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_HEAD_ABOVE_TORSO_ORIENTATION = 938; static const int VA_NP_SET_SOUND_RECEIVER_REAL_WORLD_TORSO_ORIENTATION = 938;
static const int VA_NP_GET_SOUND_RECEIVER_INFO = 939; static const int VA_NP_GET_SOUND_RECEIVER_INFO = 939;
static const int VA_NP_CREATE_SOUND_RECEIVER_EXPLICIT_RENDERER = 940; static const int VA_NP_CREATE_SOUND_RECEIVER_EXPLICIT_RENDERER = 940;
...@@ -677,10 +677,10 @@ public: ...@@ -677,10 +677,10 @@ public:
void ClientSetSoundReceiverRealWorldPositionOrientationVU( const int iID, const VAVec3& v3Pos, const VAVec3& v3View, const VAVec3& v3Up ); void ClientSetSoundReceiverRealWorldPositionOrientationVU( const int iID, const VAVec3& v3Pos, const VAVec3& v3View, const VAVec3& v3Up );
void ServerSetSoundReceiverRealWorldPositionOrientationVU(); void ServerSetSoundReceiverRealWorldPositionOrientationVU();
VAQuat ClientGetSoundReceiverRealWorldHeadAboveTorsoOrientation( const int iID ); VAQuat ClientGetSoundReceiverRealWorldTorsoOrientation( const int iID );
void ServerGetSoundReceiverRealWorldHeadAboveTorsoOrientation(); void ServerGetSoundReceiverRealWorldTorsoOrientation();
void ClientSetSoundReceiverRealWorldHeadAboveTorsoOrientation( const int iID, const VAQuat& qOrient ); void ClientSetSoundReceiverRealWorldTorsoOrientation( const int iID, const VAQuat& qOrient );
void ServerSetSoundReceiverRealWorldHeadAboveTorsoOrientation(); void ServerSetSoundReceiverRealWorldTorsoOrientation();
std::string ClientCreateScene( const CVAStruct& oParams, const std::string& sName ); std::string ClientCreateScene( const CVAStruct& oParams, const std::string& sName );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment