Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes #276

Closed
wants to merge 29 commits into from
Closed

Conversation

AbdelrhmanBassiouny
Copy link
Collaborator

Fix related to mesh conversion and caching,
another fix related to which color a merged object gets.

# Conflicts:
#	examples/migrate_neems.md
#	requirements.txt
#	src/pycram/datastructures/world.py
#	src/pycram/world_concepts/world_object.py
#	src/pycrap/base.py
#	src/pycrap/objects.py
#	test/test_butterworth_filter.py
…relations

# Conflicts:
#	examples/migrate_neems.md
#	src/pycram/datastructures/mixins.py
#	src/pycram/datastructures/world_entity.py
#	src/pycram/description.py
#	src/pycram/world_concepts/world_object.py
#	src/pycrap/urdf_parser.py
…ed HasConcept from PhysicalBody to WorldEntity so as to make joints also have a concept as they inherit from WorldEntity not from PhysicalBody, it also makes sense as every thing in the world should theoretically have a concept.
…spatial_relations

# Conflicts:
#	src/pycram/datastructures/world.py
…rected bounding box extents, and duplicate scaling of mesh.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant