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

Support relative paths for PBR materials #328

Merged
merged 4 commits into from
Sep 16, 2020
Merged

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Sep 2, 2020

Resolves #286.

Requires: gazebosim/sdformat#349.

To test, you can modify PBR map URIs similar to the following.

Old

<pbr>
  <metal>
    <albedo_map>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Cave Straight Type A/3/files/materials/textures/Gravel_Albedo.png</albedo_map>
    <normal_map>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Cave Straight Type A/3/files/materials/textures/Gravel_Normal.png</normal_map>
    <roughness_map>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Cave Straight Type A/3/files/materials/textures/Gravel_Roughness.png</roughness_map>
  </metal>
</pbr>

New

<pbr>
  <metal>
    <albedo_map>materials/textures/Gravel_Albedo.png</albedo_map>
    <normal_map>materials/textures/Gravel_Normal.png</normal_map>
    <roughness_map>materials/textures/Gravel_Roughness.png</roughness_map>
  </metal>
</pbr>

Signed-off-by: Nate Koenig [email protected]

Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

src/Conversions.cc Show resolved Hide resolved
@chapulina chapulina added the needs upstream release Blocked by a release of an upstream library label Sep 4, 2020
@chapulina
Copy link
Contributor

This is blocked by a libSDFormat8 release.

@chapulina
Copy link
Contributor

@osrf-jenkins run tests, you can do it!

@chapulina
Copy link
Contributor

@osrf-jenkins run tests, SDFormat 8.9.0 is out!

@chapulina chapulina removed the needs upstream release Blocked by a release of an upstream library label Sep 16, 2020
@codecov
Copy link

codecov bot commented Sep 16, 2020

Codecov Report

Merging #328 into ign-gazebo2 will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo2     #328      +/-   ##
===============================================
+ Coverage        78.11%   78.13%   +0.01%     
===============================================
  Files              183      183              
  Lines            10029    10038       +9     
===============================================
+ Hits              7834     7843       +9     
  Misses            2195     2195              
Impacted Files Coverage Δ
src/Conversions.cc 78.85% <100.00%> (+0.31%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3c1d27d...062728b. Read the comment docs.

@chapulina chapulina merged commit 4e6c6ec into ign-gazebo2 Sep 16, 2020
@chapulina chapulina deleted the material_file_path branch September 16, 2020 02:31
@Kakcalu13 Kakcalu13 mentioned this pull request Sep 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📜 blueprint Ignition Blueprint
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants