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

More progress

parent 58aa01ba
......@@ -20,7 +20,7 @@
#include <list>
// Forward declarations
class IVACore;
class IVAInterface;
/**
* Diese Klasse definiert die Schnittstelle fr Netzwerk-Servers des VACore.
......@@ -76,7 +76,7 @@ public:
* Rckgabe: Statuscode
*/
// @todo: enforce setting real core in initialize call
virtual int Initialize( const std::string& sInterface, int iServerPort = VANET_DEFAULT_PORT, int iFreePortMin = 10000, int iFreePortMax = 11000, int iMaxNumClients = -1 ) = 0;
virtual int Initialize( const std::string& sInterface, const int iServerPort = VANET_DEFAULT_PORT, const int iFreePortMin = 10000, const int iFreePortMax = 11000, const int iMaxNumClients = -1 ) = 0;
/**
* Server initialisieren
......@@ -89,7 +89,7 @@ public:
*
* Rckgabe: Statuscode
*/
virtual int Initialize( const std::string& sInterface, int iServerPort, const tPortList& liFreePorts, int iMaxNumClients = -1 ) = 0;
virtual int Initialize( const std::string& sInterface, const int iServerPort, const tPortList& liFreePorts, const int iMaxNumClients = -1 ) = 0;
// Vorhandene Serververbindungen trennen und Server beenden
// (Rckgabe: Statuscode)
......@@ -105,11 +105,11 @@ public:
virtual int GetServerPort() const = 0;
// Zugewiesene VACore-Instanz zurckgeben
virtual IVACore* GetCoreInstance() const = 0;
virtual IVAInterface* GetCoreInstance() const = 0;
// Zu steuernde VACore-Instanz zuweisen
// (NULL entfernt den Kern)
virtual void SetCoreInstance( IVACore* pCore ) = 0;
virtual void SetCoreInstance( IVAInterface* pCore ) = 0;
//// Gibt zurck, ob der Server aktiviert ist
//// und eingehende Befehle an den zugewiesenen Kern weiterleitet
......@@ -142,7 +142,7 @@ public:
int iType; // Typ der Ereignisses
std::string sClient; //
inline CEvent()
inline CEvent()
: iType( EVENT_NOTHING )
{};
......
......@@ -837,14 +837,14 @@ public:
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientGetPortalIDs( viIDs );
m_pProtocol->ClientGetSoundPortalIDs( viIDs );
}
inline std::string GetPortalName( const int iID ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientGetPortalName( iID );
return m_pProtocol->ClientGetSoundPortalName( iID );
}
virtual void SetPortalName( int iPortalID, const std::string& sName ) {
......
This diff is collapsed.
......@@ -186,14 +186,19 @@ public:
static const int VA_NP_GET_SOUND_RECEIVER_ENABLED = 928;
// Scene
static const int VA_NP_LOAD_SCENE = 1000;
static const int VA_NP_IS_SCENE_LOADED = 1001;
static const int VA_NP_SCENE_CREATE = 1000;
static const int VA_NP_GET_SCENE_IDS = 1001;
static const int VA_NP_GET_SCENE_INFO = 1002;
static const int VA_NP_GET_PORTAL_IDS = 1003;
static const int VA_NP_GET_PORTAL_NAME = 1004;
static const int VA_NP_SET_PORTAL_NAME = 1005;
static const int VA_NP_GET_PORTAL_PARAMETERS = 1006;
static const int VA_NP_SET_PORTAL_STATE = 1007;
static const int VA_NP_GET_SCENE_NAME = 1003;
static const int VA_NP_SET_SCENE_NAME = 1004;
static const int VA_NP_GET_SCENE_ENABLED = 1005;
static const int VA_NP_SET_SCENE_ENABLED = 1006;
static const int VA_NP_GET_PORTAL_IDS = 1013;
static const int VA_NP_GET_PORTAL_NAME = 1014;
static const int VA_NP_SET_PORTAL_NAME = 1015;
static const int VA_NP_GET_PORTAL_PARAMETERS = 1016;
static const int VA_NP_SET_PORTAL_STATE = 1017;
// Global functions
static const int VA_NP_GET_INPUT_GAIN = 1100;
......@@ -257,7 +262,7 @@ public:
void SetRealVACore( IVAInterface* pRealCore );
bool InitializeAsClient( CVANetClientImpl* pServer, VistaConnectionIP* m_pCommandChannel, VistaConnectionIP* m_pHeadChannel, const int iExceptionhandlingmode, const bool m_bBufferSynchronisedModification );
int ClientProcessEventMessageFromServer( VistaConnectionIP* pConnection, std::list<IVAEventHandler*> liCoreEventHandler );
void ServerCallFunctionByMessageType( const int nMessageType, VistaConnectionIP* pConnection );
virtual bool ProcessMessageFromClient( VistaConnectionIP* pAnswerConnection );
......@@ -350,7 +355,7 @@ public:
virtual void ClientGetDirectivityInfos( std::vector<CVADirectivityInfo>& vdiDest );
virtual void ServerGetDirectivityInfos();
virtual std::string ClientCreateSignalSourceBufferFromParameters( const CVAStruct& oParams, const std::string& sName = "" );
virtual void ServerCreateSignalSourceBufferFromParameters();
......@@ -478,14 +483,14 @@ public:
virtual void ServerGetSoundSourceOrientationVU();
virtual void ClientSetSoundSourceOrientationVU( const int iID, const VAVec3& v3View, const VAVec3& v3Up );
virtual void ServerSetSoundSourceOrientationVU();
virtual void ClientGetSoundReceiverIDs( std::vector<int>& viIDs );
virtual void ServerGetSoundReceiverIDs();
virtual int ClientCreateSoundReceiver( const std::string& sName );
virtual void ServerCreateSoundReceiver();
virtual int ClientCreateSoundReceiverExplicitRenderer( const std::string&, const std::string& );
virtual int ClientCreateSoundReceiverExplicitRenderer( const std::string& sRendererID, const std::string& sName );
virtual void ServerCreateSoundReceiverExplicitRenderer();
virtual int ClientDeleteSoundReceiver( const int iID );
......@@ -516,11 +521,11 @@ public:
virtual CVAStruct ClientGetSoundReceiverParameters( const int iID, const CVAStruct& oArgs );
virtual void ServerGetSoundReceiverParameters();
virtual int ClientGetSoundReceiverDirectivity( const int iSoundReceiverID, const int iDirectivityID );
virtual int ClientGetSoundReceiverDirectivity( const int iSoundReceiverID );
virtual void ServerGetSoundReceiverDirectivity();
virtual void ClientSetSoundReceiverDirectivity( const int iSoundReceiverID, const int iDirectivityID );
virtual void ServerSetSoundReceiverDirectivity();
virtual void ClientGetSoundReceiverPose( const int iID, VAVec3& vPos, VAQuat& qOrient );
virtual void ServerGetSoundReceiverPose();
virtual void ClientSetSoundReceiverPose( const int iID, const VAVec3& vPos, const VAQuat& qOrient );
......@@ -542,28 +547,38 @@ public:
virtual void ServerSetSoundReceiverOrientationVU();
virtual void ClientLoadScene( const std::string& sFilename );
virtual void ServerLoadScene();
virtual void ClientCreateScene( const CVAStruct& oParams, const std::string& sName );
virtual std::string ServerCreateScene();
virtual bool ClientIsSceneLoaded();
virtual void ServerIsSceneLoaded();
virtual void ClientGetSceneIDs( std::vector< std::string >& vsIDs );
virtual void ServerGetSceneIDs();
virtual CVASceneInfo ClientGetSceneInfo();
virtual CVASceneInfo ClientGetSceneInfo( const std::string& sID );
virtual void ServerGetSceneInfo();
virtual void ClientGetPortalIDs( std::vector<int>& vPortalIDs );
virtual void ServerGetPortalIDs();
std::string ClientGetSceneName( const std::string& sID );
void ServerGetSceneName();
void ClientSetSceneName( const std::string& sID, const std::string& sName );
void ServerSetSceneName();
bool ClientGetSceneEnabled( const std::string& sID );
void ServerGetSceneEnabled();
void ClientSetSceneEnabled( const std::string& sID, const bool bEnabled );
void ServerSetSceneEnabled();
virtual void ClientGetSoundPortalIDs( std::vector<int>& vPortalIDs );
virtual void ServerGetSoundPortalIDs();
virtual std::string ClientGetPortalName( int iPortalID );
virtual void ServerGetPortalName();
virtual std::string ClientGetSoundPortalName( int iPortalID );
virtual void ServerGetSoundPortalName();
virtual void ClientSetPortalName( int iPortalID, const std::string& sName );
virtual void ServerSetPortalName();
virtual void ServerSetSoundPortalName();
virtual CVAStruct ClientGetPortalParameters( const int iPortalID );
virtual void ServerGetPortalParameters();
virtual void ServerGetSoundPortalParameters();
virtual void ClientSetPortalParameters( const int iPortalID, const CVAStruct& oParams );
virtual void ClientSetSoundPortalParameters( const int iPortalID, const CVAStruct& oParams );
virtual void ServerSetPortalParameters();
......
......@@ -87,7 +87,7 @@ private:
int m_iMaxNumClients;
IVACore* m_pRealCore;
IVAInterface* m_pRealCore;
CVANetNetworkProtocol* m_pProtocol;
std::string m_sServerIP;
......
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