Commit 6e0e572e authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen

Merge branch 'develop' of https://git.rwth-aachen.de/ita/VAMatlab into develop

parents c417a9ab f9492723
...@@ -33,39 +33,39 @@ end ...@@ -33,39 +33,39 @@ end
%% Connection %% Connection
conn = VAMatlabD( 'connect', 'localhost:12340' ); conn = VAMatlabD( 'connect', 'localhost:12340' );
renderers = VAMatlabD( 'getRenderingModules', conn, false ); renderers = VAMatlabD( 'get_rendering_modules', conn, false );
disp( renderers ) disp( renderers )
reproductions = VAMatlabD( 'getReproductionModules', conn, false ); reproductions = VAMatlabD( 'get_reproduction_modules', conn, false );
disp( reproductions ) disp( reproductions )
%% Tests %% Tests
L = VAMatlabD( 'createListener', conn, 'itaVA_Tracked_Listener', 'default', -1 ); L = VAMatlabD( 'create_sound_receiver', conn, 'itaVA_Tracked_Listener', 'default', -1 );
VAMatlabD( 'SetTrackedListener', conn,L ) VAMatlabD( 'set_tracked_sound_receiver', conn,L )
%VAMatlabD( 'SetTrackedSource', conn,L ) %VAMatlabD( 'set_tracked_sound_source', conn,L )
VAMatlabD( 'SetRigidBodyIndex', conn, 1 ) VAMatlabD( 'set_tracked_sound_receiver_head_rigid_body_index', conn, 1 )
VAMatlabD( 'SetRigidBodyTranslation', conn, [ 0 0 3 ] ) VAMatlabD( 'set_tracked_sound_receiver_head_rigid_body_translation', conn, [ 0 0 3 ] )
q = ita_quaternion( [ pi/sqrt(2) 0 1/sqrt(2) 0 ] ) q = ita_quaternion( [ pi/sqrt(2) 0 1/sqrt(2) 0 ] )
q = q.normalize q = q.normalize
VAMatlabD( 'SetRigidBodyRotation', conn, q.e(:)' ) VAMatlabD( 'SetRigidBodyRotation', conn, q.e(:)' )
VAMatlabD( 'connectTracker', conn ) VAMatlabD( 'connect_trracker', conn )
b = VAMatlabD( 'IsTrackerConnected', conn ) b = VAMatlabD( 'get_tracker_connected', conn )
VAMatlabD( 'disconnectTracker', conn ) VAMatlabD( 'disconnect_tracker', conn )
%VAMatlabD( 'connectTracker', conn, '137.226.61.85', '137.226.61.85' ) %VAMatlabD( 'connect_tracker', conn, '137.226.61.85', '137.226.61.85' )
modinfos = VAMatlabD( 'enumerateModules', conn ); modinfos = VAMatlabD( 'get_modules', conn );
istruct = struct; istruct = struct;
istruct.info = ''; istruct.info = '';
ostruct = VAMatlabD( 'callModule', conn, 'GenericPath:MyGenericRenderer', istruct ) ostruct = VAMatlabD( 'call_mdule', conn, 'PrototypeGenericPath:MyGenericRenderer', istruct )
istruct = struct(); istruct = struct();
istruct.command = 'UPDATE'; istruct.command = 'UPDATE';
...@@ -89,12 +89,12 @@ if false ...@@ -89,12 +89,12 @@ if false
istruct.itaAudio = ita_merge( sweep, sweep ); istruct.itaAudio = ita_merge( sweep, sweep );
end end
ostruct = VAMatlabD( 'callModule', conn, 'GenericPath:MyGenericRenderer', istruct ); ostruct = VAMatlabD( 'call_module', conn, 'PrototypeGenericPath:MyGenericRenderer', istruct );
%VAMatlabD( 'callModule', conn, 'hprep', { 'print', 'help' } ) % will print on std::cout @ real VACore, i.e. VAGUI or Console %VAMatlabD( 'call_module', conn, 'hprep', { 'print', 'help' } ) % will print on std::cout @ real VACore, i.e. VAGUI or Console
%lhs_arg = VAMatlabD( 'callModule', conn, 'hprep', { 'get', 'gain' } ) %lhs_arg = VAMatlabD( 'call_module', conn, 'hprep', { 'get', 'gain' } )
%VAMatlabD( 'callModule', conn, 'hprep', { 'set', 'gain', 'value', lhs_arg / 3 } ) %VAMatlabD( 'call_module', conn, 'hprep', { 'set', 'gain', 'value', lhs_arg / 3 } )
%lhs_arg_new = VAMatlabD( 'callModule', conn, 'hprep', { 'get', 'gain' } ) %lhs_arg_new = VAMatlabD( 'call_module', conn, 'hprep', { 'get', 'gain' } )
VAMatlabD( 'disconnect', conn ) VAMatlabD( 'disconnect', conn )
clear VAMatlabD % release to allow write access for msvc clear VAMatlabD % release to allow write access for msvc
...@@ -99,6 +99,7 @@ classdef itaVA < handle ...@@ -99,6 +99,7 @@ classdef itaVA < handle
VAMatlab('set_verbose_mode', mode); VAMatlab('set_verbose_mode', mode);
end end
end end
methods methods
...@@ -203,6 +204,26 @@ classdef itaVA < handle ...@@ -203,6 +204,26 @@ classdef itaVA < handle
if this.handle==0, error('Not connected.'); end; if this.handle==0, error('Not connected.'); end;
state = VAMatlab('get_server_state', this.handle); state = VAMatlab('get_server_state', this.handle);
end end
function shutdown_server(this)
% Attempts to shut down the remote server
%
% Server shutdown may be prohibited by the server configuration.
% Shutting donw the server from client side is meant for cases
% when the server is called by a script to run e.g. a simulation
% while the rendering output is recorded. The export is triggered
% when the core is finalized (or shut down).
%
% Parameters:
%
% None
%
% Return values:
%
% None
%
VAMatlab( 'call_module', this.handle, 'VACore', struct( 'shutdown', true ) );
end
function connect_tracker( this, remote_ip, local_ip ) function connect_tracker( this, remote_ip, local_ip )
% Connects to a local NatNet tracking server % Connects to a local NatNet tracking server
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
% It takes the class template code and inserts % It takes the class template code and inserts
% all stubs for the functions in the VAConnector % all stubs for the functions in the VAConnector
% interface. These are derived using the reflexion % interface. These are derived using the reflexion
% mechanism ('enumerateFunctions') % mechanism ('enumerate_functions')
% %
va_base_dir = '@VAMATLAB_BASE_DIR@'; % VA folder with bin, lib, matlab, data etc. va_base_dir = '@VAMATLAB_BASE_DIR@'; % VA folder with bin, lib, matlab, data etc.
......
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