Some little function renaming and API change adaptions in matlab scripts

parent ffbd25d0
......@@ -33,39 +33,39 @@ end
%% Connection
conn = VAMatlabD( 'connect', 'localhost:12340' );
renderers = VAMatlabD( 'getRenderingModules', conn, false );
renderers = VAMatlabD( 'get_rendering_modules', conn, false );
disp( renderers )
reproductions = VAMatlabD( 'getReproductionModules', conn, false );
reproductions = VAMatlabD( 'get_reproduction_modules', conn, false );
disp( reproductions )
%% 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( 'SetTrackedSource', conn,L )
VAMatlabD( 'SetRigidBodyIndex', conn, 1 )
VAMatlabD( 'SetRigidBodyTranslation', conn, [ 0 0 3 ] )
VAMatlabD( 'set_tracked_sound_receiver', conn,L )
%VAMatlabD( 'set_tracked_sound_source', conn,L )
VAMatlabD( 'set_tracked_sound_receiver_head_rigid_body_index', conn, 1 )
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 = q.normalize
VAMatlabD( 'SetRigidBodyRotation', conn, q.e(:)' )
VAMatlabD( 'connectTracker', conn )
b = VAMatlabD( 'IsTrackerConnected', conn )
VAMatlabD( 'disconnectTracker', conn )
VAMatlabD( 'connect_trracker', conn )
b = VAMatlabD( 'get_tracker_connected', 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.info = '';
ostruct = VAMatlabD( 'callModule', conn, 'GenericPath:MyGenericRenderer', istruct )
ostruct = VAMatlabD( 'call_mdule', conn, 'PrototypeGenericPath:MyGenericRenderer', istruct )
istruct = struct();
istruct.command = 'UPDATE';
......@@ -89,12 +89,12 @@ if false
istruct.itaAudio = ita_merge( sweep, sweep );
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
%lhs_arg = VAMatlabD( 'callModule', conn, 'hprep', { 'get', 'gain' } )
%VAMatlabD( 'callModule', conn, 'hprep', { 'set', 'gain', 'value', lhs_arg / 3 } )
%lhs_arg_new = VAMatlabD( 'callModule', conn, 'hprep', { 'get', 'gain' } )
%VAMatlabD( 'call_module', conn, 'hprep', { 'print', 'help' } ) % will print on std::cout @ real VACore, i.e. VAGUI or Console
%lhs_arg = VAMatlabD( 'call_module', conn, 'hprep', { 'get', 'gain' } )
%VAMatlabD( 'call_module', conn, 'hprep', { 'set', 'gain', 'value', lhs_arg / 3 } )
%lhs_arg_new = VAMatlabD( 'call_module', conn, 'hprep', { 'get', 'gain' } )
VAMatlabD( 'disconnect', conn )
clear VAMatlabD % release to allow write access for msvc
......@@ -99,6 +99,7 @@ classdef itaVA < handle
VAMatlab('set_verbose_mode', mode);
end
end
methods
......@@ -203,6 +204,26 @@ classdef itaVA < handle
if this.handle==0, error('Not connected.'); end;
state = VAMatlab('get_server_state', this.handle);
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 )
% Connects to a local NatNet tracking server
......
......@@ -7,7 +7,7 @@
% It takes the class template code and inserts
% all stubs for the functions in the VAConnector
% 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.
......
......@@ -3,7 +3,7 @@
function [output] = generateStubs()
% Get interface describtion
d = VAMatlab('enumerateFunctions');
d = VAMatlab('enumerate_functions');
code = '';
for i=1:length(d)
......
......@@ -231,9 +231,9 @@ void mexFunction( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[] )
// Reflexion function. Returns cell-array of structs with information on the command functions.
// Used for code generation of the Matlab MEX facade class [private]
REGISTER_PRIVATE_FUNCTION( enumerateFunctions );
REGISTER_PRIVATE_FUNCTION( enumerate_functions );
void enumerateFunctions( int nlhs, mxArray *plhs[], int nrhs, const mxArray** )
void enumerate_functions( int nlhs, mxArray *plhs[], int nrhs, const mxArray** )
{
// Count public functions
mwSize nPublicFuncs = 0;
......
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