Changeset 6645 in orxonox.OLD for trunk/src/lib/graphics
- Timestamp:
- Jan 21, 2006, 4:56:43 PM (19 years ago)
- Location:
- trunk/src/lib/graphics
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/importer/material.cc
r6622 r6645 303 303 //! @todo Textures from .mtl-file need special care. 304 304 if (dMap != NULL) 305 this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, ( void*)&target);305 this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target); 306 306 else 307 307 this->diffuseTexture = NULL; -
trunk/src/lib/graphics/importer/md2Model.cc
r6222 r6645 78 78 { 79 79 /* this creates the data container via ressource manager */ 80 this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, (void*)skinFileName);80 this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName); 81 81 if( unlikely(this->data == NULL)) 82 82 PRINTF(0)("The model was not found, MD2Model Loader finished abnormaly. Update the data-repos\n"); -
trunk/src/lib/graphics/shader.cc
r5390 r6645 106 106 Shader* Shader::getShader(const char* vertexShaderFile, const char* fragmentShaderFile) 107 107 { 108 return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER, RP_LEVEL, (void*)fragmentShaderFile);108 return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER, RP_LEVEL, fragmentShaderFile); 109 109 } 110 110 -
trunk/src/lib/graphics/text_engine/text.cc
r6349 r6645 92 92 if (fontFile != NULL) 93 93 { 94 tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, &fontSize);94 tmpFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize); 95 95 if (tmpFont != NULL) 96 96 this->font = tmpFont;
Note: See TracChangeset
for help on using the changeset viewer.