Changeset 4240 in orxonox.OLD
- Timestamp:
- May 20, 2005, 3:12:51 AM (19 years ago)
- Location:
- orxonox/branches/levelLoader/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/levelLoader/src/factory.h
r4239 r4240 10 10 11 11 #include "tinyxml.h" 12 #include "load_param.h" 12 13 #include "debug.h" 13 14 -
orxonox/branches/levelLoader/src/world_entities/skybox.cc
r4136 r4240 59 59 60 60 // Model Loading 61 string = grabParameter( root, "materialset"); 62 if( string != NULL) 63 this->setTexture(string, "jpg"); 64 else 65 { 66 PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n"); 67 } 68 if( this->skyModel == NULL) 69 { 70 PRINTF(0)("SkyBox model '%s' could not be loaded\n", string); 71 } 61 LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture); 62 72 63 this->postInit(); 73 64 } -
orxonox/branches/levelLoader/src/world_entities/skybox.h
r4136 r4240 31 31 32 32 void setSize(float size); 33 /** \brief assumes jpg as input-format */ 34 void setTexture(const char* name) { setTexture (name, "jpg");}; 33 35 void setTexture(const char* name, const char* extension); 34 36 void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back); -
orxonox/branches/levelLoader/src/world_entities/world_entity.cc
r4239 r4240 67 67 void WorldEntity::loadModel(const char* fileName) 68 68 { 69 if (this->model) 70 ResourceManager::getInstance()->unload(this->model, RP_LEVEL); 69 71 this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN); 70 72 }
Note: See TracChangeset
for help on using the changeset viewer.