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
80c5983f
Commit
80c5983f
authored
8 years ago
by
Nikolaus Vahrenkamp
Browse files
Options
Downloads
Plain Diff
Merge branch 'StaticRobotFix' into 'master'
fix for static robot See merge request !16
parents
370c45db
e592ac75
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
SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp
+5
-2
5 additions, 2 deletions
SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp
SimDynamics/DynamicsEngine/DynamicsObject.cpp
+8
-1
8 additions, 1 deletion
SimDynamics/DynamicsEngine/DynamicsObject.cpp
with
13 additions
and
3 deletions
SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp
+
5
−
2
View file @
80c5983f
...
...
@@ -286,8 +286,11 @@ namespace SimDynamics
Eigen
::
Matrix4f
poseGlobal
=
sceneObject
->
getGlobalPose
()
*
poseLocal
;
this
->
rigidBody
->
setWorldTransform
(
BulletEngine
::
getPoseBullet
(
poseGlobal
));
// notify motionState
motionState
->
setGlobalPose
(
pose
);
// notify motionState of non-robot nodes
if
(
!
boost
::
dynamic_pointer_cast
<
VirtualRobot
::
RobotNode
>
(
sceneObject
))
{
motionState
->
setGlobalPose
(
pose
);
}
}
void
BulletObject
::
setPose
(
const
Eigen
::
Matrix4f
&
pose
)
...
...
This diff is collapsed.
Click to expand it.
SimDynamics/DynamicsEngine/DynamicsObject.cpp
+
8
−
1
View file @
80c5983f
...
...
@@ -41,7 +41,14 @@ namespace SimDynamics
VR_ERROR
<<
"Could not move static object, use kinematic instead, aborting..."
<<
endl
;
return
;
}
sceneObject
->
setGlobalPose
(
pose
);
try
{
sceneObject
->
setGlobalPose
(
pose
);
}
catch
(...)
// robot node does not allow to set the pose
{
}
}
void
DynamicsObject
::
setPosition
(
const
Eigen
::
Vector3f
&
posMM
)
...
...
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