Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Simox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

d21c6b8f

Commit d21c6b8f authored 2 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into 63-ci-cipeline

parents 64cf69ba 4276042d

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

SimDynamics/DynamicsEngine/BulletEngine/BulletOpenGL/DemoApplication.cpp 2 additions, 5 deletions

...amicsEngine/BulletEngine/BulletOpenGL/DemoApplication.cpp
VirtualRobot/CMakeLists.txt 1 addition, 0 deletions

VirtualRobot/CMakeLists.txt
VirtualRobot/Nodes/RobotNode.cpp 1 addition, 1 deletion

VirtualRobot/Nodes/RobotNode.cpp
VirtualRobot/SceneObject.cpp 5 additions, 3 deletions

VirtualRobot/SceneObject.cpp
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp 0 additions, 39 deletions

...ualization/CoinVisualization/CoinVisualizationFactory.cpp
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.h 0 additions, 4 deletions

...isualization/CoinVisualization/CoinVisualizationFactory.h
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.cpp 2 additions, 1 deletion

...Visualization/CoinVisualization/CoinVisualizationNode.cpp
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.h 1 addition, 0 deletions

...t/Visualization/CoinVisualization/CoinVisualizationNode.h
VirtualRobot/Visualization/VisualizationFactory.cpp 26 additions, 0 deletions

VirtualRobot/Visualization/VisualizationFactory.cpp
VirtualRobot/Visualization/VisualizationFactory.h 1 addition, 1 deletion

VirtualRobot/Visualization/VisualizationFactory.h
VirtualRobot/Visualization/VisualizationNode.cpp 26 additions, 1 deletion

VirtualRobot/Visualization/VisualizationNode.cpp
VirtualRobot/Visualization/VisualizationNode.h 16 additions, 10 deletions

VirtualRobot/Visualization/VisualizationNode.h

with 81 additions and 65 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment