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

Fix light map URI in materials #146

Merged
merged 1 commit into from
Dec 17, 2020
Merged

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Dec 10, 2020

so we can convert model://<model_name>/<path_to_texture>.png to absolute path on local disk.

related pull request: gazebosim/gz-sim#471

Signed-off-by: Ian Chen [email protected]

Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added 🏢 edifice Ignition Edifice 🔮 dome Ignition Dome labels Dec 10, 2020
@codecov
Copy link

codecov bot commented Dec 10, 2020

Codecov Report

Merging #146 (95531b1) into ign-fuel-tools5 (90f83f7) will decrease coverage by 0.01%.
The diff coverage is 66.66%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           ign-fuel-tools5     #146      +/-   ##
===================================================
- Coverage            78.00%   77.99%   -0.02%     
===================================================
  Files                   19       19              
  Lines                 2601     2604       +3     
===================================================
+ Hits                  2029     2031       +2     
- Misses                 572      573       +1     
Impacted Files Coverage Δ
src/LocalCache.cc 80.00% <66.66%> (-0.13%) ⬇️

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 90f83f7...95531b1. Read the comment docs.

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.

LGTM. I retriggered the Windows build, not sure why it failed. Infra may be in a transition state atm.

@chapulina
Copy link
Contributor

Windows CI seems to be in a tough place right now. Merging without it.

@chapulina chapulina merged commit 95bbb33 into ign-fuel-tools5 Dec 17, 2020
@chapulina chapulina deleted the fix_lightmap_uri branch December 17, 2020 01:02
nkoenig added a commit that referenced this pull request Dec 23, 2020
* Use lowercase resource and owner names when storing assets on disk (#130)

* Use lowercase resource and owner names when storing assets on disk

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

* Remove added diff text from merge

Signed-off-by: John Shepherd <[email protected]>

* change model version in test back

Signed-off-by: John Shepherd <[email protected]>

* Fix test

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

* Fix windows

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

* Fix more windows tests

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

* Testing another windows fix

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

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: John Shepherd <[email protected]>

* Prepare for 3.5.0 release (#135)

* Prepare for 3.5.0 release

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

* Update Changelog.md

Co-authored-by: Louise Poubel <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>

* Download model dependencies (#123)

Signed-off-by: John Shepherd <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>

* Prepare for 4.3.0 release (#139)

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

Co-authored-by: Nate Koenig <[email protected]>

* Set keep alive on (#141)

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

Co-authored-by: Nate Koenig <[email protected]>

* Support editing/patching model files (#140)

* Support editing/patching model files

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

* Added documentation

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

* Set keep alive on

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

* Documentation and tests

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

* One more test and exit catch missing -u

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

Co-authored-by: Nate Koenig <[email protected]>

* Prepare for 5.1.0 release (#145)

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

Co-authored-by: Nate Koenig <[email protected]>

* Fix light map URI (#146)

Signed-off-by: Ian Chen <[email protected]>

* Bump to 5.1.1 (#147)

Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: John Shepherd <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔮 dome Ignition Dome 🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants