Skip to content

GitLab

VAMatlab
VAMatlab
Commit cff8070f authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files
Options

Updating README and LICENSE for open source release

parent 0a869e48
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 53 deletions
CMakeLists.txt
View file @ cff8070f
...@@ -32,15 +32,15 @@ if( ITA_CORE_LIBS_BUILD_STATIC ) ...@@ -32,15 +32,15 @@ if( ITA_CORE_LIBS_BUILD_STATIC )
endif( ) endif( )
if( ITA_VISTA_BUILD_STATIC ) if( ITA_VISTA_BUILD_STATIC )
add_definitions( -DVISTABASE_STATIC -DVISTAMATH_STATIC -DVISTAASPECTS_STATIC -DVISTATOOLS_STATIC -DVISTAINTERPROCCOMM_STATIC ) add_definitions( -DVISTACORELIBS_STATIC )
list( APPEND VISTA_USE_PACKAGE_LIBRARIES ws2_32 winspool )
endif( ) endif( )
if( BUILD_SHARED_LIBS ) if( NOT BUILD_SHARED_LIBS )
add_definitions( -DVAMATLAB_EXPORTS )
else( )
add_definitions( -DVABASE_STATIC -DVANET_STATIC ) add_definitions( -DVABASE_STATIC -DVANET_STATIC )
endif( ) endif( )
if( ITA_VA_MATLAB_BUILD_WITH_INTERNAL_CORE ) if( ITA_VA_MATLAB_BUILD_WITH_INTERNAL_CORE )
vista_use_package( VACore REQUIRED FIND_DEPENDENCIES ) vista_use_package( VACore REQUIRED FIND_DEPENDENCIES )
add_definitions( -DVAMATLAB_INTERNAL_CORE ) add_definitions( -DVAMATLAB_INTERNAL_CORE )
...@@ -64,7 +64,7 @@ set( VAMATLAB_SRC ...@@ -64,7 +64,7 @@ set( VAMATLAB_SRC
"src/VAMatlabTracking.h" "src/VAMatlabTracking.h"
"src/VAMatlabTracking.cpp" ) "src/VAMatlabTracking.cpp" )
add_library( VAMatlab ${VAMATLAB_SRC} VAMatlab.def ) add_library( VAMatlab SHARED ${VAMATLAB_SRC} VAMatlab.def )
target_link_libraries( VAMatlab ${VISTA_USE_PACKAGE_LIBRARIES} ) target_link_libraries( VAMatlab ${VISTA_USE_PACKAGE_LIBRARIES} )
if( ITA_VA_INSTALL_WITH_DLLS ) if( ITA_VA_INSTALL_WITH_DLLS )
...@@ -79,6 +79,12 @@ vista_create_cmake_configs( VAMatlab ) ...@@ -79,6 +79,12 @@ vista_create_cmake_configs( VAMatlab )
set_property( TARGET VAMatlab PROPERTY FOLDER "VA/Bindings" ) set_property( TARGET VAMatlab PROPERTY FOLDER "VA/Bindings" )
set_target_properties( VAMatlab PROPERTIES SUFFIX ".${MATLAB_MEX_EXTENSION}") set_target_properties( VAMatlab PROPERTIES SUFFIX ".${MATLAB_MEX_EXTENSION}")
# Build Matlab class and move Matlab executable to bin folder (future work)
if( ITA_VA_MATLAB_POSTBUILD_CREATE_MATLAB_CLASS )
set( MATLAB_BUILD_CLASS_COMMAND "matlab -nodisplay -nosplash -nodesktop -r \"run( 'matlab/itaVA_build_absolute.m' )\"" )
add_custom_command( TARGET VAMatlab POST_BUILD COMMAND ${MATLAB_BUILD_CLASS_COMMAND} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMENT "Running matlab itaVA installer" VERBATIM )
endif( )
# VA matlab scripts file # VA matlab scripts file
set( VAMATLAB_BASE_DIR "${CMAKE_INSTALL_PREFIX}" ) set( VAMATLAB_BASE_DIR "${CMAKE_INSTALL_PREFIX}" )
......
LICENSE.md
View file @ cff8070f
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License. you may not use files of this project except in compliance with the License.
......
README.md
View file @ cff8070f
...@@ -5,7 +5,7 @@ VAMatlab is a binding to the VA interface for Matlab. It uses the VA network con ...@@ -5,7 +5,7 @@ VAMatlab is a binding to the VA interface for Matlab. It uses the VA network con
### License ### License
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License. you may not use files of this project except in compliance with the License.
......
src/VAMatlabConnection.cpp
View file @ cff8070f
/*
* --------------------------------------------------------------------------------------------
*
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
* --------------------------------------------------------------------------------------------
*/
#include "VAMatlabConnection.h" #include "VAMatlabConnection.h"
#include "VAMatlabTracking.h" #include "VAMatlabTracking.h"
......
src/VAMatlabConnection.h
View file @ cff8070f
/* /*
* --------------------------------------------------------------------------------------------
* *
* VVV VVV A * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Virtual Acoustics * VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA Real-time auralisation for virtual reality * VVV VVV AAA
* VVV VVV AAA * VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA) * VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de) * VVVV AAA RWTH Aachen University
* *
* --------------------------------------------------------------------------------------------
*/ */
// $Id: VAMatlabTracking.h 2403 2012-04-20 18:31:09Z fwefers $
#ifndef INCLUDE_WATCHER_VA_MATLAB_CONNECTION #ifndef IW_VA_MATLAB_CONNECTION
#define INCLUDE_WATCHER_VA_MATLAB_CONNECTION #define IW_VA_MATLAB_CONNECTION
// STL includes // STL includes
#include <string> #include <string>
......
src/VAMatlabExecutable.cpp
View file @ cff8070f
/*
* --------------------------------------------------------------------------------------------
*
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
* --------------------------------------------------------------------------------------------
*/
#include "VAMatlabFunctionMapping.h" #include "VAMatlabFunctionMapping.h"
#include "VAMatlabHelpers.h" #include "VAMatlabHelpers.h"
#include "VAMatlabConnection.h" #include "VAMatlabConnection.h"
......
src/VAMatlabFunctionMapping.h
View file @ cff8070f
/* /*
* -------------------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
* *
* VVV VVV A * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Virtual Acoustics (VA) * VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA Real-time auralisation for virtual reality * VVV VVV AAA
* VVV VVV AAA * VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA (c) Copyright Institute of Technical Acoustics (ITA), 2015-2017 * VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University (http://www.akustik.rwth-aachen.de) * VVVV AAA RWTH Aachen University
* *
* -------------------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
*/ */
......
src/VAMatlabHelpers.cpp
View file @ cff8070f
/*
* --------------------------------------------------------------------------------------------
*
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
* --------------------------------------------------------------------------------------------
*/
#include "VAMatlabHelpers.h" #include "VAMatlabHelpers.h"
#include <VAException.h> #include <VAException.h>
......
src/VAMatlabHelpers.h
View file @ cff8070f
/* /*
* --------------------------------------------------------------------------------------------
* *
* VVV VVV A * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Virtual Acoustics * VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA Real-time auralisation for virtual reality * VVV VVV AAA
* VVV VVV AAA * VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA) * VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de) * VVVV AAA RWTH Aachen University
* *
* --------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
*
* File: MatlabHelpers.h
*
* Purpose: Conversion and validation functions for Matlab data
*
* Authors: Frank Wefers (Frank.Wefers@akustik.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*/ */
// $Id: MatlabHelpers.h 2403 2012-04-20 18:31:09Z fwefers $
#ifndef __HELPERS_H__ #ifndef IW_VA_MATLAB_HELPERS
#define __HELPERS_H__ #define IW_VA_MATLAB_HELPERS
#include <VABaseDefinitions.h> #include <VABaseDefinitions.h>
#include <VAStruct.h> #include <VAStruct.h>
...@@ -95,4 +86,4 @@ mxArray* matlabCreateSceneInfo(const CVASceneInfo& sci); ...@@ -95,4 +86,4 @@ mxArray* matlabCreateSceneInfo(const CVASceneInfo& sci);
mxArray* matlabCreateStruct( const CVAStruct& oStruct ); mxArray* matlabCreateStruct( const CVAStruct& oStruct );
#endif // __HELPERS_H__ #endif // IW_VA_MATLAB_HELPERS
src/VAMatlabTracking.cpp
View file @ cff8070f
/*
* --------------------------------------------------------------------------------------------
*
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
* --------------------------------------------------------------------------------------------
*/
#include "VAMatlabTracking.h" #include "VAMatlabTracking.h"
#include "VAMatlabConnection.h" #include "VAMatlabConnection.h"
......
src/VAMatlabTracking.h
View file @ cff8070f
/* /*
* -------------------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
* *
* VVV VVV A * VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Virtual Acoustics (VA) * VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA Real-time auralisation for virtual reality * VVV VVV AAA
* VVV VVV AAA * VVV VVV AAA Copyright 2015-2017
* VVVVVV AAA (c) Copyright Institute of Technical Acoustics (ITA), 2015-2017 * VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University (http://www.akustik.rwth-aachen.de) * VVVV AAA RWTH Aachen University
* *
* -------------------------------------------------------------------------------------------- * --------------------------------------------------------------------------------------------
*/ */
#ifndef IW_VA_MATLAB_TRACKING
#ifndef INCLUDE_WATCHER_VA_MATLAB_TRACKING #define IW_VA_MATLAB_TRACKING
#define INCLUDE_WATCHER_VA_MATLAB_TRACKING
// STL includes // STL includes
#include <string> #include <string>
...@@ -58,4 +57,4 @@ private: ...@@ -58,4 +57,4 @@ private:
bool m_bConnected; bool m_bConnected;
}; };
#endif // INCLUDE_WATCHER_VA_MATLAB_TRACKING #endif // IW_VA_MATLAB_TRACKING
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