Added Material Python interface #948
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: ahcorde <ahcorde@gmail.com>
62 tasks
Codecov Report
@@ Coverage Diff @@
## main #948 +/- ##
=======================================
Coverage 66.66% 66.66%
=======================================
Files 2 2
Lines 27 27
=======================================
Hits 18 18
Misses 9 9 Continue to review full report at Codecov.
|
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
Signed-off-by: ahcorde <ahcorde@gmail.com>
azeey
approved these changes
Apr 15, 2022
python/src/sdf/pyMaterial.cc
Outdated
| "specified by a set of three numbers representing red/green/blue, " | ||
| "each in the range of [0,1].") | ||
| .def("emissive", &sdf::Material::Emissive, | ||
| "Get the emissive color. The ambient color is " |
There was a problem hiding this comment.
Suggested change
| "Get the emissive color. The ambient color is " | |
| "Get the emissive color. The emissive color is " |
python/test/pyMaterial_TEST.py
Outdated
| import unittest | ||
|
|
||
|
|
||
| class GeometryTEST(unittest.TestCase): |
There was a problem hiding this comment.
Suggested change
| class GeometryTEST(unittest.TestCase): | |
| class MaterialTEST(unittest.TestCase): |
python/test/pyMaterial_TEST.py
Outdated
Comment on lines
224
to
240
| # Move the material | ||
| moved = material | ||
| self.assertEqual(Color(0.1, 0.2, 0.3, 0.5), moved.ambient()) | ||
| self.assertEqual(Color(0.2, 0.3, 0.4, 0.6), moved.diffuse()) | ||
| self.assertEqual(Color(0.3, 0.4, 0.5, 0.7), moved.specular()) | ||
| self.assertEqual(Color(0.4, 0.5, 0.6, 0.8), moved.emissive()) | ||
| self.assertFalse(moved.lighting()) | ||
| self.assertEqual(5, moved.render_order()) | ||
| self.assertTrue(moved.double_sided()) | ||
| self.assertEqual("uri", moved.script_uri()) | ||
| self.assertEqual("name", moved.script_name()) | ||
| self.assertEqual(Material.ShaderType.VERTEX, moved.shader()) | ||
| self.assertEqual("map", moved.normal_map()) | ||
| # TODO(ahcorde) Add Pbr python interface | ||
| # self.assertEqual(workflow, | ||
| # *moved.PbrMaterial()->Workflow(sdf::PbrWorkflowType::METAL)) | ||
| self.assertEqual("/my/path", moved.file_path()) |
There was a problem hiding this comment.
These checks can be removed since there no move assignment in python.
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
azeey
reviewed
Apr 16, 2022
| return sdf::Material(self); | ||
| }, "memo"_a); | ||
|
|
||
| pybind11::enum_<sdf::ShaderType>(materialModule, "ShaderType") |
There was a problem hiding this comment.
This enum is in the sdf namespace in C++, but under sdformat.Material in python. Should we make them consistent?
|
@osrf-jenkins retest this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: ahcorde ahcorde@gmail.com
🎉 New feature
This PR is part of this meta ticket #931
Summary
Added Material Python interface
Test it
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.