Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Simox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
Simox
Commits
1bb98eb3
Commit
1bb98eb3
authored
1 year ago
by
Christoph Pohl
Browse files
Options
Downloads
Patches
Plain Diff
Fix direct Coin dependency of Obstacle
parent
19ff02de
Branches
fix/Obstacle-Coin-dependency
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
VirtualRobot/Obstacle.cpp
+4
-4
4 additions, 4 deletions
VirtualRobot/Obstacle.cpp
with
4 additions
and
4 deletions
VirtualRobot/Obstacle.cpp
+
4
−
4
View file @
1bb98eb3
...
...
@@ -4,7 +4,7 @@
#include
"CollisionDetection/CollisionChecker.h"
#include
"Nodes/RobotNode.h"
#include
"Visualization/VisualizationFactory.h"
#include
"Visualization/
CoinVisualization/Coin
VisualizationNode.h"
#include
"Visualization/VisualizationNode.h"
#include
<vector>
namespace
VirtualRobot
...
...
@@ -42,7 +42,7 @@ namespace VirtualRobot
}
Obstacle
::
Obstacle
(
const
std
::
string
&
name
,
const
TriMeshModelPtr
&
trimesh
,
const
std
::
string
&
filename
)
:
Obstacle
(
TagTrimeshCtor
{},
name
,
std
::
make_shared
<
Coin
VisualizationNode
>
(
trimesh
))
:
Obstacle
(
TagTrimeshCtor
{},
name
,
std
::
make_shared
<
VisualizationNode
>
(
trimesh
))
{
getVisualization
()
->
setFilename
(
filename
,
false
);
getCollisionModel
()
->
getVisualization
()
->
setFilename
(
filename
,
false
);
...
...
@@ -337,9 +337,9 @@ namespace VirtualRobot
return
filename
;
}
void
Obstacle
::
setFilename
(
const
std
::
string
&
f
ile
name
)
void
Obstacle
::
setFilename
(
const
std
::
string
&
fname
)
{
this
->
filename
=
f
ile
name
;
this
->
filename
=
fname
;
}
}
// namespace
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