-
Notifications
You must be signed in to change notification settings - Fork 21
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
Convert model:// to Fuel URLs instead of absolute paths #85
Conversation
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Codecov Report
@@ Coverage Diff @@
## ign-fuel-tools3 #85 +/- ##
===================================================
+ Coverage 85.70% 85.74% +0.04%
===================================================
Files 16 16
Lines 2028 2041 +13
===================================================
+ Hits 1738 1750 +12
- Misses 290 291 +1
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you want to add a test, or save that for later?
Signed-off-by: Louise Poubel <[email protected]>
The tests in |
I'm seeing a lot of errors with models in Subt. For example:
|
Those work for me. Are you running the latest commit of |
That fixed the problem, however this change breaks |
Oh I hadn't thought of that. Maybe it's safer to target this at Dome to preserve backwards compatibility. Let me know how gz3d goes. |
Here is the patch. I'll approve this PR so that we can eventually make new docker images for SubT. https://gitlab.com/ignitionrobotics/web/gz3d/-/merge_requests/26 |
Builds on top of #84 .
Resolves #77.
Summary
Without this PR,
model://
URIs like this:<uri>model://Radio/meshes/Radio.dae</uri>
Would become absolute paths like this:
<uri>/home/chapulina/.ignition/fuel/fuel.ignitionrobotics.org/OpenRobotics/models/Radio/4/meshes/Radio.dae</uri>
With this PR, it becomes a Fuel URL like this:
<uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Radio/4/files/meshes/Radio.dae</uri>
Resources across models
It's common for one model to use resources from other models to avoid duplication of resources. For example, the
Radio
model could usemodel://Phone/meshes/antenna,dae
from thePhone
model (assuming both.For this to work on Blueprint and Citadel,
Radio
will need to use the full URL of the phone's antenna, i.e.https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Phone/4/files/meshes/antenna.dae
.From
Dome
onwards, the same owner will be assumed for both models, andmodel://Phone/meshes/antenna,dae
will be converted to the URL above automatically.
The reason not to do this for Blueprint is that there's a non-trivial number of models on Fuel right now whose Fuel name doesn't match the
model://
URI. These would look like different models which don't exist. For example, the Construction Cone usesmodel://construction_cone
.Right now, these models load fine, but a debug message is written: