Changeset 911 for code/branches/script/src/orxonox/Orxonox.cc
- Timestamp:
- Mar 20, 2008, 3:56:23 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/script/src/orxonox/Orxonox.cc
r871 r911 251 251 ogre_->setup(); 252 252 root_ = ogre_->getRoot(); 253 if(!ogre_->load( )) die(/* unable to load */);253 if(!ogre_->load(this->dataPath_)) die(/* unable to load */); 254 254 255 255 //defineResources(); … … 270 270 ogre_->setup(); 271 271 root_ = ogre_->getRoot(); 272 defineResources();273 setupRenderSystem();272 ogre_->load(this->dataPath_); 273 /*setupRenderSystem(); 274 274 createRenderWindow(); 275 initializeResourceGroups(); 275 initializeResourceGroups();*/ 276 276 setupInputSystem(); 277 277 Factory::createClassHierarchy(); … … 305 305 ogre_->setup(); 306 306 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 */); 308 308 // FIXME add network framelistener 309 309 } … … 318 318 else 319 319 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 */); 321 321 ogre_->getRoot()->addFrameListener(new network::ClientFrameListener()); 322 322 } 323 323 /* 324 324 void Orxonox::defineResources() 325 325 { … … 349 349 } 350 350 } 351 } 352 351 }*/ 352 /* 353 353 void Orxonox::setupRenderSystem() 354 354 { 355 355 if (!root_->restoreConfig() && !root_->showConfigDialog()) 356 356 throw Ogre::Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()"); 357 } 358 357 }*/ 358 /* 359 359 void Orxonox::createRenderWindow() 360 360 { … … 366 366 Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5); 367 367 Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups(); 368 } 368 }*/ 369 369 370 370 /**
Note: See TracChangeset
for help on using the changeset viewer.