Skip to content

Commit

Permalink
Merge pull request #898 from robotology/devel
Browse files Browse the repository at this point in the history 
Merge devel in master
  • Loading branch information
@traversaro
traversaro authored Jul 16, 2021
2 parents 449b89c + 332b166 commit 59b2a61
Show file tree
Hide file tree
Showing 43 changed files with 2,026 additions and 1,073 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [UnreleasedMajor]

### Added
- Add the visualization of labels in the visualizer (https://github.com/robotology/idyntree/pull/879)

### Removed
- Remove headers `iDynTree/Core/AngularForceVector3.h`, `iDynTree/Core/AngularMotionVector3.h`, `include/iDynTree/Core/ForceVector3.h`, `iDynTree/Core/LinearForceVector3.h`, `include/iDynTree/Core/LinearMotionVector3.h`, `include/iDynTree/Core/MotionVector3.h`. They were deprecated in iDynTree 2.0 (https://github.com/robotology/idyntree/pull/708, https://github.com/robotology/idyntree/pull/885).
- The method `ModelVisualization::getWorldModelTransform()` was removed, it was deprecated in iDynTree 3.0.1 .

## [Unreleased]

## [3.3.1] - 2021-07-16
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

cmake_minimum_required(VERSION 3.16)

project(iDynTree VERSION 3.3.1
project(iDynTree VERSION 4.0.0
LANGUAGES C CXX)

# Disable in source build, unless Eclipse is used
Expand Down
56 changes: 28 additions & 28 deletions bindings/matlab/autogenerated/+iDynTree/ConvexHullProjectionConstraint.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,133 +4,133 @@
this = iDynTreeMEX(3, self);
end
function varargout = setActive(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1946, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1960, self, varargin{:});
end
function varargout = isActive(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1947, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1961, self, varargin{:});
end
function varargout = getNrOfConstraints(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1948, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1962, self, varargin{:});
end
function varargout = projectedConvexHull(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1949, self);
varargout{1} = iDynTreeMEX(1963, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1950, self, varargin{1});
iDynTreeMEX(1964, self, varargin{1});
end
end
function varargout = A(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1951, self);
varargout{1} = iDynTreeMEX(1965, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1952, self, varargin{1});
iDynTreeMEX(1966, self, varargin{1});
end
end
function varargout = b(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1953, self);
varargout{1} = iDynTreeMEX(1967, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1954, self, varargin{1});
iDynTreeMEX(1968, self, varargin{1});
end
end
function varargout = P(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1955, self);
varargout{1} = iDynTreeMEX(1969, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1956, self, varargin{1});
iDynTreeMEX(1970, self, varargin{1});
end
end
function varargout = Pdirection(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1957, self);
varargout{1} = iDynTreeMEX(1971, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1958, self, varargin{1});
iDynTreeMEX(1972, self, varargin{1});
end
end
function varargout = AtimesP(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1959, self);
varargout{1} = iDynTreeMEX(1973, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1960, self, varargin{1});
iDynTreeMEX(1974, self, varargin{1});
end
end
function varargout = o(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1961, self);
varargout{1} = iDynTreeMEX(1975, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1962, self, varargin{1});
iDynTreeMEX(1976, self, varargin{1});
end
end
function varargout = buildConvexHull(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1963, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1977, self, varargin{:});
end
function varargout = supportFrameIndices(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1964, self);
varargout{1} = iDynTreeMEX(1978, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1965, self, varargin{1});
iDynTreeMEX(1979, self, varargin{1});
end
end
function varargout = absoluteFrame_X_supportFrame(self, varargin)
narginchk(1, 2)
if nargin==1
nargoutchk(0, 1)
varargout{1} = iDynTreeMEX(1966, self);
varargout{1} = iDynTreeMEX(1980, self);
else
nargoutchk(0, 0)
iDynTreeMEX(1967, self, varargin{1});
iDynTreeMEX(1981, self, varargin{1});
end
end
function varargout = project(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1968, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1982, self, varargin{:});
end
function varargout = computeMargin(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1969, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1983, self, varargin{:});
end
function varargout = setProjectionAlongDirection(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1970, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1984, self, varargin{:});
end
function varargout = projectAlongDirection(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1971, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1985, self, varargin{:});
end
function self = ConvexHullProjectionConstraint(varargin)
if nargin==1 && strcmp(class(varargin{1}),'iDynTreeSwigRef')
if ~isnull(varargin{1})
self.swigPtr = varargin{1}.swigPtr;
end
else
tmp = iDynTreeMEX(1972, varargin{:});
tmp = iDynTreeMEX(1986, varargin{:});
self.swigPtr = tmp.swigPtr;
tmp.SwigClear();
end
end
function delete(self)
if self.swigPtr
iDynTreeMEX(1973, self);
iDynTreeMEX(1987, self);
self.SwigClear();
end
end
Expand Down
15 changes: 9 additions & 6 deletions bindings/matlab/autogenerated/+iDynTree/IFrameVisualization.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,27 @@
end
function delete(self)
if self.swigPtr
iDynTreeMEX(1868, self);
iDynTreeMEX(1880, self);
self.SwigClear();
end
end
function varargout = addFrame(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1869, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1881, self, varargin{:});
end
function varargout = setVisible(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1870, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1882, self, varargin{:});
end
function varargout = getNrOfFrames(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1871, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1883, self, varargin{:});
end
function varargout = getFrameTransform(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1872, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1884, self, varargin{:});
end
function varargout = updateFrame(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1873, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1885, self, varargin{:});
end
function varargout = getFrameLabel(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1886, self, varargin{:});
end
function self = IFrameVisualization(varargin)
if nargin==1 && strcmp(class(varargin{1}),'iDynTreeSwigRef')
Expand Down
51 changes: 51 additions & 0 deletions bindings/matlab/autogenerated/+iDynTree/ILabel.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
classdef ILabel < iDynTreeSwigRef
methods
function this = swig_this(self)
this = iDynTreeMEX(3, self);
end
function delete(self)
if self.swigPtr
iDynTreeMEX(1859, self);
self.SwigClear();
end
end
function varargout = setText(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1860, self, varargin{:});
end
function varargout = getText(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1861, self, varargin{:});
end
function varargout = setSize(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1862, self, varargin{:});
end
function varargout = width(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1863, self, varargin{:});
end
function varargout = height(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1864, self, varargin{:});
end
function varargout = setPosition(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1865, self, varargin{:});
end
function varargout = getPosition(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1866, self, varargin{:});
end
function varargout = setColor(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1867, self, varargin{:});
end
function varargout = setVisible(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1868, self, varargin{:});
end
function self = ILabel(varargin)
if nargin==1 && strcmp(class(varargin{1}),'iDynTreeSwigRef')
if ~isnull(varargin{1})
self.swigPtr = varargin{1}.swigPtr;
end
else
error('No matching constructor');
end
end
end
methods(Static)
end
end
40 changes: 20 additions & 20 deletions bindings/matlab/autogenerated/+iDynTree/IModelVisualization.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,60 @@
end
function delete(self)
if self.swigPtr
iDynTreeMEX(1874, self);
iDynTreeMEX(1887, self);
self.SwigClear();
end
end
function varargout = setPositions(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1875, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1888, self, varargin{:});
end
function varargout = setLinkPositions(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1876, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1889, self, varargin{:});
end
function varargout = model(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1877, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1890, self, varargin{:});
end
function varargout = getInstanceName(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1878, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1891, self, varargin{:});
end
function varargout = setModelVisibility(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1879, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1892, self, varargin{:});
end
function varargout = setModelColor(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1880, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1893, self, varargin{:});
end
function varargout = resetModelColor(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1881, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1894, self, varargin{:});
end
function varargout = setLinkColor(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1882, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1895, self, varargin{:});
end
function varargout = resetLinkColor(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1883, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1896, self, varargin{:});
end
function varargout = getLinkNames(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1884, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1897, self, varargin{:});
end
function varargout = setLinkVisibility(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1885, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1898, self, varargin{:});
end
function varargout = getFeatures(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1886, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1899, self, varargin{:});
end
function varargout = setFeatureVisibility(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1887, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1900, self, varargin{:});
end
function varargout = jets(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1888, self, varargin{:});
end
function varargout = getWorldModelTransform(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1889, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1901, self, varargin{:});
end
function varargout = getWorldLinkTransform(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1890, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1902, self, varargin{:});
end
function varargout = getWorldFrameTransform(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1891, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1903, self, varargin{:});
end
function varargout = label(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1904, self, varargin{:});
end
function self = IModelVisualization(varargin)
if nargin==1 && strcmp(class(varargin{1}),'iDynTreeSwigRef')
Expand Down
8 changes: 4 additions & 4 deletions bindings/matlab/autogenerated/+iDynTree/ITexture.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
end
function delete(self)
if self.swigPtr
iDynTreeMEX(1892, self);
iDynTreeMEX(1905, self);
self.SwigClear();
end
end
function varargout = environment(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1893, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1906, self, varargin{:});
end
function varargout = getPixelColor(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1894, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1907, self, varargin{:});
end
function varargout = getPixels(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1895, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1908, self, varargin{:});
end
function self = ITexture(varargin)
if nargin==1 && strcmp(class(varargin{1}),'iDynTreeSwigRef')
Expand Down
6 changes: 3 additions & 3 deletions bindings/matlab/autogenerated/+iDynTree/ITexturesHandler.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
end
function delete(self)
if self.swigPtr
iDynTreeMEX(1906, self);
iDynTreeMEX(1919, self);
self.SwigClear();
end
end
function varargout = add(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1907, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1920, self, varargin{:});
end
function varargout = get(self,varargin)
[varargout{1:nargout}] = iDynTreeMEX(1908, self, varargin{:});
[varargout{1:nargout}] = iDynTreeMEX(1921, self, varargin{:});
end
function self = ITexturesHandler(varargin)
if nargin==1 && strcmp(class(varargin{1}),'iDynTreeSwigRef')
Expand Down
Loading

0 comments on commit 59b2a61

Please sign in to comment.