Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
VAMatlab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
VAMatlab
Commits
1095e7bd
Commit
1095e7bd
authored
Apr 26, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Plain Diff
Removing file that should be generated and not under version control
parents
29503a82
5c2749e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
64 deletions
+57
-64
matlab/itaVA.m.proto
matlab/itaVA.m.proto
+56
-4
matlab/itaVA_build.m
matlab/itaVA_build.m
+0
-59
matlab/itaVA_build.m.proto
matlab/itaVA_build.m.proto
+1
-1
No files found.
matlab/itaVA.m.proto
View file @
1095e7bd
...
...
@@ -250,7 +250,7 @@ classdef itaVA < handle
%
listener_id
[
integer
-
1
x1
]
VA
listener
id
%
VAMatlab
(
'SetTrackedListener'
,
this.handle
,
listener_id
);
end
end
function
setTrackedListenerRigidBodyIndex
(
this
,
index
)
%
Sets
the
index
of
the
rigid
body
to
be
tracked
for
listener
(
default
is
1
)
...
...
@@ -286,13 +286,38 @@ classdef itaVA < handle
%
%
Parameters
:
%
%
listener_id
[
integer
-
1
x1
]
VA
listener
id
%
listener_id
[
integer
-
1
x1
]
VA
real
-
world
listener
id
%
VAMatlab
(
'SetTrackedRealWorldListener'
,
this.handle
,
listener_id
);
end
@
todo
function
setTrackedRealWorldListenerRigidBodyIndex
(
this
,
index
)
%
Sets
the
index
of
the
rigid
body
to
be
tracked
for
real
-
world
listener
(
default
is
1
)
VAMatlab
(
'SetTrackedRealWorldListenerRigidBodyIndex'
,
this.handle
,
index
)
end
function
setTrackedRealWorldListenerRigidBodyTranslation
(
this
,
translation
)
%
Sets
the
pivot
point
translation
for
the
tracked
real
-
world
listener
rigid
body
%
%
Parameters
:
%
%
translation
[
double
-
3
x1
]
Translation
in
local
coordinate
system
of
rigid
body
[
m
]
%
VAMatlab
(
'SetTrackedRealWorldListenerRigidBodyTranslation'
,
this.handle
,
translation
)
end
function
setTrackedRealWorldListenerRigidBodyRotation
(
this
,
rotation
)
%
Sets
the
rotation
of
orientation
for
the
tracked
real
-
world
listener
rigid
body
%
%
Given
rotation
has
to
be
a
Matlab
quaternion
type
(
order
:
w
(
real
),
i
,
j
,
k
)
%
%
Parameters
:
%
%
rotation
[
quaternion
]
Rotation
of
rigid
body
%
VAMatlab
(
'SetTrackedRealWorldListenerRigidBodyRotation'
,
this.handle
,
rotation
)
end
%
--
Tracked
source
--
%
function
setTrackedSource
(
this
,
source_id
)
...
...
@@ -300,11 +325,38 @@ classdef itaVA < handle
%
%
Parameters
:
%
%
source_id
[
integer
-
1
x1
]
VA
listener
id
%
source_id
[
integer
-
1
x1
]
VA
source
id
%
VAMatlab
(
'SetTrackedSource'
,
this.handle
,
source_id
);
end
function
setTrackedSourceRigidBodyIndex
(
this
,
index
)
%
Sets
the
index
of
the
rigid
body
to
be
tracked
for
source
(
default
is
1
)
VAMatlab
(
'SetTrackedSourceRigidBodyIndex'
,
this.handle
,
index
)
end
function
setTrackedSourceRigidBodyTranslation
(
this
,
translation
)
%
Sets
the
pivot
point
translation
for
the
tracked
source
rigid
body
%
%
Parameters
:
%
%
translation
[
double
-
3
x1
]
Translation
in
local
coordinate
system
of
rigid
body
[
m
]
%
VAMatlab
(
'SetTrackedSourceRigidBodyTranslation'
,
this.handle
,
translation
)
end
function
setTrackedSourceRigidBodyRotation
(
this
,
rotation
)
%
Sets
the
rotation
of
orientation
for
the
tracked
source
rigid
body
%
%
Given
rotation
has
to
be
a
Matlab
quaternion
type
(
order
:
w
(
real
),
i
,
j
,
k
)
%
%
Parameters
:
%
%
rotation
[
quaternion
]
Rotation
of
rigid
body
%
VAMatlab
(
'SetTrackedSourceRigidBodyRotation'
,
this.handle
,
rotation
)
end
%%
--=
Functions
=--
...
...
matlab/itaVA_build.m
deleted
100644 → 0
View file @
29503a82
% THIS FILE WILL BE OVERWRITTEN BY CMAKE WITHOUT WARNING
%
% Code generator for the VA Matlab interface facade class
%
% Desc: This script generates the code for the Matlab
% facade class to the VAInterface MEXExtension.
% 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')
%
script_dir
=
'C:/dev/VA/dist/VA.v2017b_win32-x64.vc12/matlab'
;
% Matlab scripts target directory
deploy_dir
=
'C:/dev/VA/dist/VA.v2017b_win32-x64.vc12/bin'
;
% Deploy directory, i.e. 'C:/dev/VA/dist/win32-x64.vc12'
lib_dir
=
'C:/dev/VA/dist/VA.v2017b_win32-x64.vc12/lib'
;
if
exist
(
deploy_dir
,
'dir'
)
~=
7
error
(
'Deploy dir
''
%s
''
does not exist. Please build and install VAMatlab first.'
,
deploy_dir
)
end
if
exist
(
script_dir
,
'dir'
)
~=
7
mkdir
(
script_dir
);
end
if
exist
(
[
'VAMatlab'
mexext
],
'file'
)
warning
(
'VAMatlab already found at location "%s", are you sure to build itaVA against this executable? Will proceed now.'
,
which
(
'VAMatlab'
)
)
else
% Add to PATH temporarily and attempt to move lib to bin dir
addpath
(
script_dir
,
deploy_dir
)
[
s
]
=
movefile
(
fullfile
(
lib_dir
,
'VAMatlab*'
),
deploy_dir
);
if
~
s
&&
~
exist
(
[
'VAMatlab'
'.'
mexext
],
'file'
)
error
(
'Could locate VAMatlab executable. Please make sure that it can be found.'
)
end
end
% Parameters
templateFile
=
'itaVA.m.proto'
;
outputFile
=
fullfile
(
script_dir
,
'itaVA.m'
);
fprintf
(
'Generating code for itaVA Matlab class
''
%s
''
...\n'
,
outputFile
);
code
=
fileread
(
templateFile
);
stubCode
=
itaVA_generateStubs
();
code
=
strrep
(
code
,
'###STUBCODE###'
,
stubCode
);
% Write the results
fid
=
fopen
(
outputFile
,
'w'
);
fprintf
(
fid
,
'%s'
,
code
);
fclose
(
fid
);
fprintf
(
'Matlab class
''
%s
''
successfully built\n'
,
outputFile
);
% Install examples
copyfile
(
'itaVA_example*'
,
script_dir
);
% Remove from MATLABPATH (otherwise naming conflicts may occur with
% ITA-Toolbox/applications/VirtualAcoustics/VA/* scripts)
rmpath
(
script_dir
,
deploy_dir
)
matlab/itaVA_build.m.proto
View file @
1095e7bd
...
...
@@ -22,7 +22,7 @@ if exist( script_dir, 'dir' ) ~= 7
mkdir
(
script_dir
);
end
if
exist
(
[
'VAMatlab'
mexext
],
'file'
)
if
exist
(
[
'VAMatlab'
'.'
mexext
],
'file'
)
warning
(
'VAMatlab already found at location "%s", are you sure to build itaVA against this executable? Will proceed now.'
,
which
(
'VAMatlab'
)
)
else
%
Add
to
PATH
temporarily
and
attempt
to
move
lib
to
bin
dir
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment