Changeset 6720 in orxonox.OLD for trunk/src/world_entities
- Timestamp:
- Jan 25, 2006, 5:08:23 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/world_entity.cc
r6700 r6720 135 135 strcpy(lodFile, fileName); 136 136 char* depth = strchr(lodFile, '#'); 137 for (unsigned int i = 0; i < 5; i++)137 for (unsigned int i = 0; i < 3; i++) 138 138 { 139 139 *depth = 48+(int)i; 140 printf("-------%s\n", lodFile);141 140 if (ResourceManager::isInDataDir(lodFile)) 142 141 this->loadModel(lodFile, scaling, i); … … 144 143 return; 145 144 } 146 if ( scaling == 0.0)147 { 148 scaling = 1.0;145 if (this->scaling <= 0.0) 146 { 147 this->scaling = 1.0; 149 148 PRINTF(1)("YOU GAVE ME A CRAPY SCALE resetting to 1\n"); 150 149 } … … 152 151 { 153 152 PRINTF(4)("fetching OBJ file: %s\n", fileName); 154 if ( scaling == 1.0)153 if (this->scaling == 1.0) 155 154 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber); 156 155 else 157 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber);156 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling), modelNumber); 158 157 159 158 if( modelNumber == 0)
Note: See TracChangeset
for help on using the changeset viewer.