From 84f2f13d38e562a12b1475249fc835c959a174c4 Mon Sep 17 00:00:00 2001
From: Tully Foote <tfoote@osrfoundation.org>
Date: Tue, 20 Jun 2017 19:52:05 -0700
Subject: [PATCH] mcity launching successfully

---
 prius_description/launch/gazebo.launch | 1 +
 prius_plugin/CMakeLists.txt            | 3 +++
 prius_plugin/package.xml               | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/prius_description/launch/gazebo.launch b/prius_description/launch/gazebo.launch
index 17d23d6..6f7cd9d 100644
--- a/prius_description/launch/gazebo.launch
+++ b/prius_description/launch/gazebo.launch
@@ -6,6 +6,7 @@
 
   <include file="$(find gazebo_ros)/launch/empty_world.launch">
     <arg name="verbose" value="true"/>
+    <arg name="world_name" value="$(find car_demo)/worlds/mcity.world"/>
   </include>
 
   <node name="spawn_urdf" pkg="gazebo_ros" type="spawn_model" args="-param robot_description -urdf -model prius"/>
diff --git a/prius_plugin/CMakeLists.txt b/prius_plugin/CMakeLists.txt
index acf8a34..f6fb9f4 100644
--- a/prius_plugin/CMakeLists.txt
+++ b/prius_plugin/CMakeLists.txt
@@ -31,6 +31,9 @@ install(TARGETS PriusHybridPlugin
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
+install(DIRECTORY models DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+
+
 
 # TODO(tfoote) replace installers add_subdirectory(models)
 # TODO(tfoote) replace installers add_subdirectory(worlds)
diff --git a/prius_plugin/package.xml b/prius_plugin/package.xml
index dc887dc..4f0c4ae 100644
--- a/prius_plugin/package.xml
+++ b/prius_plugin/package.xml
@@ -10,6 +10,6 @@
   <depend>gazebo_ros</depend>
   <export>
     <!-- Other tools can request additional information be placed here -->
-    <gazebo_ros plugin_path="${prefix}/lib" gazebo_media_path="${prefix}" />
+    <gazebo_ros plugin_path="${prefix}/lib" gazebo_media_path="${prefix}" gazebo_model_path="${prefix}/models"/>
   </export>
 </package>