Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 20, 2008, 3:56:23 PM (17 years ago)
Author:
bknecht
Message:

applied some old changes (compiles, but may fail running)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/script/src/orxonox/Orxonox.cc

    r871 r911  
    251251    ogre_->setup();
    252252    root_ = ogre_->getRoot();
    253     if(!ogre_->load()) die(/* unable to load */);
     253    if(!ogre_->load(this->dataPath_)) die(/* unable to load */);
    254254
    255255    //defineResources();
     
    270270    ogre_->setup();
    271271    root_ = ogre_->getRoot();
    272     defineResources();
    273     setupRenderSystem();
     272    ogre_->load(this->dataPath_);
     273    /*setupRenderSystem();
    274274    createRenderWindow();
    275     initializeResourceGroups();
     275    initializeResourceGroups();*/
    276276    setupInputSystem();
    277277    Factory::createClassHierarchy();
     
    305305    ogre_->setup();
    306306    server_g = new network::Server(); // FIXME add some settings if wanted
    307     if(!ogre_->load()) die(/* unable to load */);
     307    if(!ogre_->load(this->dataPath_)) die(/* unable to load */);
    308308    // FIXME add network framelistener
    309309  }
     
    318318    else
    319319      client_g = new network::Client(serverIp_, 55556);
    320     if(!ogre_->load()) die(/* unable to load */);
     320    if(!ogre_->load(this->dataPath_)) die(/* unable to load */);
    321321    ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
    322322  }
    323 
     323/*
    324324  void Orxonox::defineResources()
    325325  {
     
    349349      }
    350350    }
    351   }
    352 
     351  }*/
     352/*
    353353  void Orxonox::setupRenderSystem()
    354354  {
    355355    if (!root_->restoreConfig() && !root_->showConfigDialog())
    356356      throw Ogre::Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
    357   }
    358 
     357  }*/
     358/*
    359359  void Orxonox::createRenderWindow()
    360360  {
     
    366366    Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
    367367    Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
    368   }
     368  }*/
    369369
    370370  /**
Note: See TracChangeset for help on using the changeset viewer.