Changeset 9833 in orxonox.OLD for branches/new_class_id/src/lib
- Timestamp:
- Sep 26, 2006, 4:59:49 PM (18 years ago)
- Location:
- branches/new_class_id/src/lib
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/lib/graphics/graphics_engine.cc
r9761 r9833 17 17 18 18 #include "graphics_engine.h" 19 #include "util/loading/resource_manager.h"20 19 #include "state.h" 21 20 -
branches/new_class_id/src/lib/graphics/importer/bsp_file.cc
r9406 r9833 22 22 #include "bsp_tree_node.h" 23 23 #include <fstream> 24 #include "util/loading/ resource_manager.h"24 #include "util/loading/new_resource_manager.h" 25 25 26 26 #include <sys/stat.h> … … 466 466 PRINTF(4)("BSP FILE: Name %s . \n", fileName); 467 467 468 absFileName = Resource Manager::getFullName(fileName);468 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 469 469 470 470 if(File(absFileName).exists()) { … … 481 481 strncat (fileName, ext, strlen(fileName)); 482 482 483 absFileName = Resource Manager::getFullName(fileName);483 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 484 484 485 485 if(File(absFileName).exists()) { … … 496 496 strncat (fileName, ext, strlen(fileName)); 497 497 498 absFileName = Resource Manager::getFullName(fileName);498 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 499 499 500 500 if(File(absFileName).exists()) { … … 511 511 strncat (fileName, ext, strlen(fileName)); 512 512 513 absFileName = Resource Manager::getFullName(fileName);513 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 514 514 515 515 if(File(absFileName).exists()) { … … 524 524 strcpy(ext, ".TGA"); 525 525 strncat (fileName, ext, strlen(fileName)); 526 absFileName = Resource Manager::getFullName(fileName);526 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 527 527 528 528 if(File(absFileName).exists()/*stat( absFileName.c_str() , &results) == 0*/) { … … 537 537 strcpy(ext, ".jpg"); 538 538 strncat (fileName, ext, strlen(fileName)); 539 absFileName = Resource Manager::getFullName(fileName);539 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 540 540 if(File(absFileName).exists()) { 541 541 PRINTF(4)("BSP FILE: gefunden . \n"); … … 551 551 strcpy(ext, ".JPG"); 552 552 strncat (fileName, ext, strlen(fileName)); 553 absFileName = Resource Manager::getFullName(fileName);553 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 554 554 if(File(absFileName).exists()) { 555 555 PRINTF(4)("BSP FILE: gefunden . \n"); … … 566 566 strcpy(ext, ".bmp"); 567 567 strncat (fileName, ext, strlen(fileName)); 568 absFileName = Resource Manager::getFullName(fileName);568 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 569 569 570 570 if(File(absFileName).exists()) { … … 580 580 strcpy(ext, ".BMP"); 581 581 strncat (fileName, ext, strlen(fileName)); 582 absFileName = Resource Manager::getFullName(fileName);582 absFileName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 583 583 584 584 if(File(absFileName).exists()) { … … 611 611 this->testSurf = NULL; 612 612 613 this->testSurf = IMG_Load(Resource Manager::getFullName(mat).c_str());613 this->testSurf = IMG_Load(Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(mat).c_str()); 614 614 if(this->testSurf != NULL) { 615 615 if(this->testSurf->format->Amask != 0 ) tmpAMat.alpha = true; -
branches/new_class_id/src/lib/graphics/importer/bsp_manager.cc
r9235 r9833 33 33 #include "world_entities/player.h" 34 34 #include "world_entities/playable.h" 35 #include "util/loading/resource_manager.h" 35 36 36 // STL Containers 37 37 #include <vector> … … 41 41 #include "world_entity.h" 42 42 43 #include "util/loading/new_resource_manager.h" 43 44 #include "util/loading/load_param.h" 44 45 #include "util/loading/factory.h" … … 91 92 this->bspFile = new BspFile(); 92 93 this->bspFile->scale = scale; 93 if(this->bspFile->read(Resource Manager::getFullName(fileName).c_str()) == -1)94 if(this->bspFile->read(Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName).c_str()) == -1) 94 95 return -1; 95 96 … … 1376 1377 if( this->outputFraction == 1.0f) // No collision Detected 1377 1378 { 1378 if( this->outputAllSolid ) 1379 if( this->outputAllSolid ) 1379 1380 { 1380 1381 this->collPlane = new plane; -
branches/new_class_id/src/lib/graphics/importer/height_map.cc
r9715 r9833 22 22 #include "p_node.h" 23 23 #include "state.h" 24 #include "util/loading/resource_manager.h"25 24 #include "debug.h" 26 25 -
branches/new_class_id/src/lib/graphics/importer/material.cc
r9823 r9833 26 26 27 27 #include "resource_texture.h" 28 //#include "util/loading/resource_manager.h"29 28 30 29 ObjectListDefinition(Material); -
branches/new_class_id/src/lib/graphics/importer/media_container.cc
r9715 r9833 25 25 #include "media_container.h" 26 26 27 #include "util/loading/resource_manager.h" 28 27 #include "util/loading/new_resource_manager.h" 29 28 /* header for debug output */ 30 29 #include "debug.h" … … 92 91 return false; 93 92 // check whether file exists 94 if(!Resource Manager::isInDataDir(filename))93 if(!Resources::NewResourceManager::getInstance()->checkFileInMainPath(filename)) 95 94 { 96 95 PRINTF(1)("Could not find %s\n", filename.c_str()); … … 102 101 103 102 // Open video file 104 if (av_open_input_file(&format_context, Resource Manager::getFullName(filename).c_str(), NULL, 0, NULL) !=0 )105 { 106 PRINTF(1)("Could not open %s\n", Resource Manager::getFullName(filename).c_str());103 if (av_open_input_file(&format_context, Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str(), NULL, 0, NULL) !=0 ) 104 { 105 PRINTF(1)("Could not open %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 107 106 return false; 108 107 } … … 111 110 if (av_find_stream_info(format_context) < 0) 112 111 { 113 PRINTF(1)("Could not find stream information in %s\n", Resource Manager::getFullName(filename).c_str());112 PRINTF(1)("Could not find stream information in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 114 113 return false; 115 114 } … … 120 119 if(video_stream == -1) 121 120 { 122 PRINTF(1)("Could not find a video stream in %s\n", Resource Manager::getFullName(filename).c_str());121 PRINTF(1)("Could not find a video stream in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 123 122 return false; 124 123 } -
branches/new_class_id/src/lib/graphics/importer/movie_player.cc
r9715 r9833 24 24 // include your own header 25 25 #include "movie_player.h" 26 27 #include "util/loading/resource_manager.h" 26 #include "util/loading/new_resource_manager.h" 28 27 29 28 // header for debug output … … 90 89 return false; 91 90 // check whether file exists 92 if(!Resource Manager::isInDataDir(filename))91 if(!Resources::NewResourceManager::getInstance()->checkFileInMainPath(filename)) 93 92 { 94 93 PRINTF(1)("Could not find %s\n", filename.c_str()); … … 100 99 101 100 // Open video file 102 if (av_open_input_file(&format_context, Resource Manager::getFullName(filename).c_str(), NULL, 0, NULL) !=0 )103 { 104 PRINTF(1)("Could not open %s\n", Resource Manager::getFullName(filename).c_str());101 if (av_open_input_file(&format_context, Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str(), NULL, 0, NULL) !=0 ) 102 { 103 PRINTF(1)("Could not open %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 105 104 return false; 106 105 } … … 109 108 if (av_find_stream_info(format_context) < 0) 110 109 { 111 PRINTF(1)("Could not find stream information in %s\n", Resource Manager::getFullName(filename).c_str());110 PRINTF(1)("Could not find stream information in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 112 111 return false; 113 112 } … … 118 117 if(video_stream == -1) 119 118 { 120 PRINTF(1)("Could not find a video stream in %s\n", Resource Manager::getFullName(filename).c_str());119 PRINTF(1)("Could not find a video stream in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 121 120 return false; 122 121 } -
branches/new_class_id/src/lib/graphics/shader.cc
r9821 r9833 24 24 #include "debug.h" 25 25 26 #include "util/loading/resource_manager.h"27 26 28 27 … … 76 75 : data(new ShaderData) 77 76 { 78 77 79 78 } 80 79 -
branches/new_class_id/src/lib/graphics/shader_data.cc
r9818 r9833 24 24 25 25 #include "debug.h" 26 27 #include "util/loading/resource_manager.h"28 26 29 27 -
branches/new_class_id/src/lib/graphics/text_engine/text.cc
r9718 r9833 18 18 #include "text.h" 19 19 #include "font.h" 20 21 #include "util/loading/resource_manager.h" 20 #include "loading/resource_manager.h" 22 21 #include "debug.h" 23 22 -
branches/new_class_id/src/lib/graphics/text_engine/text_engine.cc
r9715 r9833 33 33 34 34 #include "graphics_engine.h" 35 #include "util/loading/resource_manager.h"36 35 37 36 #include "debug.h" -
branches/new_class_id/src/lib/gui/gl/glgui_handler.cc
r9715 r9833 23 23 #include "glgui_cursor.h" 24 24 25 #include "loading/new_resource_manager.h" 26 25 27 #include <cassert> 26 28 … … 30 32 /// TAKE THIS OUT OF HERE. 31 33 #include "graphics_engine.h" 32 #include "loading/resource_manager.h"33 34 34 35 namespace OrxGui … … 76 77 this->_cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY())); 77 78 78 _cursor->loadTextureSequence(Resource Manager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);79 _cursor->loadTextureSequence(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49); 79 80 80 81 } -
branches/new_class_id/src/lib/gui/gl/glgui_widget.cc
r9715 r9833 25 25 26 26 #include "loading/load_param.h" 27 28 /// TODO TAKE THIS OUT OF HERE 29 #include "loading/resource_manager.h" 27 #include "loading/new_resource_manager.h" 30 28 31 29 namespace OrxGui … … 104 102 105 103 if(GLGuiWidget::_defaultFont == NULL) 106 GLGuiWidget::_defaultFont = new Font(Resource Manager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);104 GLGuiWidget::_defaultFont = new Font(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/final_frontier.ttf", 20); 107 105 108 106 this->_font = *GLGuiWidget::_defaultFont; -
branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc
r9715 r9833 20 20 #include "peer_info.h" 21 21 22 #include "loading/new_resource_manager.h" 23 22 24 #include "multi_type.h" 23 25 24 26 #include "shell_command.h" 25 26 #include "loading/resource_manager.h"27 27 28 28 // this fcuk does not work! … … 56 56 { 57 57 if(_font == NULL) 58 _font = new Font(Resource Manager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);58 _font = new Font(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/arial.ttf", 20); 59 59 60 60 //this->_name.setFont(*_font); -
branches/new_class_id/src/lib/network/network_stream.cc
r9757 r9833 36 36 #include "zip.h" 37 37 38 #include "src/lib/util/loading/resource_manager.h"39 40 38 #include "network_log.h" 41 39 42 40 #include "player_stats.h" 43 41 44 #include "lib/util/loading/factory.h" 42 #include "loading/factory.h" 43 #include "loading/new_resource_manager.h" 45 44 46 45 #include "debug.h" … … 1300 1299 length = remainingBytesToWriteToDict; 1301 1300 1302 std::string fileName = Resource Manager::getInstance()->getDataDir();1301 std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name(); 1303 1302 fileName += "/dicts/newdict"; 1304 1303 -
branches/new_class_id/src/lib/network/proxy/network_settings.cc
r9715 r9833 21 21 #include "shared_network_data.h" 22 22 23 #include "loading/resource_manager.h"24 23 #include "loading/load_param.h" 25 24 #include "loading/new_resource_manager.h" 26 25 #include "debug.h" 27 26 … … 65 64 void NetworkSettings::loadData() 66 65 { 67 std::string fileName = Resource Manager::getInstance()->getDataDir();66 std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name(); 68 67 fileName += "configs/network_settings.conf"; 69 68 -
branches/new_class_id/src/lib/network/zip.cc
r8623 r9833 15 15 16 16 #include "zip.h" 17 18 #include "src/lib/util/loading/resource_manager.h" 17 #include "loading/new_resource_manager.h" 19 18 #include "debug.h" 20 19 … … 51 50 int Zip::loadDictionary( std::string name ) 52 51 { 53 std::string fileName = Resource Manager::getInstance()->getDataDir();52 std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name(); 54 53 //PRINTF(0)("datadir: %s\n", fileName.c_str()); 55 54 fileName = fileName + "/dicts/" + name; -
branches/new_class_id/src/lib/script_engine/script.cc
r9757 r9833 18 18 #include "luaincl.h" 19 19 #include "debug.h" 20 #include "util/loading/resource_manager.h" 21 20 21 #include "loading/new_resource_manager.h" 22 22 #include "loading/load_param.h" 23 23 #include "parser/tinyxml/tinyxml.h" … … 100 100 bool Script::loadFile(const std::string& filename) 101 101 { 102 std::string filedest(Resource Manager::getInstance()->getDataDir());102 std::string filedest(Resources::NewResourceManager::getInstance()->mainGlobalPath().name()); 103 103 filedest += "scripts/" + filename; 104 104 -
branches/new_class_id/src/lib/shell/shell_completion_plugin.cc
r9734 r9833 22 22 23 23 #include "helper_functions.h" 24 #include "loading/ resource_manager.h"24 #include "loading/new_resource_manager.h" 25 25 26 26 #include "filesys/directory.h" … … 97 97 if (completionBegin.empty()) // if we do not yet have the beginning of the line, start with the chosen startDir. 98 98 { 99 dir.setFileName(Resource Manager::getInstance()->getDataDir() + this->_subDir);99 dir.setFileName(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + this->_subDir); 100 100 dir.open(); 101 101 for(unsigned int i = 0; i < dir.fileCount(); i++ ) … … 112 112 directoryName = completionBegin.substr(0, pos); 113 113 114 dir.setFileName(Resource Manager::getInstance()->getDataDir() + directoryName);114 dir.setFileName(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + directoryName); 115 115 dir.open(); 116 116 … … 135 135 continue; 136 136 } 137 printf("%s\n", (ResourceManager::getInstance()->getDataDir() + fileName).c_str());137 printf("%s\n", (Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + fileName).c_str()); 138 138 if (!nocaseCmp(completionBegin, fileName, completionBegin.size()) && 139 ResourceManager::isInDataDir(fileName))139 Resources::NewResourceManager::getInstance()->checkFileInMainPath(fileName)) 140 140 { 141 141 printf("Dir %s\n", fileName.c_str()); -
branches/new_class_id/src/lib/sound/sound_engine.cc
r9805 r9833 22 22 23 23 #include "p_node.h" 24 #include "util/loading/resource_manager.h"25 24 #include "debug.h" 26 25 #include "util/preferences.h" -
branches/new_class_id/src/lib/util/loading/game_loader.cc
r9794 r9833 20 20 #include "game_loader.h" 21 21 #include "util/loading/load_param.h" 22 22 #include "util/loading/new_resource_manager.h" 23 23 #include "debug.h" 24 24 #include "campaign.h" 25 26 #include "util/loading/resource_manager.h"27 25 28 26 #include "key_mapper.h" … … 85 83 { 86 84 ErrorMessage errorCode; 87 std::string campaignName = Resource Manager::getFullName(fileName);85 std::string campaignName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 88 86 if (!campaignName.empty()) 89 87 { … … 105 103 { 106 104 ErrorMessage errorCode; 107 std::string campaignName = Resource Manager::getFullName(fileName);105 std::string campaignName = Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(fileName); 108 106 if (!campaignName.empty()) 109 107 { -
branches/new_class_id/src/lib/util/loading/new_resource_manager.cc
r9802 r9833 120 120 } 121 121 122 std::string NewResourceManager::prependAbsoluteMainPath(const std::string& fileName) 123 { 124 return (this->_mainGlobalPath + File(fileName)).name(); 125 } 122 126 123 127 -
branches/new_class_id/src/lib/util/loading/new_resource_manager.h
r9802 r9833 44 44 45 45 bool checkFileInMainPath(const File& fileInside); 46 std::string prependAbsoluteMainPath(const std::string& fileName); 46 47 47 48 bool unloadAllByKeepLevel(const Resources::KeepLevel& keepLevel);
Note: See TracChangeset
for help on using the changeset viewer.