Aufgrund einer Wartung wird GitLab am 28.09. zwischen 10:00 und 11:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 28.09. between 10:00 and 11:00 am.

upd: Matlab executable generation & install using Visual Studio

upd: variable type changes from int to size_t, because new Matlab versions are more restrictive with types.
parent 31d8953b
......@@ -11,6 +11,8 @@ endif()
vista_use_package( VABase REQUIRED FIND_DEPENDENCIES )
vista_use_package( VACore REQUIRED FIND_DEPENDENCIES )
vista_use_package( VANet REQUIRED FIND_DEPENDENCIES )
vista_use_package( Matlab REQUIRED FIND_DEPENDENCIES )
vista_use_package( NatNetSDK REQUIRED )
add_definitions( -DVABASE_DLL -DVANET_DLL -DVACORE_DLL )
......@@ -24,7 +26,7 @@ set( VAMATLAB_SRC
"src/VAMatlabTracking.h"
"src/VAMatlabTracking.cpp" )
add_executable( VAMatlab ${VAMATLAB_SRC} )
add_executable( VAMatlab ${VAMATLAB_SRC} VAMatlab.def )
target_link_libraries( VAMatlab ${VISTA_USE_PACKAGE_LIBRARIES} )
vista_configure_app( VAMatlab )
......@@ -32,3 +34,4 @@ vista_install( VAMatlab )
vista_create_default_info_file( VAMatlab )
set_property( TARGET VAMatlab PROPERTY FOLDER "ITABindings" )
set_target_properties( VAMatlab PROPERTIES SUFFIX ".${Matlab_MEX_EXTENSION}")
......@@ -460,7 +460,7 @@ mxArray* matlabCreateStruct( const CVAStruct& oStruct )
it++;
}
const int nDims = 1;
const size_t nDims = 1;
const int nFields = int( vcpFieldNames.size() );
const char** ppszFieldNames = &( *vcpFieldNames.begin() );
mxArray* pStruct = mxCreateStructArray( 1, &nDims, nFields, ppszFieldNames );
......@@ -483,7 +483,7 @@ mxArray* matlabCreateStruct( const CVAStruct& oStruct )
}
case CVAStructValue::INT:
{
int iVal = 1;
size_t iVal = 1;
p = mxCreateNumericArray( 1, &iVal, mxINT32_CLASS, mxREAL );
*( ( int* ) mxGetData( p ) ) = *pStructValue;
mxSetField( pStruct, 0, sFieldName.c_str(), p );
......@@ -508,7 +508,7 @@ mxArray* matlabCreateStruct( const CVAStruct& oStruct )
case CVAStructValue::DATA:
{
int nSamples = int( pStructValue->GetDataSize() / 4 );
int nDims[2] = { 1, nSamples };
size_t nDims[2] = { 1, nSamples };
p = mxCreateNumericArray( 2, nDims, mxSINGLE_CLASS, mxREAL );
mxSetField( pStruct, 0, sFieldName.c_str(), p );
const float* pfSrcData = (const float*)( pStructValue->GetData() );
......
......@@ -766,7 +766,7 @@ void enumerateModules( int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[
std::vector< CVAModuleInfo > v;
pConnection->pCoreInterface->EnumerateModules( v );
const int nDims = int( v.size() );
const size_t nDims = int( v.size() );
const int nFields = 2;
const char* ppszFieldNames[] = { "name", "desc" };
plhs[0] = mxCreateStructArray( 1, &nDims, nFields, ppszFieldNames );
......
/*
*
* VVV VVV A
* VVV VVV AAA Virtual Acoustics
* VVV VVV AAA Real-time auralisation for virtual reality
* VVV VVV AAA
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de)
* VVV VVV AAA Virtual Acoustics (VA)
* VVV VVV AAA Real-time auralization for Virtual Reality
* VVV VVV A AAA
* VVVVVV AAA AAA (c) Copyright Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University (http://www.akustik.rwth-aachen.de)
*
*/
// $Id: VAMatlabTracking.h 2403 2012-04-20 18:31:09Z fwefers $
#ifndef INCLUDE_WATCHER_VA_MATLAB_TRACKING
#define INCLUDE_WATCHER_VA_MATLAB_TRACKING
......@@ -35,10 +33,10 @@ public:
bool Uninitialize();
bool IsConnected() const;
int iRigidBodyIndex; //!< Starts with 1 (default)
int iRigidBodyIndex; //!< Starts with 1 (default)
int iTrackedListenerID; //!< -1 if deactivated, will be preferred over source
int iTrackedSourceID; //!< -1 if deactivated
IVACore* pVACore; //!< Pointer to (networked) core instance
IVACore* pVACore; //!< Pointer to (networked) core instance
VistaVector3D vTranslation; //!< Position offset from pivot point (default NatNet rigid body barycenter)
VistaQuaternion qRotation; //!< Orientation rotation from default orientation (initial NatNet rigid body orientation)
......
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