← Back to branch summary

~gimaker/peekabot/multi-connect

« back to all changes in this revision

Viewing changes to src/Main.cc

  • Committer: Staffan Gimåker
  • Date: 2008-07-29 18:58:20 UTC
  • Revision ID: staffan_gimker_staffan_at_gimaker.se-20080729185820-8582mmsocde3k7te
Removed support for robot files (deprectated in 0.5).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Main.cc
109
109
 
110
110
    fs::create_dir_if_inexistant(fs::get_resource_path());
111
111
    fs::create_dir_if_inexistant(fs::get_resource_path() / "models");
112
 
    fs::create_dir_if_inexistant(fs::get_resource_path() / "robots");
113
112
    fs::create_dir_if_inexistant(fs::get_resource_path() / "scenes");
114
113
    fs::create_dir_if_inexistant(fs::get_resource_path() / "snapshots");
115
114
 
268
267
    // Set up default values
269
268
    try
270
269
    {
271
 
        std::list<fs::path> def_robot_dirs;
272
 
        def_robot_dirs.push_back(fs::get_resource_path() / fs::make_path("robots"));
273
 
        def_robot_dirs.push_back(fs::get_pkgdata_path() / fs::make_path("robots"));
274
 
        TheConfiguration::instance().get_option<std::list<fs::path> >(
275
 
            "robot_dirs", def_robot_dirs);
276
 
 
277
270
        std::list<fs::path> def_scene_dirs;
278
271
        def_scene_dirs.push_back(fs::get_resource_path() / fs::make_path("scenes"));
279
272
        def_scene_dirs.push_back(fs::get_pkgdata_path() / fs::make_path("scenes"));
282
275
 
283
276
        std::list<fs::path> def_model_dirs;
284
277
        def_model_dirs.push_back(fs::get_resource_path() / fs::make_path("models"));
285
 
        def_model_dirs.push_back(fs::get_resource_path() / fs::make_path("robots"));
286
278
        def_model_dirs.push_back(fs::get_resource_path() / fs::make_path("scenes"));
287
279
        def_model_dirs.push_back(fs::get_pkgdata_path() / fs::make_path("models"));
288
 
        def_model_dirs.push_back(fs::get_pkgdata_path() / fs::make_path("robots"));
289
280
        def_model_dirs.push_back(fs::get_pkgdata_path() / fs::make_path("scenes"));
290
281
        TheConfiguration::instance().get_option<std::list<fs::path> >(
291
282
            "model_dirs", def_model_dirs);