Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
8408aa10
Commit
8408aa10
authored
8 years ago
by
Nikolaus Vahrenkamp
Browse files
Options
Downloads
Patches
Plain Diff
Add missing Vector2 factory
Add Vector2BaseList
parent
e83214ca
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/interface/core/PoseBase.ice
+6
-1
6 additions, 1 deletion
source/RobotAPI/interface/core/PoseBase.ice
source/RobotAPI/libraries/core/RobotAPIObjectFactories.h
+2
-0
2 additions, 0 deletions
source/RobotAPI/libraries/core/RobotAPIObjectFactories.h
with
8 additions
and
1 deletion
source/RobotAPI/interface/core/PoseBase.ice
+
6
−
1
View file @
8408aa10
...
...
@@ -36,7 +36,12 @@ module armarx
float
x
=
zeroInt
;
float
y
=
zeroInt
;
};
/**
/**
* List of [Vector3Base].
*/
sequence
<
Vector2Base
>
Vector2BaseList
;
/**
* [Vector3Base] defines a 3D vector with x, y, and z.
*/
class
Vector3Base
extends
VariantDataClass
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/core/RobotAPIObjectFactories.h
+
2
−
0
View file @
8408aa10
...
...
@@ -28,6 +28,7 @@
#include
<ArmarXCore/core/system/FactoryCollectionBase.h>
#include
<RobotAPI/interface/core/PoseBase.h>
#include
<RobotAPI/interface/core/RobotState.h>
#include
<RobotAPI/libraries/core/Pose.h>
#include
<RobotAPI/libraries/core/FramedPose.h>
#include
<RobotAPI/libraries/core/LinkedPose.h>
#include
<Ice/Ice.h>
...
...
@@ -163,6 +164,7 @@ namespace armarx
{
ObjectFactoryMap
map
;
add
<
armarx
::
Vector2Base
,
armarx
::
Vector2
>
(
map
);
map
.
insert
(
std
::
make_pair
(
armarx
::
Vector3Base
::
ice_staticId
(),
new
Vector3ObjectFactory
));
map
.
insert
(
std
::
make_pair
(
armarx
::
FramedDirectionBase
::
ice_staticId
(),
new
FramedDirectionObjectFactory
));
map
.
insert
(
std
::
make_pair
(
armarx
::
LinkedDirectionBase
::
ice_staticId
(),
new
LinkedDirectionObjectFactory
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment