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
7931000b
Commit
7931000b
authored
5 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Add stateful API
parent
232514eb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
VirtualRobot/XML/mujoco/MeshConverter.cpp
+33
-0
33 additions, 0 deletions
VirtualRobot/XML/mujoco/MeshConverter.cpp
VirtualRobot/XML/mujoco/MeshConverter.h
+48
-4
48 additions, 4 deletions
VirtualRobot/XML/mujoco/MeshConverter.h
with
81 additions
and
4 deletions
VirtualRobot/XML/mujoco/MeshConverter.cpp
+
33
−
0
View file @
7931000b
...
...
@@ -131,4 +131,37 @@ Mesh MeshConverter::toMujoco(const VirtualRobot::TriMeshModel& triMeshModel, flo
return
fromVirtualRobot
(
triMeshModel
,
scaling
);
}
MeshConverter
::
MeshConverter
()
=
default
;
float
MeshConverter
::
getScaling
()
const
{
return
scaling
;
}
void
MeshConverter
::
setScaling
(
float
value
)
{
this
->
scaling
=
value
;
}
TriMeshModel
MeshConverter
::
toVirtualRobot
(
const
Mesh
&
mesh
)
{
return
toVirtualRobot
(
mesh
,
scaling
);
}
TriMeshModelPtr
MeshConverter
::
toVirtualRobotPtr
(
const
Mesh
&
mesh
)
{
return
toVirtualRobotPtr
(
mesh
,
scaling
);
}
Mesh
MeshConverter
::
fromVirtualRobot
(
const
TriMeshModel
&
triMeshModel
)
{
return
fromVirtualRobot
(
triMeshModel
,
scaling
);
}
Mesh
MeshConverter
::
toMujoco
(
const
TriMeshModel
&
triMeshModel
)
{
return
toMujoco
(
triMeshModel
,
scaling
);
}
}
This diff is collapsed.
Click to expand it.
VirtualRobot/XML/mujoco/MeshConverter.h
+
48
−
4
View file @
7931000b
...
...
@@ -14,7 +14,9 @@ namespace VirtualRobot::mujoco
{
public:
// From mujoco::Mesh
// STATELESS API (static).
// From mujoco::Mesh to VirtualRobot::TriMeshModel
/// Construct a VirtualRobot::TriMeshModel from mujoco::Mesh.
static
VirtualRobot
::
TriMeshModel
toVirtualRobot
(
const
mujoco
::
Mesh
&
mesh
,
...
...
@@ -23,7 +25,7 @@ namespace VirtualRobot::mujoco
float
scaling
=
1.0
);
// To mujoco::Mesh
// To mujoco::Mesh
(from VirtualRobot::TriMeshModel)
/// Construct mujoco::Mesh from a VirtualRobot::TriMeshModel.
static
mujoco
::
Mesh
fromVirtualRobot
(
const
VirtualRobot
::
TriMeshModel
&
triMeshModel
,
...
...
@@ -33,10 +35,52 @@ namespace VirtualRobot::mujoco
static
mujoco
::
Mesh
toMujoco
(
const
VirtualRobot
::
TriMeshModel
&
triMeshModel
,
float
scaling
=
1.0
);
public:
// STATEFUL API.
/// Constructor.
MeshConverter
();
/// Set the scaling.
float
getScaling
()
const
;
/// Get the scaling.
void
setScaling
(
float
value
);
// From mujoco::Mesh to VirtualRobot::TriMeshModel
/// Construct a VirtualRobot::TriMeshModel from mujoco::Mesh.
VirtualRobot
::
TriMeshModel
toVirtualRobot
(
const
mujoco
::
Mesh
&
mesh
);
VirtualRobot
::
TriMeshModelPtr
toVirtualRobotPtr
(
const
mujoco
::
Mesh
&
mesh
);
// To mujoco::Mesh (from VirtualRobot::TriMeshModel)
/// Construct mujoco::Mesh from a VirtualRobot::TriMeshModel.
mujoco
::
Mesh
fromVirtualRobot
(
const
VirtualRobot
::
TriMeshModel
&
triMeshModel
);
/// Construct mujoco::Mesh from a VirtualRobot::TriMeshModel.
mujoco
::
Mesh
toMujoco
(
const
VirtualRobot
::
TriMeshModel
&
triMeshModel
);
private:
/// Check whether the command `MESHLABSERVER` is available using `system("which ...")`.
static
bool
checkMeshlabserverAvailable
();
/// Command used to convert mesh files to STL.
static
const
std
::
string
MESHLABSERVER
;
private:
///
Private constructor
.
MeshConverter
()
=
default
;
///
The scaling
.
float
scaling
=
1.0
f
;
};
...
...
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