Skip to content

Commit

Permalink
Merge pull request osrf#18 from osrf/mcity_materials
Browse files Browse the repository at this point in the history
Clean up mcity materials
  • Loading branch information
tfoote committed Oct 5, 2017
2 parents a444295 + ee39055 commit 8610aad
Show file tree
Hide file tree
Showing 72 changed files with 190 additions and 39,179 deletions.
Empty file modified car_demo/models/mcity/materials/textures/Asphalt.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Brick.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Buildings.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Colors.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Concrete_Ground.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Crosswalk.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Curb.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Grass.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Gravel.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/GuardRail.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/OverheadSignBase.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/OverheadSigns.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/RailroadGate.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Road_Blank.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Road_Blank_Light.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/StreetLamp_Short.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/StreetLamp_Tall.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/TrafficBarrel.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified car_demo/models/mcity/materials/textures/Tunnel.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
224 changes: 0 additions & 224 deletions car_demo/models/mcity/materials/textures/mcity.mtl

This file was deleted.

Binary file removed car_demo/models/mcity/meshes/Mcity.zip
Binary file not shown.
Binary file removed car_demo/models/mcity/meshes/Mcity/Asphalt.png
Binary file not shown.
Binary file removed car_demo/models/mcity/meshes/Mcity/Brick.png
Binary file not shown.
Binary file removed car_demo/models/mcity/meshes/Mcity/Buildings.png
Binary file not shown.
Binary file removed car_demo/models/mcity/meshes/Mcity/Colors.png
Diff not rendered.
Diff not rendered.
Binary file removed car_demo/models/mcity/meshes/Mcity/Crosswalk.png
Diff not rendered.
Binary file removed car_demo/models/mcity/meshes/Mcity/Curb.png
Diff not rendered.
Binary file removed car_demo/models/mcity/meshes/Mcity/Grass.png
Diff not rendered.
Binary file removed car_demo/models/mcity/meshes/Mcity/Gravel.png
Diff not rendered.
16 changes: 0 additions & 16 deletions car_demo/models/mcity/meshes/Mcity/GuardRail.mtl

This file was deleted.

132 changes: 0 additions & 132 deletions car_demo/models/mcity/meshes/Mcity/GuardRail.obj

This file was deleted.

Binary file removed car_demo/models/mcity/meshes/Mcity/GuardRail.png
Diff not rendered.
Loading

0 comments on commit 8610aad

Please sign in to comment.