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
Merge requests
!312
Changes in Simox: VisualizationFactory
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Changes in Simox: VisualizationFactory
feature/simox-visualization-factory-update
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Fabian Reister
requested to merge
feature/simox-visualization-factory-update
into
master
2 years ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
a5db54b2
1 commit,
2 years ago
1 file
+
2
−
15
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
+
2
−
15
Options
@@ -543,15 +543,7 @@ namespace armarx
}
SoSeparator
*
newS
=
new
SoSeparator
;
Eigen
::
Matrix4f
lp1
=
Eigen
::
Matrix4f
::
Identity
();
lp1
(
0
,
3
)
=
d
.
p1
.
x
();
lp1
(
1
,
3
)
=
d
.
p1
.
y
();
lp1
(
2
,
3
)
=
d
.
p1
.
z
();
Eigen
::
Matrix4f
lp2
=
Eigen
::
Matrix4f
::
Identity
();
lp2
(
0
,
3
)
=
d
.
p2
.
x
();
lp2
(
1
,
3
)
=
d
.
p2
.
y
();
lp2
(
2
,
3
)
=
d
.
p2
.
z
();
newS
->
addChild
(
CoinVisualizationFactory
::
createCoinLine
(
lp1
,
lp2
,
d
.
scale
,
d
.
color
.
r
,
d
.
color
.
g
,
d
.
color
.
b
));
newS
->
addChild
(
CoinVisualizationFactory
::
createCoinLine
(
d
.
p1
,
d
.
p2
,
d
.
scale
,
d
.
color
));
layer
.
addedLineVisualizations
[
d
.
name
]
=
newS
;
layer
.
mainNode
->
addChild
(
newS
);
ARMARX_DEBUG
<<
"drawLine2"
<<
flush
;
@@ -872,10 +864,7 @@ namespace armarx
auto
node
=
CoinVisualizationFactory
().
createCircleArrow
(
d
.
radius
,
d
.
width
,
d
.
circleCompletion
,
d
.
color
.
r
,
d
.
color
.
g
,
d
.
color
.
b
,
d
.
color
.
transparency
,
d
.
color
,
16
,
30
);
SoNode
*
circle
=
dynamic_cast
<
CoinVisualizationNode
&>
(
*
node
).
getCoinVisualization
();
circle
->
setName
(
SELECTION_NAME
(
d
.
layerName
,
d
.
name
));
@@ -2946,5 +2935,3 @@ namespace armarx
removeCircleVisu
(
DEBUG_LAYER_NAME
,
circleName
,
c
);
}
}
Loading