Changeset 6467 in orxonox.OLD for trunk/src/util/loading/resource_manager.cc
- Timestamp:
- Jan 11, 2006, 11:46:52 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/util/loading/resource_manager.cc
r6222 r6467 407 407 #ifndef NO_TEXTURES 408 408 case IMAGE: 409 if (param1 != NULL) 410 tmpResource->texTarget = *(GLenum*)param1; 411 else 412 tmpResource->texTarget = GL_TEXTURE_2D; 409 413 if(isFile(fullName)) 410 414 { … … 422 426 { 423 427 PRINTF(4)("Image %s resides to %s\n", fileName, imgName); 424 tmpResource->pointer = new Texture(imgName );428 tmpResource->pointer = new Texture(imgName, tmpResource->texTarget); 425 429 delete[] imgName; 426 430 break; … … 666 670 match = true; 667 671 #endif /* NO_SHADERS */ 672 #ifndef NO_TEXTURES 673 case IMAGE: 674 if (!param1) 675 { 676 if ((*resource)->texTarget == GL_TEXTURE_2D) 677 match = true; 678 } 679 else if ((*resource)->texTarget == *(GLenum*)param1) 680 match = true; 681 #endif /* NO_TEXTURES */ 668 682 default: 669 683 match = true;
Note: See TracChangeset
for help on using the changeset viewer.