diff --git a/.gitignore b/.gitignore index b17b5a5848..ada874bb22 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ Doxygen prebuilt apps/openmw/config.hpp Docs/mainpage.hpp +CMakeFiles +*/CMakeFiles +CMakeCache.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f99b41496c..509105fc42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,14 @@ set(BSA_HEADER ${COMP_DIR}/bsa/bsa_file.hpp) source_group(components\\bsa FILES ${BSA} ${BSA_HEADER}) +set(CFG + ${COMP_DIR}/cfg/configurationmanager.cpp + ) +set(CFG_HEADER + ${COMP_DIR}/cfg/configurationmanager.hpp + ) +source_group(components\\cfg FILES ${CFG} ${CFG_HEADER}) + set(NIF ${COMP_DIR}/nif/nif_file.cpp) set(NIF_HEADER @@ -189,22 +197,29 @@ source_group(components\\esm FILES ${ESM_HEADER} ${ESM}) set(MISC ${COMP_DIR}/misc/stringops.cpp - ${COMP_DIR}/misc/fileops.cpp) + ) set(MISC_HEADER - ${COMP_DIR}/misc/fileops.hpp ${COMP_DIR}/misc/slice_array.hpp - ${COMP_DIR}/misc/stringops.hpp) + ${COMP_DIR}/misc/stringops.hpp + ) source_group(components\\misc FILES ${MISC} ${MISC_HEADER}) set(FILES - ${COMP_DIR}/files/path.cpp + ${COMP_DIR}/files/linuxpath.cpp + ${COMP_DIR}/files/windowspath.cpp + ${COMP_DIR}/files/macospath.cpp ${COMP_DIR}/files/multidircollection.cpp ${COMP_DIR}/files/collections.cpp + ${COMP_DIR}/files/fileops.cpp ) set(FILES_HEADER + ${COMP_DIR}/files/linuxpath.hpp + ${COMP_DIR}/files/windowspath.hpp + ${COMP_DIR}/files/macospath.hpp ${COMP_DIR}/files/path.hpp ${COMP_DIR}/files/multidircollection.hpp ${COMP_DIR}/files/collections.hpp + ${COMP_DIR}/files/fileops.hpp ) source_group(components\\files FILES ${FILES} ${FILES_HEADER}) @@ -217,10 +232,14 @@ file(GLOB INTERPRETER_HEADER ${COMP_DIR}/interpreter/*.hpp) source_group(components\\interpreter FILES ${INTERPRETER} ${INTERPRETER_HEADER}) set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${MISC} ${TO_UTF8} - ${COMPILER} ${INTERPRETER} ${ESM} ${FILE_FINDER} ${NIFBULLET} ${FILES}) + ${COMPILER} ${INTERPRETER} ${ESM} ${FILE_FINDER} ${NIFBULLET} ${FILES} + ${CFG} + ) set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER} ${ESM_HEADER} ${MISC_HEADER} ${COMPILER_HEADER} ${TO_UTF8_HEADER} - ${INTERPRETER_HEADER} ${FILE_FINDER_HEADER} ${NIFBULLET_HEADER} ${FILES_HEADER}) + ${INTERPRETER_HEADER} ${FILE_FINDER_HEADER} ${NIFBULLET_HEADER} ${FILES_HEADER} + ${CFG_HEADER} + ) # source directory: libs diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt index 5090c167d4..38a8948662 100644 --- a/apps/launcher/CMakeLists.txt +++ b/apps/launcher/CMakeLists.txt @@ -52,6 +52,7 @@ add_executable(omwlauncher ${LAUNCHER} ${MISC} ${MISC_HEADER} ${FILES} ${FILES_HEADER} + ${CFG} ${CFG_HEADER} ${TO_UTF8} ${ESM} ${RCC_SRCS} diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp index 80694f2796..c8311846f5 100644 --- a/apps/launcher/datafilespage.cpp +++ b/apps/launcher/datafilespage.cpp @@ -1,9 +1,9 @@ #include #include -#include #include #include +#include #include "datafilespage.hpp" #include "lineedit.hpp" @@ -127,7 +127,7 @@ DataFilesPage::DataFilesPage(QWidget *parent) : QWidget(parent) void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict) { // Put the paths in a boost::filesystem vector to use with Files::Collections - std::vector dataDirs; + Files::PathContainer dataDirs; foreach (const QString ¤tPath, paths) { dataDirs.push_back(boost::filesystem::path(currentPath.toStdString())); @@ -142,9 +142,9 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict) for (Files::MultiDirCollection::TIter iter(esm.begin()); iter!=esm.end(); ++iter) { - std::string filename = boost::filesystem::path (iter->second.filename()).string(); - QString currentMaster = QString::fromStdString(filename); - + QString currentMaster = QString::fromStdString( + boost::filesystem::path (iter->second.filename()).string()); + const QList itemList = mMastersWidget->findItems(currentMaster, Qt::MatchExactly); if (itemList.isEmpty()) // Master is not yet in the widget @@ -163,8 +163,8 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict) { ESMReader fileReader; QStringList availableMasters; // Will contain all found masters - - fileReader.setEncoding("win1252"); + + fileReader.setEncoding("win1252"); // FIXME: This should be configurable! fileReader.open(iter->second.string()); // First we fill the availableMasters and the mMastersWidget @@ -179,12 +179,12 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict) if (itemList.isEmpty()) // Master is not yet in the widget { mMastersWidget->insertRow(i); - + QTableWidgetItem *item = new QTableWidgetItem(currentMaster); item->setForeground(Qt::red); item->setFlags(item->flags() & ~(Qt::ItemIsSelectable)); - - mMastersWidget->setItem(i, 0, item); + + mMastersWidget->setItem(i, 0, item); } } @@ -192,18 +192,18 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict) // Now we put the current plugin in the mDataFilesModel under its masters QStandardItem *parent = new QStandardItem(availableMasters.join(",")); - + QString fileName = QString::fromStdString(boost::filesystem::path (iter->second.filename()).string()); QStandardItem *child = new QStandardItem(fileName); - + // Tooltip information QString author = QString::fromStdString(fileReader.getAuthor()); float version = fileReader.getFVer(); QString description = QString::fromStdString(fileReader.getDesc()); - + // For the date created/modified QFileInfo fi(QString::fromStdString(iter->second.string())); - + QString toolTip= QString("Author: %1
\ Version: %2

\ Description:
\ @@ -215,9 +215,9 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict) .arg(description) .arg(fi.created().toString(Qt::TextDate)) .arg(fi.lastModified().toString(Qt::TextDate)); - + child->setToolTip(toolTip); - + const QList masterList = mDataFilesModel->findItems(availableMasters.join(",")); if (masterList.isEmpty()) { // Masters node not yet in the mDataFilesModel @@ -236,12 +236,13 @@ void DataFilesPage::setupDataFiles(const QStringList &paths, bool strict) void DataFilesPage::setupConfig() { - QString config = "./launcher.cfg"; + Cfg::ConfigurationManager cfg; + + QString config = (cfg.getRuntimeConfigPath() / "launcher.cfg").string().c_str(); QFile file(config); if (!file.exists()) { - config = QString::fromStdString(Files::getPath(Files::Path_ConfigUser, - "openmw", "launcher.cfg")); + config = QString::fromStdString((cfg.getLocalConfigPath() / "launcher.cfg").string()); } file.setFileName(config); // Just for displaying information @@ -672,7 +673,7 @@ void DataFilesPage::showContextMenu(const QPoint &point) if (!mPluginsTable->selectionModel()->hasSelection()) { return; } - + QPoint globalPos = mPluginsTable->mapToGlobal(point); QModelIndexList selectedIndexes = mPluginsTable->selectionModel()->selectedIndexes(); @@ -971,7 +972,7 @@ void DataFilesPage::writeConfig(QString profile) if (mPluginsModel->rowCount() < 1) { return; } - + if (profile.isEmpty()) { profile = mProfilesComboBox->currentText(); } diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index c63dbda406..ffa4d5d598 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -1,7 +1,5 @@ #include -#include - #include "graphicspage.hpp" GraphicsPage::GraphicsPage(QWidget *parent) : QWidget(parent) @@ -149,44 +147,21 @@ void GraphicsPage::createPages() void GraphicsPage::setupConfig() { - QString ogreCfg = "./ogre.cfg"; - + QString ogreCfg = mCfg.getOgreConfigPath().string().c_str(); QFile file(ogreCfg); - - if (!file.exists()) { - ogreCfg = QString::fromStdString(Files::getPath(Files::Path_ConfigUser, - "openmw", "ogre.cfg")); - } - mOgreConfig = new QSettings(ogreCfg, QSettings::IniFormat); - } void GraphicsPage::setupOgre() { - QString pluginCfg = "./plugins.cfg"; + QString pluginCfg = mCfg.getPluginsConfigPath().string().c_str(); QFile file(pluginCfg); - if (!file.exists()) { - pluginCfg = QString::fromStdString(Files::getPath(Files::Path_ConfigUser, - "openmw", "plugins.cfg")); - } - - // Reopen the file from user directory - file.setFileName(pluginCfg); - - if (!file.exists()) { - // There's no plugins.cfg in the user directory, use global directory - pluginCfg = QString::fromStdString(Files::getPath(Files::Path_ConfigGlobal, - "openmw", "plugins.cfg")); - } - // Create a log manager so we can surpress debug text to stdout/stderr Ogre::LogManager* logMgr = OGRE_NEW Ogre::LogManager; - logMgr->createLog("launcherOgre.log", true, false, false); + logMgr->createLog((mCfg.getLogPath().string() + "/launcherOgre.log"), true, false, false); - QString ogreCfg = QString::fromStdString(Files::getPath(Files::Path_ConfigUser, - "openmw", "ogre.cfg")); + QString ogreCfg = QString::fromStdString(mCfg.getOgreConfigPath().string()); file.setFileName(ogreCfg); try @@ -355,62 +330,62 @@ void GraphicsPage::writeConfig() } else { mDirect3DRenderSystem->setConfigOption("Allow NVPerfHUD", "No"); } - + // Antialiasing mDirect3DRenderSystem->setConfigOption("FSAA", mD3DAntiAliasingComboBox->currentText().toStdString()); - + // Full screen if (mD3DFullScreenCheckBox->checkState() == Qt::Checked) { mDirect3DRenderSystem->setConfigOption("Full Screen", "Yes"); } else { mDirect3DRenderSystem->setConfigOption("Full Screen", "No"); } - + // Rendering device mDirect3DRenderSystem->setConfigOption("Rendering Device", mD3DRenderDeviceComboBox->currentText().toStdString()); - + // VSync if (mD3DVSyncCheckBox->checkState() == Qt::Checked) { mDirect3DRenderSystem->setConfigOption("VSync", "Yes"); } else { mDirect3DRenderSystem->setConfigOption("VSync", "No"); } - + // Resolution mDirect3DRenderSystem->setConfigOption("Video Mode", mD3DResolutionComboBox->currentText().toStdString()); } - + if (mOpenGLRenderSystem) { // Display Frequency mOpenGLRenderSystem->setConfigOption("Display Frequency", mOGLFrequencyComboBox->currentText().toStdString()); - + // Antialiasing mOpenGLRenderSystem->setConfigOption("FSAA", mOGLAntiAliasingComboBox->currentText().toStdString()); - + // Full screen if (mOGLFullScreenCheckBox->checkState() == Qt::Checked) { mOpenGLRenderSystem->setConfigOption("Full Screen", "Yes"); } else { mOpenGLRenderSystem->setConfigOption("Full Screen", "No"); } - + // RTT mode mOpenGLRenderSystem->setConfigOption("RTT Preferred Mode", mOGLRTTComboBox->currentText().toStdString()); - + // VSync if (mOGLVSyncCheckBox->checkState() == Qt::Checked) { mOpenGLRenderSystem->setConfigOption("VSync", "Yes"); } else { mOpenGLRenderSystem->setConfigOption("VSync", "No"); } - + // Resolution mOpenGLRenderSystem->setConfigOption("Video Mode", mOGLResolutionComboBox->currentText().toStdString()); } - + // Now we validate the options QString ogreError = QString::fromStdString(mSelectedRenderSystem->validateConfigOptions()); - + if (!ogreError.isEmpty()) { QMessageBox msgBox; msgBox.setWindowTitle("Error validating configuration"); @@ -421,17 +396,17 @@ void GraphicsPage::writeConfig() Press \"Show Details...\" for more information.
")); msgBox.setDetailedText(ogreError); msgBox.exec(); - + Ogre::LogManager::getSingletonPtr()->logMessage( "Caught exception in validateConfigOptions"); - + qCritical("Error validating configuration"); - + std::exit(1); } // Write the settings to the config file mOgre->saveConfig(); - + } QString GraphicsPage::getConfigValue(const QString &key, Ogre::RenderSystem *renderer) @@ -482,4 +457,4 @@ void GraphicsPage::rendererChanged(const QString &renderer) } mSelectedRenderSystem = mOgre->getRenderSystemByName(renderer.toStdString()); -} \ No newline at end of file +} diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp index 49ed92ac0b..5d50cfc613 100644 --- a/apps/launcher/graphicspage.hpp +++ b/apps/launcher/graphicspage.hpp @@ -7,6 +7,7 @@ #include #include #include +#include class QComboBox; class QCheckBox; @@ -28,6 +29,7 @@ public slots: void rendererChanged(const QString &renderer); private: + Cfg::ConfigurationManager mCfg; Ogre::Root *mOgre; Ogre::RenderSystem *mSelectedRenderSystem; Ogre::RenderSystem *mOpenGLRenderSystem; diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp index c1f6d8b7e4..31313e7a39 100644 --- a/apps/launcher/maindialog.cpp +++ b/apps/launcher/maindialog.cpp @@ -1,7 +1,5 @@ #include -#include - #include "maindialog.hpp" #include "playpage.hpp" #include "graphicspage.hpp" @@ -92,7 +90,7 @@ QStringList MainDialog::readConfig(const QString &fileName) // We can't use QSettings directly because it // does not support multiple keys with the same name QFile file(fileName); - + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { QMessageBox msgBox; msgBox.setWindowTitle("Error opening OpenMW configuration file"); @@ -101,44 +99,44 @@ QStringList MainDialog::readConfig(const QString &fileName) msgBox.setText(tr("
Could not open %0

\ Please make sure you have the right permissions and try again.
").arg(file.fileName())); msgBox.exec(); - + QApplication::exit(); // File cannot be opened or created } - + QTextStream in(&file); QStringList dataDirs; QString dataLocal; - + // Read the config line by line while (!in.atEnd()) { QString line = in.readLine(); - + if (line.startsWith("data=")) { dataDirs.append(line.remove("data=")); } - + // Read the data-local key, if more than one are found only the last is used if (line.startsWith("data-local=")) { dataLocal = line.remove("data-local="); } - + // Read fs-strict key if (line.startsWith("fs-strict=")) { QString value = line.remove("fs-strict="); - + (value.toLower() == QLatin1String("true")) ? mStrict = true : mStrict = false; - + } - + } - - // Add the data-local= key to the end of the dataDirs for priority reasons + + // Add the data-local= key to the end of the dataDirs for priority reasons if (!dataLocal.isEmpty()) { dataDirs.append(dataLocal); } - + if (!dataDirs.isEmpty()) { // Reset the global datadirs to the newly read entries @@ -147,7 +145,7 @@ QStringList MainDialog::readConfig(const QString &fileName) } file.close(); - + return mDataDirs; } @@ -156,31 +154,29 @@ void MainDialog::createPages() mPlayPage = new PlayPage(this); mGraphicsPage = new GraphicsPage(this); mDataFilesPage = new DataFilesPage(this); - + // Retrieve all data entries from the configs QStringList dataDirs; - + // Global location - QFile file(QString::fromStdString(Files::getPath(Files::Path_ConfigGlobal, - "openmw", "openmw.cfg"))); + QFile file(QString::fromStdString((mCfg.getGlobalConfigPath()/"openmw.cfg").string())); if (file.exists()) { dataDirs = readConfig(file.fileName()); } - + // User location - file.setFileName(QString::fromStdString(Files::getPath(Files::Path_ConfigUser, - "openmw", "openmw.cfg"))); + file.setFileName(QString::fromStdString((mCfg.getLocalConfigPath()/"openmw.cfg").string())); if (file.exists()) { dataDirs = readConfig(file.fileName()); } // Local location file.setFileName("./openmw.cfg"); - + if (file.exists()) { dataDirs = readConfig(file.fileName()); - } - + } + file.close(); if (!dataDirs.isEmpty()) { @@ -331,9 +327,8 @@ void MainDialog::writeConfig() QStringList dataFiles = mDataFilesPage->selectedMasters(); dataFiles.append(mDataFilesPage->checkedPlugins()); - // Open the config as a QFile - QFile file(QString::fromStdString(Files::getPath(Files::Path_ConfigUser, - "openmw", "openmw.cfg"))); + // Open the config as a QFile + QFile file(QString::fromStdString((mCfg.getLocalConfigPath()/"openmw.cfg").string())); if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) { // File cannot be opened or created @@ -375,7 +370,7 @@ void MainDialog::writeConfig() } file.write(buffer); - + QTextStream out(&file); // Write the list of game files to the config diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp index 3ed72e0fd4..047050902a 100644 --- a/apps/launcher/maindialog.hpp +++ b/apps/launcher/maindialog.hpp @@ -3,6 +3,8 @@ #include +#include + class QListWidget; class QListWidgetItem; class QStackedWidget; @@ -30,12 +32,11 @@ public slots: private: void createIcons(); void createPages(); - void setupConfig(); void writeConfig(); void closeEvent(QCloseEvent *event); - + QStringList readConfig(const QString &fileName); - + QListWidget *mIconWidget; QStackedWidget *mPagesWidget; @@ -45,6 +46,8 @@ private: QStringList mDataDirs; bool mStrict; + + Cfg::ConfigurationManager mCfg; }; #endif diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index f8b4d7a59f..21f3e18a2a 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -16,6 +16,7 @@ set(GAME_HEADER source_group(game FILES ${GAME} ${GAME_HEADER}) set(GAMEREND + mwrender/rendering_manager.cpp mwrender/mwscene.cpp mwrender/cellimp.cpp mwrender/interior.cpp @@ -24,6 +25,7 @@ set(GAMEREND mwrender/player.cpp ) set(GAMEREND_HEADER + mwrender/rendering_manager.hpp mwrender/cell.hpp mwrender/cellimp.hpp mwrender/mwscene.hpp @@ -137,6 +139,8 @@ source_group(apps\\openmw\\mwsound FILES ${GAMESOUND} ${GAMESOUND_HEADER}) set(GAMEWORLD mwworld/world.cpp + mwworld/scene.cpp + mwworld/physicssystem.cpp mwworld/globals.cpp mwworld/class.cpp mwworld/actionteleport.cpp @@ -144,12 +148,13 @@ set(GAMEWORLD mwworld/actiontake.cpp mwworld/containerutil.cpp mwworld/player.cpp - mwworld/doingphysics.cpp + mwworld/cells.cpp ) set(GAMEWORLD_HEADER mwworld/refdata.hpp mwworld/world.hpp - mwworld/ptr.hpp + mwworld/physicssystem.hpp + mwworld/scene.hpp mwworld/environment.hpp mwworld/globals.hpp mwworld/class.hpp @@ -163,8 +168,8 @@ set(GAMEWORLD_HEADER mwworld/manualref.hpp mwworld/containerutil.hpp mwworld/player.hpp - mwworld/doingphysics.hpp mwworld/cellfunctors.hpp + mwworld/cells.hpp ) source_group(apps\\openmw\\mwworld FILES ${GAMEWORLD} ${GAMEWORLD_HEADER}) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index d70631cf8f..e9ceea2f34 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -11,7 +11,7 @@ #include "components/esm/records.hpp" #include -#include +#include #include #include #include @@ -209,7 +209,7 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt) return true; } -OMW::Engine::Engine() +OMW::Engine::Engine(Cfg::ConfigurationManager& configurationManager) : mPhysicEngine (0) , mShowFPS (false) , mDebug (false) @@ -221,6 +221,7 @@ OMW::Engine::Engine() , mScriptContext (0) , mGuiManager (0) , mFSStrict (false) + , mCfgMgr(configurationManager) { MWClass::registerClasses(); } @@ -251,9 +252,8 @@ void OMW::Engine::loadBSA() Bsa::addBSA (iter->second.string()); } - std::string m = mDataDir.string(); - std::cout << "Data dir" << m << "\n"; - Bsa::addDir(m, mFSStrict); + std::cout << "Data dir " << mDataDir.string() << std::endl; + Bsa::addDir(mDataDir.string(), mFSStrict); } // add resources directory @@ -265,19 +265,18 @@ void OMW::Engine::addResourcesDirectory (const boost::filesystem::path& path) Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true); } -void OMW::Engine::enableFSStrict() +void OMW::Engine::enableFSStrict(bool fsStrict) { - mFSStrict = true; + mFSStrict = fsStrict; } // Set data dir -void OMW::Engine::setDataDirs (const std::vector& dataDirs) +void OMW::Engine::setDataDirs (const Files::PathContainer& dataDirs) { /// \todo remove mDataDir, once resources system can handle multiple directories assert (!dataDirs.empty()); - mDataDir = dataDirs[0]; - + mDataDir = dataDirs.back(); mFileCollections = Files::Collections (dataDirs, !mFSStrict); } @@ -311,19 +310,19 @@ void OMW::Engine::addMaster (const std::string& master) } } -void OMW::Engine::enableDebugMode() +void OMW::Engine::setDebugMode(bool debugMode) { - mDebug = true; + mDebug = debugMode; } -void OMW::Engine::enableVerboseScripts() +void OMW::Engine::setScriptsVerbosity(bool scriptsVerbosity) { - mVerboseScripts = true; + mVerboseScripts = scriptsVerbosity; } -void OMW::Engine::setNewGame() +void OMW::Engine::setNewGame(bool newGame) { - mNewGame = true; + mNewGame = newGame; } // Initialise and enter main loop. @@ -337,19 +336,10 @@ void OMW::Engine::go() test.name = ""; total = 0; - std::string cfgDir = Files::getPath (Files::Path_ConfigGlobal, "openmw", ""); - std::string cfgUserDir = Files::getPath (Files::Path_ConfigUser, "openmw", ""); - std::string plugCfg = "plugins.cfg"; - std::string ogreCfg = "ogre.cfg"; - ogreCfg.insert(0, cfgUserDir); - - //A local plugins.cfg will be used if it exist, otherwise look in the default path - if(!Misc::isFile(plugCfg.c_str())) - { - plugCfg.insert(0, cfgDir); - } - - mOgre.configure(!Misc::isFile(ogreCfg.c_str()), cfgUserDir, plugCfg, false); + mOgre.configure(!boost::filesystem::is_regular_file(mCfgMgr.getOgreConfigPath()), + mCfgMgr.getOgreConfigPath().string(), + mCfgMgr.getLogPath().string() + std::string("/"), + mCfgMgr.getPluginsConfigPath().string(), false); // This has to be added BEFORE MyGUI is initialized, as it needs // to find core.xml here. @@ -369,7 +359,9 @@ void OMW::Engine::go() mResDir, mNewGame, mEnvironment, mEncoding); // Set up the GUI system - mGuiManager = new OEngine::GUI::MyGUIManager(mOgre.getWindow(), mOgre.getScene(), false, cfgDir); + mGuiManager = new OEngine::GUI::MyGUIManager(mOgre.getWindow(), mOgre.getScene(), false, + mCfgMgr.getLogPath().string() + std::string("/")); + MyGUI::FactoryManager::getInstance().registerFactory("Widget"); MyGUI::FactoryManager::getInstance().registerFactory("Widget"); MyGUI::FactoryManager::getInstance().registerFactory("Widget"); @@ -516,7 +508,17 @@ void OMW::Engine::setCompileAll (bool all) mCompileAll = all; } +void OMW::Engine::setSoundUsage(bool soundUsage) +{ + mUseSound = soundUsage; +} + +void OMW::Engine::showFPS(bool showFps) +{ + mShowFPS = showFps; +} + void OMW::Engine::setEncoding(const std::string& encoding) { mEncoding = encoding; -} \ No newline at end of file +} diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp index 9d14666558..3df0d0b3af 100644 --- a/apps/openmw/engine.hpp +++ b/apps/openmw/engine.hpp @@ -15,7 +15,7 @@ #include "mwworld/environment.hpp" #include "mwworld/ptr.hpp" #include - +#include namespace Compiler { @@ -53,7 +53,6 @@ namespace OEngine namespace OMW { /// \brief Main engine class, that brings together all the components of OpenMW - class Engine : private Ogre::FrameListener { std::string mEncoding; @@ -106,49 +105,44 @@ namespace OMW /// Process pending commands public: - - Engine(); - - ~Engine(); + Engine(Cfg::ConfigurationManager& configurationManager); + virtual ~Engine(); /// Enable strict filesystem mode (do not fold case) /// /// \attention The strict mode must be specified before any path-related settings /// are given to the engine. - void enableFSStrict(); + void enableFSStrict(bool fsStrict); /// Set data dirs - void setDataDirs (const std::vector& dataDirs); + void setDataDirs(const Files::PathContainer& dataDirs); /// Set resource dir - void setResourceDir (const boost::filesystem::path& parResDir); + void setResourceDir(const boost::filesystem::path& parResDir); /// Set start cell name (only interiors for now) - void setCell (const std::string& cellName); + void setCell(const std::string& cellName); /// Set master file (esm) /// - If the given name does not have an extension, ".esm" is added automatically /// - Currently OpenMW only supports one master at the same time. - void addMaster (const std::string& master); + void addMaster(const std::string& master); /// Enable fps counter - void showFPS() { mShowFPS = true; } + void showFPS(bool showFps); /// Enable debug mode: /// - non-exclusive input - void enableDebugMode(); - - /// Enable the command server so external apps can send commands to the console. - /// Must be set before go(). + void setDebugMode(bool debugMode); - /// Enable verbose script output - void enableVerboseScripts(); + /// Enable or disable verbose script output + void setScriptsVerbosity(bool scriptsVerbosity); - /// Disable all sound - void disableSound() { mUseSound = false; } + /// Disable or enable all sounds + void setSoundUsage(bool soundUsage); /// Start as a new game. - void setNewGame(); + void setNewGame(bool newGame); /// Initialise and enter main loop. void go(); @@ -161,7 +155,10 @@ namespace OMW /// Font encoding void setEncoding(const std::string& encoding); + + private: + Cfg::ConfigurationManager& mCfgMgr; }; } -#endif +#endif /* ENGINE_H */ diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index ed85f4beb7..aa8b13b80d 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -5,8 +5,10 @@ #include -#include +#include #include +#include +#include #include "engine.hpp" @@ -35,56 +37,64 @@ using namespace std; -/// Parse command line options and openmw.cfg file (if one exists). Results are directly -/// written to \a engine. -/// \return Run OpenMW? - -bool parseOptions (int argc, char**argv, OMW::Engine& engine) +/** + * \brief Parses application command line and calls \ref Cfg::ConfigurationManager + * to parse configuration files. + * + * Results are directly written to \ref Engine class. + * + * \retval true - Everything goes OK + * \retval false - Error + */ +bool parseOptions (int argc, char** argv, OMW::Engine& engine, Cfg::ConfigurationManager& cfgMgr) { // Create a local alias for brevity namespace bpo = boost::program_options; + typedef std::vector StringsVector; - bpo::options_description desc ( - "Syntax: openmw \nAllowed options"); + bpo::options_description desc("Syntax: openmw \nAllowed options"); desc.add_options() - ("help", "print help message and quit") + ("help", "print help message") ("version", "print version information and quit") - ("data", bpo::value >() - ->default_value (std::vector(), "data") - ->multitoken(), - "set data directories (later directories have higher priority)") - ("data-local", bpo::value()->default_value (""), + ("data", bpo::value()->default_value(Files::PathContainer(), "data") + ->multitoken(), "set data directories (later directories have higher priority)") + + ("data-local", bpo::value()->default_value(""), "set local data directory (highest priority)") - ("resources", bpo::value()->default_value ("resources"), + + ("resources", bpo::value()->default_value("resources"), "set resources directory") - ("start", bpo::value()->default_value ("Beshara"), + + ("start", bpo::value()->default_value("Beshara"), "set initial cell") - ("master", bpo::value >() - ->default_value (std::vector(), "") - ->multitoken(), - "master file(s)") - ("plugin", bpo::value >() - ->default_value (std::vector(), "") - ->multitoken(), - "plugin file(s)") - ( "fps", boost::program_options::value()-> - implicit_value (true)->default_value (false), "show fps counter") - ( "debug", boost::program_options::value()-> - implicit_value (true)->default_value (false), "debug mode" ) - ( "nosound", boost::program_options::value()-> - implicit_value (true)->default_value (false), "disable all sound" ) - ( "script-verbose", boost::program_options::value()-> - implicit_value (true)->default_value (false), "verbose script output" ) - ( "new-game", boost::program_options::value()-> - implicit_value (true)->default_value (false), - "activate char gen/new game mechanics" ) - ( "script-all", boost::program_options::value()-> - implicit_value (true)->default_value (false), - "compile all scripts (excluding dialogue scripts) at startup") - ( "fs-strict", boost::program_options::value()-> - implicit_value (true)->default_value (false), - "strict file system handling (no case folding)") + + ("master", bpo::value()->default_value(StringsVector(), "") + ->multitoken(), "master file(s)") + + ("plugin", bpo::value()->default_value(StringsVector(), "") + ->multitoken(), "plugin file(s)") + + ("fps", boost::program_options::value()->implicit_value(true) + ->default_value(false), "show fps counter") + + ("debug", boost::program_options::value()->implicit_value(true) + ->default_value(false), "debug mode") + + ("nosound", boost::program_options::value()->implicit_value(true) + ->default_value(false), "disable all sounds") + + ("script-verbose", boost::program_options::value()->implicit_value(true) + ->default_value(false), "verbose script output") + + ("new-game", boost::program_options::value()->implicit_value(true) + ->default_value(false), "activate char gen/new game mechanics") + + ("script-all", boost::program_options::value()->implicit_value(true) + ->default_value(false), "compile all scripts (excluding dialogue scripts) at startup") + + ("fs-strict", boost::program_options::value()->implicit_value(true) + ->default_value(false), "strict file system handling (no case folding)") ( "encoding", boost::program_options::value()-> default_value("win1252"), @@ -94,31 +104,16 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine) "\n\twin1252 - Western European (Latin) alphabet, used by default") ; - bpo::variables_map variables; - - //If there is an openmw.cfg in the current path use that as global config - //Otherwise try getPath - std::string cfgFile = "openmw.cfg"; - if(!Misc::isFile(cfgFile.c_str())) - { - cfgFile = Files::getPath (Files::Path_ConfigGlobal, "openmw", "openmw.cfg"); - } - std::cout << "Using global config file: " << cfgFile << std::endl; - std::ifstream globalConfigFile(cfgFile.c_str()); + bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv) + .options(desc).allow_unregistered().run(); - cfgFile = Files::getPath (Files::Path_ConfigUser, "openmw", "openmw.cfg"); - std::cout << "Using user config file: " << cfgFile << std::endl; - std::ifstream userConfigFile(cfgFile.c_str()); - - bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).options(desc).allow_unregistered().run(); + bpo::variables_map variables; + // Runtime options override settings from all configs bpo::store(valid_opts, variables); bpo::notify(variables); - if (userConfigFile.is_open()) - bpo::store ( bpo::parse_config_file (userConfigFile, desc), variables); - if (globalConfigFile.is_open()) - bpo::store ( bpo::parse_config_file (globalConfigFile, desc), variables); + cfgMgr.readConfiguration(variables, desc); bool run = true; @@ -156,63 +151,57 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine) } // directory settings - if (variables["fs-strict"].as()==true) - engine.enableFSStrict(); + engine.enableFSStrict(variables["fs-strict"].as()); - std::vector dataDirs = variables["data"].as >(); - std::vector dataDirs2 (dataDirs.begin(), dataDirs.end()); + Files::PathContainer dataDirs(variables["data"].as()); - std::string local = variables["data-local"].as(); + std::string local(variables["data-local"].as()); if (!local.empty()) - dataDirs.push_back (local); + { + dataDirs.push_back(Files::PathContainer::value_type(local)); + } - engine.setDataDirs (dataDirs2); + if (dataDirs.empty()) + { + dataDirs.push_back(cfgMgr.getLocalDataPath()); + } - engine.setResourceDir (variables["resources"].as()); + engine.setDataDirs(dataDirs); + + engine.setResourceDir(variables["resources"].as()); // master and plugin - std::vector master = variables["master"].as >(); + StringsVector master = variables["master"].as(); if (master.empty()) { std::cout << "No master file given. Assuming Morrowind.esm" << std::endl; - master.push_back ("Morrowind"); + master.push_back("Morrowind"); } - if (master.size()>1) + if (master.size() > 1) { std::cout << "Ignoring all but the first master file (multiple master files not yet supported)." << std::endl; } + engine.addMaster(master[0]); - engine.addMaster (master[0]); - - std::vector plugin = variables["plugin"].as >(); - + StringsVector plugin = variables["plugin"].as(); if (!plugin.empty()) + { std::cout << "Ignoring plugin files (plugins not yet supported)." << std::endl; + } // startup-settings - engine.setCell (variables["start"].as()); - - if (variables["new-game"].as()==true) - engine.setNewGame(); + engine.setCell(variables["start"].as()); + engine.setNewGame(variables["new-game"].as()); // other settings - if (variables["fps"].as()==true) - engine.showFPS(); - - if (variables["debug"].as()==true) - engine.enableDebugMode(); - - if (variables["nosound"].as()==true) - engine.disableSound(); - - if (variables["script-verbose"].as()==true) - engine.enableVerboseScripts(); - - if (variables["script-all"].as()==true) - engine.setCompileAll (true); + engine.showFPS(variables["fps"].as()); + engine.setDebugMode(variables["debug"].as()); + engine.setSoundUsage(!variables["nosound"].as()); + engine.setScriptsVerbosity(variables["script-verbose"].as()); + engine.setCompileAll(variables["script-all"].as()); return true; } @@ -227,16 +216,17 @@ int main(int argc, char**argv) try { - OMW::Engine engine; + Cfg::ConfigurationManager cfgMgr; + OMW::Engine engine(cfgMgr); - if (parseOptions (argc, argv, engine)) + if (parseOptions(argc, argv, engine, cfgMgr)) { engine.go(); } } - catch(exception &e) + catch (std::exception &e) { - cout << "\nERROR: " << e.what() << endl; + std::cout << "\nERROR: " << e.what() << std::endl; return 1; } diff --git a/apps/openmw/mwrender/exterior.cpp b/apps/openmw/mwrender/exterior.cpp index 513fdac2a8..9dd82c68f1 100644 --- a/apps/openmw/mwrender/exterior.cpp +++ b/apps/openmw/mwrender/exterior.cpp @@ -34,8 +34,8 @@ bool ExteriorCellRender::lightOutQuadInLin = false; int ExteriorCellRender::uniqueID = 0; ExteriorCellRender::ExteriorCellRender(ESMS::CellStore &_cell, MWWorld::Environment& environment, - MWScene &_scene) - : mCell(_cell), mEnvironment (environment), mScene(_scene), mBase(NULL), mInsert(NULL), mAmbientMode (0) + MWScene &_scene, MWWorld::PhysicsSystem *physics) + : mCell(_cell), mEnvironment (environment), mScene(_scene), mPhysics(physics), mBase(NULL), mInsert(NULL), mAmbientMode (0) { uniqueID = uniqueID +1; sg = mScene.getMgr()->createStaticGeometry( "sg" + Ogre::StringConverter::toString(uniqueID)); @@ -233,13 +233,15 @@ void ExteriorCellRender::insertMesh(const std::string &mesh) void ExteriorCellRender::insertObjectPhysics() { if (!mInsertMesh.empty()) - mScene.addObject (mInsert->getName(), mInsertMesh, mInsert->getOrientation(), + { + mPhysics->addObject (mInsert->getName(), mInsertMesh, mInsert->getOrientation(), mInsert->getScale().x, mInsert->getPosition()); + } } void ExteriorCellRender::insertActorPhysics() { - mScene.addActor (mInsert->getName(), mInsertMesh, mInsert->getPosition()); + mPhysics->addActor (mInsert->getName(), mInsertMesh, mInsert->getPosition()); } // insert a light related to the most recent insertBegin call. @@ -348,13 +350,14 @@ void ExteriorCellRender::setAmbientMode() void ExteriorCellRender::show() { + // FIXME: this one may be the bug mBase = mScene.getRoot()->createChildSceneNode(); - + configureAmbient(); configureFog(); - + insertCell(mCell, mEnvironment); - + sg->build(); } diff --git a/apps/openmw/mwrender/exterior.hpp b/apps/openmw/mwrender/exterior.hpp index 6c7f6effc2..d8f6b9b96c 100644 --- a/apps/openmw/mwrender/exterior.hpp +++ b/apps/openmw/mwrender/exterior.hpp @@ -3,6 +3,7 @@ #include "cell.hpp" #include "cellimp.hpp" +#include "../mwworld/physicssystem.hpp" #include "OgreColourValue.h" #include @@ -49,6 +50,7 @@ namespace MWRender ESMS::CellStore &mCell; MWWorld::Environment &mEnvironment; MWScene &mScene; + MWWorld::PhysicsSystem *mPhysics; /// The scene node that contains all objects belonging to this /// cell. @@ -101,7 +103,7 @@ namespace MWRender public: ExteriorCellRender(ESMS::CellStore &_cell, MWWorld::Environment& environment, - MWScene &_scene); + MWScene &_scene, MWWorld::PhysicsSystem *physics); virtual ~ExteriorCellRender() { destroy(); } diff --git a/apps/openmw/mwrender/interior.cpp b/apps/openmw/mwrender/interior.cpp index 02bed0898d..bfde4b04e0 100644 --- a/apps/openmw/mwrender/interior.cpp +++ b/apps/openmw/mwrender/interior.cpp @@ -195,13 +195,15 @@ void InteriorCellRender::insertMesh(const std::string &mesh) void InteriorCellRender::insertObjectPhysics() { if (!mInsertMesh.empty()) - scene.addObject (insert->getName(), mInsertMesh, insert->getOrientation(), + { + mPhysics->addObject (insert->getName(), mInsertMesh, insert->getOrientation(), insert->getScale().x, insert->getPosition()); + } } void InteriorCellRender::insertActorPhysics() { - scene.addActor (insert->getName(), mInsertMesh, insert->getPosition()); + mPhysics->addActor (insert->getName(), mInsertMesh, insert->getPosition()); } // insert a light related to the most recent insertBegin call. diff --git a/apps/openmw/mwrender/interior.hpp b/apps/openmw/mwrender/interior.hpp index 295eaa4755..16fca0898c 100644 --- a/apps/openmw/mwrender/interior.hpp +++ b/apps/openmw/mwrender/interior.hpp @@ -3,6 +3,7 @@ #include "cell.hpp" #include "cellimp.hpp" +#include "../mwworld/physicssystem.hpp" #include "OgreColourValue.h" #include @@ -48,6 +49,7 @@ namespace MWRender ESMS::CellStore &cell; MWWorld::Environment &mEnvironment; MWScene &scene; + MWWorld::PhysicsSystem *mPhysics; /// The scene node that contains all objects belonging to this /// cell. @@ -93,8 +95,11 @@ namespace MWRender public: InteriorCellRender(ESMS::CellStore &_cell, MWWorld::Environment& environment, - MWScene &_scene) - : cell(_cell), mEnvironment (environment), scene(_scene), base(NULL), insert(NULL), ambientMode (0) {} + MWScene &_scene, MWWorld::PhysicsSystem *physics) + : cell(_cell), mEnvironment (environment), scene(_scene), base(NULL), insert(NULL), ambientMode (0) + { + mPhysics = physics; + } virtual ~InteriorCellRender() { destroy(); } diff --git a/apps/openmw/mwrender/mwscene.cpp b/apps/openmw/mwrender/mwscene.cpp index e4d449bf21..900b4d249d 100644 --- a/apps/openmw/mwrender/mwscene.cpp +++ b/apps/openmw/mwrender/mwscene.cpp @@ -11,7 +11,6 @@ #include "../mwworld/world.hpp" // these includes can be removed once the static-hack is gone #include "../mwworld/ptr.hpp" -#include "../mwworld/doingphysics.hpp" #include #include "player.hpp" @@ -43,7 +42,7 @@ MWScene::MWScene(OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicE //used to obtain ingame information of ogre objects (which are faced or selected) mRaySceneQuery = rend.getScene()->createRayQuery(Ray()); - Ogre::SceneNode *playerNode = mwRoot->createChildSceneNode(); + Ogre::SceneNode *playerNode = mwRoot->createChildSceneNode ("player"); playerNode->pitch(Degree(90)); Ogre::SceneNode *cameraYawNode = playerNode->createChildSceneNode(); Ogre::SceneNode *cameraPitchNode = cameraYawNode->createChildSceneNode(); @@ -51,8 +50,6 @@ MWScene::MWScene(OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicE mPlayer = new MWRender::Player (getCamera(), playerNode->getName()); - - mFreeFly = true; } MWScene::~MWScene() @@ -76,149 +73,6 @@ std::pair MWScene::getFacedHandle (MWWorld::World& world) return eng->rayTest(from,to); } -void MWScene::doPhysics (float duration, MWWorld::World& world, - const std::vector >& actors) -{ - // stop changes to world from being reported back to the physics system - MWWorld::DoingPhysics scopeGuard; - - //set the DebugRenderingMode. To disable it,set it to 0 - //eng->setDebugRenderingMode(1); - - //set the walkdirection to 0 (no movement) for every actor) - for(std::map::iterator it = eng->PhysicActorMap.begin(); it != eng->PhysicActorMap.end();it++) - { - OEngine::Physic::PhysicActor* act = it->second; - act->setWalkDirection(btVector3(0,0,0)); - } - - for (std::vector >::const_iterator iter (actors.begin()); - iter!=actors.end(); ++iter) - { - OEngine::Physic::PhysicActor* act = eng->getCharacter(iter->first); - - //dirty stuff to get the camera orientation. Must be changed! - - Ogre::SceneNode *sceneNode = rend.getScene()->getSceneNode (iter->first); - Ogre::Vector3 dir; - Ogre::Node* yawNode = sceneNode->getChildIterator().getNext(); - Ogre::Node* pitchNode = yawNode->getChildIterator().getNext(); - if(mFreeFly) - { - Ogre::Quaternion yawQuat = yawNode->getOrientation(); - Ogre::Quaternion pitchQuat = pitchNode->getOrientation(); - Ogre::Vector3 dir1(iter->second.x,iter->second.z,-iter->second.y); - dir = 0.07*(yawQuat*pitchQuat*dir1); - } - else - { - Ogre::Quaternion quat = yawNode->getOrientation(); - Ogre::Vector3 dir1(iter->second.x,iter->second.z,-iter->second.y); - dir = 0.025*(quat*dir1); - } - - //set the walk direction - act->setWalkDirection(btVector3(dir.x,-dir.z,dir.y)); - } - eng->stepSimulation(duration); - - for(std::map::iterator it = eng->PhysicActorMap.begin(); it != eng->PhysicActorMap.end();it++) - { - OEngine::Physic::PhysicActor* act = it->second; - btVector3 newPos = act->getPosition(); - MWWorld::Ptr ptr = world.getPtrViaHandle (it->first); - world.moveObject (ptr, newPos.x(), newPos.y(), newPos.z()); - } -} - -void MWScene::addObject (const std::string& handle, const std::string& mesh, - const Ogre::Quaternion& rotation, float scale, const Ogre::Vector3& position) -{ - OEngine::Physic::RigidBody* body = eng->createRigidBody(mesh,handle); - eng->addRigidBody(body); - btTransform tr; - tr.setOrigin(btVector3(position.x,position.y,position.z)); - tr.setRotation(btQuaternion(rotation.x,rotation.y,rotation.z,rotation.w)); - body->setWorldTransform(tr); -} - -void MWScene::addActor (const std::string& handle, const std::string& mesh, - const Ogre::Vector3& position) -{ - //TODO:optimize this. Searching the std::map isn't very efficient i think. - eng->addCharacter(handle); - OEngine::Physic::PhysicActor* act = eng->getCharacter(handle); - act->setPosition(btVector3(position.x,position.y,position.z)); -} - -void MWScene::removeObject (const std::string& handle) -{ - //TODO:check if actor??? - eng->removeCharacter(handle); - eng->removeRigidBody(handle); - eng->deleteRigidBody(handle); -} - -void MWScene::moveObject (const std::string& handle, const Ogre::Vector3& position, bool updatePhysics) -{ - rend.getScene()->getSceneNode(handle)->setPosition(position); - - if(updatePhysics)//TODO: is it an actor? Done? - { - if (OEngine::Physic::RigidBody* body = eng->getRigidBody(handle)) - { - // TODO very dirty hack to avoid crash during setup -> needs cleaning up to allow - // start positions others than 0, 0, 0 - btTransform tr = body->getWorldTransform(); - tr.setOrigin(btVector3(position.x,position.y,position.z)); - body->setWorldTransform(tr); - } - if (OEngine::Physic::PhysicActor* act = eng->getCharacter(handle)) - { - // TODO very dirty hack to avoid crash during setup -> needs cleaning up to allow - // start positions others than 0, 0, 0 - act->setPosition(btVector3(position.x,position.y,position.z)); - } - } -} - -void MWScene::rotateObject (const std::string& handle, const Ogre::Quaternion& rotation) -{ -} - -void MWScene::scaleObject (const std::string& handle, float scale) -{ - -} - -bool MWScene::toggleCollisionMode() -{ - for(std::map::iterator it = eng->PhysicActorMap.begin(); it != eng->PhysicActorMap.end();it++) - { - OEngine::Physic::PhysicActor* act = it->second; - bool cmode = act->getCollisionMode(); - if(cmode) - { - act->enableCollisions(false); - act->setGravity(0.); - act->setVerticalVelocity(0); - mFreeFly = true; - return false; - } - else - { - mFreeFly = false; - act->enableCollisions(true); - act->setGravity(4.); - act->setVerticalVelocity(0); - return true; - } - } - - return false; // This should never happen, but it shall not bother us now, since - // this part of the code needs a rewrite anyway. -} - bool MWScene::toggleRenderMode (int mode) { switch (mode) diff --git a/apps/openmw/mwrender/mwscene.hpp b/apps/openmw/mwrender/mwscene.hpp index 7429ff21e8..9186790351 100644 --- a/apps/openmw/mwrender/mwscene.hpp +++ b/apps/openmw/mwrender/mwscene.hpp @@ -44,8 +44,6 @@ namespace MWRender MWRender::Player *mPlayer; - bool mFreeFly; - public: MWScene (OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng); @@ -65,35 +63,6 @@ namespace MWRender /// can be faced std::pair getFacedHandle (MWWorld::World& world); - /// Run physics simulation and modify \a world accordingly. - void doPhysics (float duration, MWWorld::World& world, - const std::vector >& actors); - - /// Add object to physics system. - void addObject (const std::string& handle, const std::string& mesh, - const Ogre::Quaternion& rotation, float scale, const Ogre::Vector3& position); - - /// Add actor to physics system. - void addActor (const std::string& handle, const std::string& mesh, - const Ogre::Vector3& position); - - /// Remove object from physic systems. - void removeObject (const std::string& handle); - - /// Move object. - void moveObject (const std::string& handle, const Ogre::Vector3& position, bool updatePhysics); - - /// Change object's orientation. - void rotateObject (const std::string& handle, const Ogre::Quaternion& rotation); - - /// Change object's scale. - void scaleObject (const std::string& handle, float scale); - - /// Toggle collision mode for player. If disabled player object should ignore - /// collisions and gravity. - /// \return Resulting mode - bool toggleCollisionMode(); - /// Toggle render mode /// \todo Using an int instead of a enum here to avoid cyclic includes. Will be fixed /// when the mw*-refactoring is done. diff --git a/apps/openmw/mwrender/rendering_manager.cpp b/apps/openmw/mwrender/rendering_manager.cpp new file mode 100644 index 0000000000..e7ef93858b --- /dev/null +++ b/apps/openmw/mwrender/rendering_manager.cpp @@ -0,0 +1,52 @@ +#include "rendering_manager.hpp" + +namespace MWRender { + +RenderingManager::RenderingManager (SkyManager *skyManager) : + mSkyManager(skyManager) +{ + +} + +RenderingManager::~RenderingManager () +{ + delete mSkyManager; +} + +void RenderingManager::skyEnable () +{ + mSkyManager->enable(); +} + +void RenderingManager::skyDisable () +{ + mSkyManager->disable(); +} + +void RenderingManager::skySetHour (double hour) +{ + mSkyManager->setHour(hour); +} + + +void RenderingManager::skySetDate (int day, int month) +{ + mSkyManager->setDate(day, month); +} + +int RenderingManager::skyGetMasserPhase() const +{ + return mSkyManager->getMasserPhase(); +} + +int RenderingManager::skyGetSecundaPhase() const +{ + return mSkyManager->getSecundaPhase(); +} + +void RenderingManager::skySetMoonColour (bool red) +{ + mSkyManager->setMoonColour(red); +} + +} diff --git a/apps/openmw/mwrender/rendering_manager.hpp b/apps/openmw/mwrender/rendering_manager.hpp new file mode 100644 index 0000000000..d456716d3d --- /dev/null +++ b/apps/openmw/mwrender/rendering_manager.hpp @@ -0,0 +1,51 @@ +#ifndef _GAME_RENDERING_MANAGER_H +#define _GAME_RENDERING_MANAGER_H + + +#include "sky.hpp" + +#include "../mwworld/ptr.hpp" +#include +#include + +namespace MWRender +{ + +class RenderingManager { + public: + RenderingManager(SkyManager *skyManager); + ~RenderingManager(); + + void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this? + + void addObject (const MWWorld::Ptr& ptr, MWWorld::Ptr::CellStore *store); + void removeObject (const MWWorld::Ptr& ptr, MWWorld::Ptr::CellStore *store); + + void moveObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& position); + void scaleObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& scale); + void rotateObject (const MWWorld::Ptr& ptr, const::Ogre::Quaternion& orientation); + void moveObjectToCell (const MWWorld::Ptr& ptr, const Ogre::Vector3& position, MWWorld::Ptr::CellStore *store); + + void setPhysicsDebugRendering (bool); + bool getPhysicsDebugRendering() const; + + void update (float duration); + + void skyEnable (); + void skyDisable (); + void skySetHour (double hour); + void skySetDate (int day, int month); + int skyGetMasserPhase() const; + int skyGetSecundaPhase() const; + void skySetMoonColour (bool red); + + private: + + SkyManager* mSkyManager; + + +}; + +} + +#endif diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp new file mode 100644 index 0000000000..7d04cfc687 --- /dev/null +++ b/apps/openmw/mwworld/cells.cpp @@ -0,0 +1,198 @@ +#include "cells.hpp" + +#include + +#include + +MWWorld::Ptr::CellStore *MWWorld::Cells::getCellStore (const ESM::Cell *cell) +{ + if (cell->data.flags & ESM::Cell::Interior) + { + std::map::iterator result = mInteriors.find (cell->name); + + if (result==mInteriors.end()) + { + result = mInteriors.insert (std::make_pair (cell->name, Ptr::CellStore (cell))).first; + } + + return &result->second; + } + else + { + std::map, Ptr::CellStore>::iterator result = + mExteriors.find (std::make_pair (cell->data.gridX, cell->data.gridY)); + + if (result==mExteriors.end()) + { + result = mExteriors.insert (std::make_pair ( + std::make_pair (cell->data.gridX, cell->data.gridY), Ptr::CellStore (cell))).first; + + } + + return &result->second; + } +} + +MWWorld::Cells::Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader) +: mStore (store), mReader (reader) {} + +MWWorld::Ptr::CellStore *MWWorld::Cells::getExterior (int x, int y) +{ + std::map, Ptr::CellStore>::iterator result = + mExteriors.find (std::make_pair (x, y)); + + if (result==mExteriors.end()) + { + const ESM::Cell *cell = mStore.cells.findExt (x, y); + + result = mExteriors.insert (std::make_pair ( + std::make_pair (x, y), Ptr::CellStore (cell))).first; + + result->second.load (mStore, mReader); + } + + return &result->second; +} + +MWWorld::Ptr::CellStore *MWWorld::Cells::getInterior (const std::string& name) +{ + std::map::iterator result = mInteriors.find (name); + + if (result==mInteriors.end()) + { + const ESM::Cell *cell = mStore.cells.findInt (name); + + result = mInteriors.insert (std::make_pair (name, Ptr::CellStore (cell))).first; + + result->second.load (mStore, mReader); + } + + return &result->second; +} + +MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name, Ptr::CellStore& cell) +{ + if (cell.mState==Ptr::CellStore::State_Unloaded) + cell.preload (mStore, mReader); + + if (cell.mState==Ptr::CellStore::State_Preloaded) + { + std::string lowerCase; + + std::transform (name.begin(), name.end(), std::back_inserter (lowerCase), + (int(*)(int)) std::tolower); + + if (std::binary_search (cell.mIds.begin(), cell.mIds.end(), lowerCase)) + cell.load (mStore, mReader); + else + return Ptr(); + } + + if (ESMS::LiveCellRef *ref = cell.activators.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.potions.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.appas.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.armors.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.books.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.clothes.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.containers.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.creatures.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.doors.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.ingreds.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.creatureLists.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.itemLists.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.lights.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.lockpicks.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.miscItems.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.npcs.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.probes.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.repairs.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.statics.find (name)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = cell.weapons.find (name)) + return Ptr (ref, &cell); + + return Ptr(); +} + +MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name) +{ + // First check cells that are already listed + for (std::map::iterator iter = mInteriors.begin(); + iter!=mInteriors.end(); ++iter) + { + Ptr ptr = getPtr (name, iter->second); + if (!ptr.isEmpty()) + return ptr; + } + + for (std::map, Ptr::CellStore>::iterator iter = mExteriors.begin(); + iter!=mExteriors.end(); ++iter) + { + Ptr ptr = getPtr (name, iter->second); + if (!ptr.isEmpty()) + return ptr; + } + + // Now try the other cells + for (ESMS::CellList::IntCells::const_iterator iter = mStore.cells.intCells.begin(); + iter!=mStore.cells.intCells.end(); ++iter) + { + Ptr::CellStore *cellStore = getCellStore (iter->second); + + Ptr ptr = getPtr (name, *cellStore); + + if (!ptr.isEmpty()) + return ptr; + } + + for (ESMS::CellList::ExtCells::const_iterator iter = mStore.cells.extCells.begin(); + iter!=mStore.cells.extCells.end(); ++iter) + { + Ptr::CellStore *cellStore = getCellStore (iter->second); + + Ptr ptr = getPtr (name, *cellStore); + + if (!ptr.isEmpty()) + return ptr; + } + + // giving up + return Ptr(); +} diff --git a/apps/openmw/mwworld/cells.hpp b/apps/openmw/mwworld/cells.hpp new file mode 100644 index 0000000000..661969881f --- /dev/null +++ b/apps/openmw/mwworld/cells.hpp @@ -0,0 +1,48 @@ +#ifndef GAME_MWWORLD_CELLS_H +#define GAME_MWWORLD_CELLS_H + +#include +#include + +#include "ptr.hpp" + +namespace ESM +{ + class ESMReader; +} + +namespace ESM +{ + class ESMStore; +} + +namespace MWWorld +{ + /// \brief Cell container + class Cells + { + const ESMS::ESMStore& mStore; + ESM::ESMReader& mReader; + std::map mInteriors; + std::map, Ptr::CellStore> mExteriors; + + Cells (const Cells&); + Cells& operator= (const Cells&); + + Ptr::CellStore *getCellStore (const ESM::Cell *cell); + + public: + + Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader); + + Ptr::CellStore *getExterior (int x, int y); + + Ptr::CellStore *getInterior (const std::string& name); + + Ptr getPtr (const std::string& name, Ptr::CellStore& cellStore); + + Ptr getPtr (const std::string& name); + }; +} + +#endif diff --git a/apps/openmw/mwworld/doingphysics.cpp b/apps/openmw/mwworld/doingphysics.cpp deleted file mode 100644 index 84fb4e2abd..0000000000 --- a/apps/openmw/mwworld/doingphysics.cpp +++ /dev/null @@ -1,33 +0,0 @@ - -#include "doingphysics.hpp" - -namespace MWWorld -{ - int DoingPhysics::sCounter = 0; - int DoingPhysics::sSuppress = 0; - - DoingPhysics::DoingPhysics() - { - ++sCounter; - } - - DoingPhysics::~DoingPhysics() - { - --sCounter; - } - - bool DoingPhysics::isDoingPhysics() - { - return sCounter>0 && sSuppress==0; - } - - SuppressDoingPhysics::SuppressDoingPhysics() - { - ++DoingPhysics::sSuppress; - } - - SuppressDoingPhysics::~SuppressDoingPhysics() - { - --DoingPhysics::sSuppress; - } -} diff --git a/apps/openmw/mwworld/doingphysics.hpp b/apps/openmw/mwworld/doingphysics.hpp deleted file mode 100644 index d38e4bb15d..0000000000 --- a/apps/openmw/mwworld/doingphysics.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef GAME_MWWORLD_DOINGPHYSICS_H -#define GAME_MWWORLD_DOINGPHYSICS_H - -namespace MWWorld -{ - class SuppressDoingPhysics; - - /// Scope guard for blocking physics updates during physics simulation. - class DoingPhysics - { - static int sCounter; - static int sSuppress; - - private: - - DoingPhysics (const DoingPhysics&); - DoingPhysics& operator= (const DoingPhysics&); - - public: - - DoingPhysics(); - - ~DoingPhysics(); - - static bool isDoingPhysics(); - - friend class SuppressDoingPhysics; - }; - - /// Scope guard for temporarily lifting the block issues by DoingPhysics - class SuppressDoingPhysics - { - private: - - SuppressDoingPhysics (const SuppressDoingPhysics&); - SuppressDoingPhysics& operator= (const SuppressDoingPhysics&); - - public: - - SuppressDoingPhysics(); - - ~SuppressDoingPhysics(); - }; -} - -#endif diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp new file mode 100644 index 0000000000..fa617a9c72 --- /dev/null +++ b/apps/openmw/mwworld/physicssystem.cpp @@ -0,0 +1,164 @@ +#include "physicssystem.hpp" +#include "../mwworld/ptr.hpp" +#include "../mwworld/world.hpp" // FIXME + +#include "OgreRoot.h" +#include "OgreRenderWindow.h" +#include "OgreSceneManager.h" +#include "OgreViewport.h" +#include "OgreCamera.h" +#include "OgreTextureManager.h" + + +namespace MWWorld +{ + + PhysicsSystem::PhysicsSystem(OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng) : + mRender(_rend), mEngine(physEng), mFreeFly (true) + { + + } + + PhysicsSystem::~PhysicsSystem() + { + + } + + std::vector< std::pair > PhysicsSystem::doPhysics (float duration, + const std::vector >& actors) + { + //set the DebugRenderingMode. To disable it,set it to 0 + //eng->setDebugRenderingMode(1); + + //set the walkdirection to 0 (no movement) for every actor) + for(std::map::iterator it = mEngine->PhysicActorMap.begin(); it != mEngine->PhysicActorMap.end();it++) + { + OEngine::Physic::PhysicActor* act = it->second; + act->setWalkDirection(btVector3(0,0,0)); + } + + for (std::vector >::const_iterator iter (actors.begin()); + iter!=actors.end(); ++iter) + { + OEngine::Physic::PhysicActor* act = mEngine->getCharacter(iter->first); + + //dirty stuff to get the camera orientation. Must be changed! + + Ogre::SceneNode *sceneNode = mRender.getScene()->getSceneNode (iter->first); + Ogre::Vector3 dir; + Ogre::Node* yawNode = sceneNode->getChildIterator().getNext(); + Ogre::Node* pitchNode = yawNode->getChildIterator().getNext(); + if(mFreeFly) + { + Ogre::Quaternion yawQuat = yawNode->getOrientation(); + Ogre::Quaternion pitchQuat = pitchNode->getOrientation(); + Ogre::Vector3 dir1(iter->second.x,iter->second.z,-iter->second.y); + dir = 0.07*(yawQuat*pitchQuat*dir1); + } + else + { + Ogre::Quaternion quat = yawNode->getOrientation(); + Ogre::Vector3 dir1(iter->second.x,iter->second.z,-iter->second.y); + dir = 0.025*(quat*dir1); + } + + //set the walk direction + act->setWalkDirection(btVector3(dir.x,-dir.z,dir.y)); + } + mEngine->stepSimulation(duration); + + std::vector< std::pair > response; + for(std::map::iterator it = mEngine->PhysicActorMap.begin(); it != mEngine->PhysicActorMap.end();it++) + { + btVector3 newPos = it->second->getPosition(); + Ogre::Vector3 coord(newPos.x(), newPos.y(), newPos.z()); + + response.push_back(std::pair(it->first, coord)); + } + return response; + } + + void PhysicsSystem::addObject (const std::string& handle, const std::string& mesh, + const Ogre::Quaternion& rotation, float scale, const Ogre::Vector3& position) + { + OEngine::Physic::RigidBody* body = mEngine->createRigidBody(mesh,handle); + mEngine->addRigidBody(body); + btTransform tr; + tr.setOrigin(btVector3(position.x,position.y,position.z)); + tr.setRotation(btQuaternion(rotation.x,rotation.y,rotation.z,rotation.w)); + body->setWorldTransform(tr); + } + + void PhysicsSystem::addActor (const std::string& handle, const std::string& mesh, + const Ogre::Vector3& position) + { + //TODO:optimize this. Searching the std::map isn't very efficient i think. + mEngine->addCharacter(handle); + OEngine::Physic::PhysicActor* act = mEngine->getCharacter(handle); + act->setPosition(btVector3(position.x,position.y,position.z)); + } + + void PhysicsSystem::removeObject (const std::string& handle) + { + //TODO:check if actor??? + mEngine->removeCharacter(handle); + mEngine->removeRigidBody(handle); + mEngine->deleteRigidBody(handle); + } + + void PhysicsSystem::moveObject (const std::string& handle, const Ogre::Vector3& position) + { + if (OEngine::Physic::RigidBody* body = mEngine->getRigidBody(handle)) + { + // TODO very dirty hack to avoid crash during setup -> needs cleaning up to allow + // start positions others than 0, 0, 0 + btTransform tr = body->getWorldTransform(); + tr.setOrigin(btVector3(position.x,position.y,position.z)); + body->setWorldTransform(tr); + } + if (OEngine::Physic::PhysicActor* act = mEngine->getCharacter(handle)) + { + // TODO very dirty hack to avoid crash during setup -> needs cleaning up to allow + // start positions others than 0, 0, 0 + act->setPosition(btVector3(position.x,position.y,position.z)); + } + } + + void PhysicsSystem::rotateObject (const std::string& handle, const Ogre::Quaternion& rotation) + { + } + + void PhysicsSystem::scaleObject (const std::string& handle, float scale) + { + + } + + bool PhysicsSystem::toggleCollisionMode() + { + for(std::map::iterator it = mEngine->PhysicActorMap.begin(); it != mEngine->PhysicActorMap.end();it++) + { + OEngine::Physic::PhysicActor* act = it->second; + bool cmode = act->getCollisionMode(); + if(cmode) + { + act->enableCollisions(false); + act->setGravity(0.); + act->setVerticalVelocity(0); + mFreeFly = true; + return false; + } + else + { + mFreeFly = false; + act->enableCollisions(true); + act->setGravity(4.); + act->setVerticalVelocity(0); + return true; + } + } + + return false; // This should never happen, but it shall not bother us now, since + // this part of the code needs a rewrite anyway. + } + +} diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp new file mode 100644 index 0000000000..7f7bfdcbb5 --- /dev/null +++ b/apps/openmw/mwworld/physicssystem.hpp @@ -0,0 +1,47 @@ +#ifndef GAME_MWWORLD_PHYSICSSYSTEM_H +#define GAME_MWWORLD_PHYSICSSYSTEM_H + +#include +#include +#include + +namespace MWWorld +{ + + class PhysicsSystem + { + public: + PhysicsSystem (OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng); + ~PhysicsSystem (); + + std::vector< std::pair > doPhysics (float duration, + const std::vector >& actors); + + void addObject (const std::string& handle, const std::string& mesh, + const Ogre::Quaternion& rotation, float scale, const Ogre::Vector3& position); + + void addActor (const std::string& handle, const std::string& mesh, + const Ogre::Vector3& position); + + void removeObject (const std::string& handle); + + void moveObject (const std::string& handle, const Ogre::Vector3& position); + + void rotateObject (const std::string& handle, const Ogre::Quaternion& rotation); + + void scaleObject (const std::string& handle, float scale); + + bool toggleCollisionMode(); + + private: + OEngine::Render::OgreRenderer &mRender; + OEngine::Physic::PhysicEngine* mEngine; + bool mFreeFly; + + PhysicsSystem (const PhysicsSystem&); + PhysicsSystem& operator= (const PhysicsSystem&); + }; + +} + +#endif diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp index 259348938f..cad97c9ea5 100644 --- a/apps/openmw/mwworld/player.cpp +++ b/apps/openmw/mwworld/player.cpp @@ -13,11 +13,14 @@ namespace MWWorld mAutoMove (false), mForwardBackward (0) { mPlayer.base = player; + mPlayer.ref.refID = "player"; mName = player->name; mMale = !(player->flags & ESM::NPC::Female); mRace = player->race; mPlayer.ref.pos.pos[0] = mPlayer.ref.pos.pos[1] = mPlayer.ref.pos.pos[2] = 0; + std::cout << renderer->getHandle(); mPlayer.mData.setHandle (renderer->getHandle()); + /// \todo Do not make a copy of classes defined in esm/p records. mClass = new ESM::Class (*world.getStore().classes.find (player->cls)); } @@ -26,15 +29,10 @@ namespace MWWorld delete mClass; } - void Player::setPos(float x, float y, float z, bool updateCamera) + void Player::setPos(float x, float y, float z) { + /// \todo This fcuntion should be removed during the mwrender-refactoring. mWorld.moveObject (getPlayer(), x, y, z); - - if (updateCamera) - mRenderer->getCamera()->setPosition (Ogre::Vector3 ( - mPlayer.ref.pos.pos[0], - mPlayer.ref.pos.pos[2], - -mPlayer.ref.pos.pos[1])); } void Player::setClass (const ESM::Class& class_) diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp index fc29286a91..01c71da437 100644 --- a/apps/openmw/mwworld/player.hpp +++ b/apps/openmw/mwworld/player.hpp @@ -39,7 +39,7 @@ namespace MWWorld ~Player(); /// Set the player position. Uses Morrowind coordinates. - void setPos(float _x, float _y, float _z, bool updateCamera = false); + void setPos(float x, float y, float z); void setCell (MWWorld::Ptr::CellStore *cellStore) { diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp new file mode 100644 index 0000000000..11bdad35f6 --- /dev/null +++ b/apps/openmw/mwworld/scene.cpp @@ -0,0 +1,273 @@ +#include "scene.hpp" +#include "world.hpp" + +#include "../mwrender/interior.hpp" +#include "../mwrender/exterior.hpp" + +#include "../mwmechanics/mechanicsmanager.hpp" + +#include "../mwsound/soundmanager.hpp" + +#include "ptr.hpp" +#include "environment.hpp" +#include "player.hpp" +#include "class.hpp" + +#include "cellfunctors.hpp" + +namespace { + +template +void insertCellRefList (T& cellRefList, ESMS::CellStore &cell) +{ + if (!cellRefList.list.empty()) + { + //const MWWorld::Class& class_ = MWWorld::Class::get (MWWorld::Ptr (&*cellRefList.list.begin(), &cell)); + + for (typename T::List::iterator it = cellRefList.list.begin(); + it != cellRefList.list.end(); it++) + { + if (it->mData.getCount() || it->mData.isEnabled()) + { + MWWorld::Ptr ptr (&*it, &cell); + /* TODO: call + * RenderingManager.insertObject + * class_.insertObjectPhysic + * class_.insertObjectMechanics + */ + } + } + } +} + +} + + +namespace MWWorld +{ + + void Scene::unloadCell (CellRenderCollection::iterator iter) + { + ListHandles functor; + iter->first->forEach(functor); + + { // silence annoying g++ warning + for (std::vector::const_iterator iter (functor.mHandles.begin()); + iter!=functor.mHandles.end(); ++iter) + mPhysics->removeObject (*iter); + } + + mWorld->removeScripts (iter->first); + + mEnvironment.mMechanicsManager->dropActors (iter->first); + mEnvironment.mSoundManager->stopSound (iter->first); + delete iter->second; + mActiveCells.erase (iter); + } + + void Scene::loadCell (Ptr::CellStore *cell, MWRender::CellRender *render) + { + // register local scripts + mWorld->insertInteriorScripts (*cell); + + // This connects the cell data with the rendering scene. + std::pair result = + mActiveCells.insert (std::make_pair (cell, render)); + + if (result.second) + { + // Load the cell and insert it into the renderer + result.first->second->show(); + } + } + + void Scene::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, + bool adjustPlayerPos) + { + if (adjustPlayerPos) + mWorld->getPlayer().setPos (position.pos[0], position.pos[1], position.pos[2]); + + mWorld->getPlayer().setCell (cell); + // TODO orientation + mEnvironment.mMechanicsManager->addActor (mWorld->getPlayer().getPlayer()); + mEnvironment.mMechanicsManager->watchActor (mWorld->getPlayer().getPlayer()); + } + + void Scene::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos) + { + // remove active + mEnvironment.mMechanicsManager->removeActor (mWorld->getPlayer().getPlayer()); + + CellRenderCollection::iterator active = mActiveCells.begin(); + + while (active!=mActiveCells.end()) + { + if (!(active->first->cell->data.flags & ESM::Cell::Interior)) + { + if (std::abs (X-active->first->cell->data.gridX)<=1 && + std::abs (Y-active->first->cell->data.gridY)<=1) + { + // keep cells within the new 3x3 grid + ++active; + continue; + } + } + + unloadCell (active++); + } + + // Load cells + for (int x=X-1; x<=X+1; ++x) + for (int y=Y-1; y<=Y+1; ++y) + { + CellRenderCollection::iterator iter = mActiveCells.begin(); + + while (iter!=mActiveCells.end()) + { + assert (!(iter->first->cell->data.flags & ESM::Cell::Interior)); + + if (x==iter->first->cell->data.gridX && + y==iter->first->cell->data.gridY) + break; + + ++iter; + } + + if (iter==mActiveCells.end()) + { + Ptr::CellStore *cell = mWorld->getExterior(x, y); + + loadCell (cell, new MWRender::ExteriorCellRender (*cell, mEnvironment, mScene, mPhysics)); + } + } + + // find current cell + CellRenderCollection::iterator iter = mActiveCells.begin(); + + while (iter!=mActiveCells.end()) + { + assert (!(iter->first->cell->data.flags & ESM::Cell::Interior)); + + if (X==iter->first->cell->data.gridX && + Y==iter->first->cell->data.gridY) + break; + + ++iter; + } + + assert (iter!=mActiveCells.end()); + + mCurrentCell = iter->first; + + // adjust player + playerCellChange (mWorld->getExterior(X, Y), position, adjustPlayerPos); + + // Sky system + mWorld->adjustSky(); + + mCellChanged = true; + } + + Scene::Scene (Environment& environment, World *world, MWRender::MWScene& scene, PhysicsSystem *physics) + : mScene (scene), mCurrentCell (0), + mCellChanged (false), mEnvironment (environment), mWorld(world), mPhysics(physics) + { + } + + Scene::~Scene() + { + for (CellRenderCollection::iterator iter (mActiveCells.begin()); + iter!=mActiveCells.end(); ++iter) + delete iter->second; + } + + bool Scene::hasCellChanged() const + { + return mCellChanged; + } + + const Scene::CellRenderCollection& Scene::getActiveCells() const + { + return mActiveCells; + } + + void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position) + { + // remove active + CellRenderCollection::iterator active = mActiveCells.begin(); + + while (active!=mActiveCells.end()) + { + unloadCell (active++); + } + + // Load cell. + std::cout << "cellName:" << cellName << std::endl; + Ptr::CellStore *cell = mWorld->getInterior(cellName); + + loadCell (cell, new MWRender::InteriorCellRender (*cell, mEnvironment, mScene, mPhysics)); + + // adjust player + mCurrentCell = cell; + playerCellChange (cell, position); + + // Sky system + mWorld->adjustSky(); + + mCellChanged = true; + //currentRegion->name = ""; + } + + void Scene::changeToExteriorCell (const ESM::Position& position) + { + int x = 0; + int y = 0; + + mWorld->positionToIndex (position.pos[0], position.pos[1], x, y); + + changeCell (x, y, position, true); + } + + Ptr::CellStore* Scene::getCurrentCell () + { + return mCurrentCell; + } + + void Scene::markCellAsUnchanged() + { + mCellChanged = false; + } + +/*#include +#include +#include + +#include "../mwworld/class.hpp" +#include "../mwworld/ptr.hpp"*/ + +void Scene::insertCell(ESMS::CellStore &cell) +{ + // Loop through all references in the cell + insertCellRefList (cell.activators, cell); + insertCellRefList (cell.potions, cell); + insertCellRefList (cell.appas, cell); + insertCellRefList (cell.armors, cell); + insertCellRefList (cell.books, cell); + insertCellRefList (cell.clothes, cell); + insertCellRefList (cell.containers, cell); + insertCellRefList (cell.creatures, cell); + insertCellRefList (cell.doors, cell); + insertCellRefList (cell.ingreds, cell); + insertCellRefList (cell.creatureLists, cell); + insertCellRefList (cell.itemLists, cell); + insertCellRefList (cell.lights, cell); + insertCellRefList (cell.lockpicks, cell); + insertCellRefList (cell.miscItems, cell); + insertCellRefList (cell.npcs, cell); + insertCellRefList (cell.probes, cell); + insertCellRefList (cell.repairs, cell); + insertCellRefList (cell.statics, cell); + insertCellRefList (cell.weapons, cell); +} + +} diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp new file mode 100644 index 0000000000..9e43a98a5e --- /dev/null +++ b/apps/openmw/mwworld/scene.hpp @@ -0,0 +1,105 @@ +#ifndef GAME_MWWORLD_SCENE_H +#define GAME_MWWORLD_SCENE_H + +#include +#include + +#include + +#include + +#include "../mwrender/mwscene.hpp" +#include "physicssystem.hpp" + +#include "refdata.hpp" +#include "ptr.hpp" +#include "globals.hpp" + +#include + +namespace Ogre +{ + class Vector3; +} + +namespace ESM +{ + struct Position; +} + +namespace Files +{ + class Collections; +} + +namespace Render +{ + class OgreRenderer; +} + +namespace MWRender +{ + class SkyManager; + class CellRender; +} + +namespace MWWorld +{ + class Environment; + class Player; + + class Scene + { + + public: + + typedef std::map CellRenderCollection; + + private: + + MWRender::MWScene& mScene; + Ptr::CellStore *mCurrentCell; // the cell, the player is in + CellRenderCollection mActiveCells; + bool mCellChanged; + Environment& mEnvironment; + World *mWorld; + PhysicsSystem *mPhysics; + + void playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, + bool adjustPlayerPos = true); + public: + + Scene (Environment& environment, World *world, MWRender::MWScene& scene, PhysicsSystem *physics); + + ~Scene(); + + void unloadCell (CellRenderCollection::iterator iter); + + void loadCell (Ptr::CellStore *cell, MWRender::CellRender *render); + + void changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos); + ///< Move from exterior to interior or from interior cell to a different + /// interior cell. + + Ptr::CellStore* getCurrentCell (); + + const CellRenderCollection& getActiveCells () const; + + bool hasCellChanged() const; + ///< Has the player moved to a different cell, since the last frame? + + void changeToInteriorCell (const std::string& cellName, const ESM::Position& position); + ///< Move to interior cell. + + void changeToExteriorCell (const ESM::Position& position); + ///< Move to exterior cell. + + void markCellAsUnchanged(); + +// std::string getFacedHandle(); + + void insertCell(ESMS::CellStore &cell); + }; +} + +#endif diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 063f54d6f8..ee1a0ad2d4 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -1,4 +1,3 @@ - #include "world.hpp" #include @@ -22,7 +21,6 @@ #include "refdata.hpp" #include "globals.hpp" -#include "doingphysics.hpp" #include "cellfunctors.hpp" namespace @@ -91,71 +89,6 @@ namespace MWWorld listCellScripts (mStore, cell.weapons, mLocalScripts, &cell); } - Ptr World::getPtr (const std::string& name, Ptr::CellStore& cell) - { - if (ESMS::LiveCellRef *ref = cell.activators.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.potions.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.appas.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.armors.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.books.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.clothes.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.containers.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.creatures.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.doors.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.ingreds.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.creatureLists.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.itemLists.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.lights.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.lockpicks.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.miscItems.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.npcs.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.probes.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.repairs.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.statics.find (name)) - return Ptr (ref, &cell); - - if (ESMS::LiveCellRef *ref = cell.weapons.find (name)) - return Ptr (ref, &cell); - - return Ptr(); - } - Ptr World::getPtrViaHandle (const std::string& handle, Ptr::CellStore& cell) { if (ESMS::LiveCellRef *ref = @@ -221,18 +154,12 @@ namespace MWWorld MWRender::CellRender *World::searchRender (Ptr::CellStore *store) { - CellRenderCollection::iterator iter = mActiveCells.find (store); + Scene::CellRenderCollection::const_iterator iter = mWorldScene->getActiveCells().find (store); - if (iter!=mActiveCells.end()) + if (iter!=mWorldScene->getActiveCells().end()) { return iter->second; } - else - { - iter = mBufferedCells.find (store); - if (iter!=mBufferedCells.end()) - return iter->second; - } return 0; } @@ -271,52 +198,6 @@ namespace MWWorld } } - void World::unloadCell (CellRenderCollection::iterator iter) - { - ListHandles functor; - iter->first->forEach(functor); - - { // silence annoying g++ warning - for (std::vector::const_iterator iter (functor.mHandles.begin()); - iter!=functor.mHandles.end(); ++iter) - mScene.removeObject (*iter); - } - - removeScripts (iter->first); - mEnvironment.mMechanicsManager->dropActors (iter->first); - mEnvironment.mSoundManager->stopSound (iter->first); - delete iter->second; - mActiveCells.erase (iter); - } - - void World::loadCell (Ptr::CellStore *cell, MWRender::CellRender *render) - { - // register local scripts - insertInteriorScripts (*cell); - - // This connects the cell data with the rendering scene. - std::pair result = - mActiveCells.insert (std::make_pair (cell, render)); - - if (result.second) - { - // Load the cell and insert it into the renderer - result.first->second->show(); - } - } - - void World::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, - bool adjustPlayerPos) - { - if (adjustPlayerPos) - mPlayer->setPos (position.pos[0], position.pos[1], position.pos[2], false); - - mPlayer->setCell (cell); - // TODO orientation - mEnvironment.mMechanicsManager->addActor (mPlayer->getPlayer()); - mEnvironment.mMechanicsManager->watchActor (mPlayer->getPlayer()); - } - void World::adjustSky() { @@ -328,93 +209,17 @@ namespace MWWorld } } - void World::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos) - { - SuppressDoingPhysics scopeGuard; - - // remove active - mEnvironment.mMechanicsManager->removeActor (mPlayer->getPlayer()); - - CellRenderCollection::iterator active = mActiveCells.begin(); - - while (active!=mActiveCells.end()) - { - if (!(active->first->cell->data.flags & ESM::Cell::Interior)) - { - if (std::abs (X-active->first->cell->data.gridX)<=1 && - std::abs (Y-active->first->cell->data.gridY)<=1) - { - // keep cells within the new 3x3 grid - ++active; - continue; - } - } - - unloadCell (active++); - } - - // Load cells - for (int x=X-1; x<=X+1; ++x) - for (int y=Y-1; y<=Y+1; ++y) - { - CellRenderCollection::iterator iter = mActiveCells.begin(); - - while (iter!=mActiveCells.end()) - { - assert (!(iter->first->cell->data.flags & ESM::Cell::Interior)); - - if (x==iter->first->cell->data.gridX && - y==iter->first->cell->data.gridY) - break; - - ++iter; - } - - if (iter==mActiveCells.end()) - { - mExteriors[std::make_pair (x, y)].loadExt (x, y, mStore, mEsm); - Ptr::CellStore *cell = &mExteriors[std::make_pair (x, y)]; - - loadCell (cell, new MWRender::ExteriorCellRender (*cell, mEnvironment, mScene)); - } - } - - // find current cell - CellRenderCollection::iterator iter = mActiveCells.begin(); - - while (iter!=mActiveCells.end()) - { - assert (!(iter->first->cell->data.flags & ESM::Cell::Interior)); - - if (X==iter->first->cell->data.gridX && - Y==iter->first->cell->data.gridY) - break; - - ++iter; - } - - assert (iter!=mActiveCells.end()); - - mCurrentCell = iter->first; - - // adjust player - playerCellChange (&mExteriors[std::make_pair (X, Y)], position, adjustPlayerPos); - - // Sky system - adjustSky(); - - mCellChanged = true; - } - World::World (OEngine::Render::OgreRenderer& renderer, OEngine::Physic::PhysicEngine* physEng, const Files::Collections& fileCollections, const std::string& master, const boost::filesystem::path& resDir, bool newGame, Environment& environment, const std::string& encoding) - : mSkyManager (0), mScene (renderer,physEng), mPlayer (0), mCurrentCell (0), mGlobalVariables (0), - mSky (false), mCellChanged (false), mEnvironment (environment), mNextDynamicRecord (0) + : mScene (renderer,physEng), mPlayer (0), mGlobalVariables (0), + mSky (false), mEnvironment (environment), mNextDynamicRecord (0), mCells (mStore, mEsm) { mPhysEngine = physEng; + mPhysics = new PhysicsSystem(renderer, physEng); + boost::filesystem::path masterPath (fileCollections.getCollection (".esm").getPath (master)); std::cout << "Loading ESM " << masterPath.string() << "\n"; @@ -425,7 +230,7 @@ namespace MWWorld mStore.load (mEsm); mPlayer = new MWWorld::Player (mScene.getPlayer(), mStore.npcs.find ("player"), *this); - mScene.addActor (mPlayer->getPlayer().getRefData().getHandle(), "", Ogre::Vector3 (0, 0, 0)); + mPhysics->addActor (mPlayer->getPlayer().getRefData().getHandle(), "", Ogre::Vector3 (0, 0, 0)); // global variables mGlobalVariables = new Globals (mStore); @@ -436,25 +241,54 @@ namespace MWWorld mGlobalVariables->setInt ("chargenstate", 1); } - mSkyManager = - MWRender::SkyManager::create(renderer.getWindow(), mScene.getCamera(), resDir); - mPhysEngine = physEng; + + mWorldScene = new Scene(environment, this, mScene, mPhysics); + mRenderingManager = new MWRender::RenderingManager( + MWRender::SkyManager::create(renderer.getWindow(), mScene.getCamera(), resDir) + ); } World::~World() { - for (CellRenderCollection::iterator iter (mActiveCells.begin()); - iter!=mActiveCells.end(); ++iter) - delete iter->second; + delete mWorldScene; + delete mGlobalVariables; + delete mPlayer; + delete mPhysics; + } - for (CellRenderCollection::iterator iter (mBufferedCells.begin()); - iter!=mBufferedCells.end(); ++iter) - delete iter->second; + const ESM::Cell *World::getExterior (const std::string& cellName) const + { + // first try named cells + if (const ESM::Cell *cell = mStore.cells.searchExtByName (cellName)) + return cell; - delete mPlayer; - delete mSkyManager; - delete mGlobalVariables; + // didn't work -> now check for regions + std::string cellName2 = ESMS::RecListT::toLower (cellName); + + for (ESMS::RecListT::MapType::const_iterator iter (mStore.regions.list.begin()); + iter!=mStore.regions.list.end(); ++iter) + { + if (ESMS::RecListT::toLower (iter->second.name)==cellName2) + { + if (const ESM::Cell *cell = mStore.cells.searchExtByRegion (iter->first)) + return cell; + + break; + } + } + + return 0; + } + + Ptr::CellStore *World::getExterior (int x, int y) + { + return mCells.getExterior (x, y); + } + + Ptr::CellStore *World::getInterior (const std::string& name) + { + return mCells.getInterior (name); } MWWorld::Player& World::getPlayer() @@ -467,6 +301,11 @@ namespace MWWorld return mStore; } + ESM::ESMReader& World::getEsmReader() + { + return mEsm; + } + const World::ScriptList& World::getLocalScripts() const { return mLocalScripts; @@ -474,7 +313,7 @@ namespace MWWorld bool World::hasCellChanged() const { - return mCellChanged; + return mWorldScene->hasCellChanged(); } Globals::Data& World::getGlobalVariable (const std::string& name) @@ -501,10 +340,10 @@ namespace MWWorld } // active cells - for (CellRenderCollection::iterator iter (mActiveCells.begin()); - iter!=mActiveCells.end(); ++iter) + for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin()); + iter!=mWorldScene->getActiveCells().end(); ++iter) { - Ptr ptr = getPtr (name, *iter->first); + Ptr ptr = mCells.getPtr (name, *iter->first); if (!ptr.isEmpty()) return ptr; @@ -512,7 +351,10 @@ namespace MWWorld if (!activeOnly) { - // TODO: inactive cells + Ptr ptr = mCells.getPtr (name); + + if (!ptr.isEmpty()) + return ptr; } throw std::runtime_error ("unknown ID: " + name); @@ -523,8 +365,8 @@ namespace MWWorld if (mPlayer->getPlayer().getRefData().getHandle()==handle) return mPlayer->getPlayer(); - for (CellRenderCollection::iterator iter (mActiveCells.begin()); - iter!=mActiveCells.end(); ++iter) + for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin()); + iter!=mWorldScene->getActiveCells().end(); ++iter) { Ptr ptr = getPtrViaHandle (handle, *iter->first); @@ -545,7 +387,7 @@ namespace MWWorld { render->enable (reference.getRefData().getHandle()); - if (mActiveCells.find (reference.getCell())!=mActiveCells.end()) + if (mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end()) Class::get (reference).enable (reference, mEnvironment); } } @@ -561,7 +403,7 @@ namespace MWWorld { render->disable (reference.getRefData().getHandle()); - if (mActiveCells.find (reference.getCell())!=mActiveCells.end()) + if (mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end()) { Class::get (reference).disable (reference, mEnvironment); mEnvironment.mSoundManager->stopSound3D (reference); @@ -593,7 +435,7 @@ namespace MWWorld mGlobalVariables->setFloat ("gamehour", hour); - mSkyManager->setHour (hour); + mRenderingManager->skySetHour (hour); if (days>0) setDay (days + mGlobalVariables->getInt ("day")); @@ -628,7 +470,7 @@ namespace MWWorld mGlobalVariables->setInt ("day", day); mGlobalVariables->setInt ("month", month); - mSkyManager->setDate (day, month); + mRenderingManager->skySetDate (day, month); } void World::setMonth (int month) @@ -649,7 +491,7 @@ namespace MWWorld if (years>0) mGlobalVariables->setInt ("year", years+mGlobalVariables->getInt ("year")); - mSkyManager->setDate (mGlobalVariables->getInt ("day"), month); + mRenderingManager->skySetDate (mGlobalVariables->getInt ("day"), month); } bool World::toggleSky() @@ -657,34 +499,34 @@ namespace MWWorld if (mSky) { mSky = false; - mSkyManager->disable(); + mRenderingManager->skyDisable(); return false; } else { mSky = true; // TODO check for extorior or interior with sky. - mSkyManager->setHour (mGlobalVariables->getFloat ("gamehour")); - mSkyManager->setDate (mGlobalVariables->getInt ("day"), + mRenderingManager->skySetHour (mGlobalVariables->getFloat ("gamehour")); + mRenderingManager->skySetDate (mGlobalVariables->getInt ("day"), mGlobalVariables->getInt ("month")); - mSkyManager->enable(); + mRenderingManager->skyEnable(); return true; } } int World::getMasserPhase() const { - return mSkyManager->getMasserPhase(); + return mRenderingManager->skyGetMasserPhase(); } int World::getSecundaPhase() const { - return mSkyManager->getSecundaPhase(); + return mRenderingManager->skyGetSecundaPhase(); } void World::setMoonColour (bool red) { - mSkyManager->setMoonColour (red); + mRenderingManager->skySetMoonColour (red); } float World::getTimeScaleFactor() const @@ -694,70 +536,17 @@ namespace MWWorld void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position) { - SuppressDoingPhysics scopeGuard; - - // remove active - CellRenderCollection::iterator active = mActiveCells.begin(); - - while (active!=mActiveCells.end()) - { - unloadCell (active++); - } - - // Load cell. - mInteriors[cellName].loadInt (cellName, mStore, mEsm); - Ptr::CellStore *cell = &mInteriors[cellName]; - - loadCell (cell, new MWRender::InteriorCellRender (*cell, mEnvironment, mScene)); - - // adjust player - mCurrentCell = cell; - playerCellChange (cell, position); - - // Sky system - adjustSky(); - - mCellChanged = true; - //currentRegion->name = ""; + return mWorldScene->changeToInteriorCell(cellName, position); } void World::changeToExteriorCell (const ESM::Position& position) { - int x = 0; - int y = 0; - - positionToIndex (position.pos[0], position.pos[1], x, y); - - changeCell (x, y, position, true); - } - - const ESM::Cell *World::getExterior (const std::string& cellName) const - { - // first try named cells - if (const ESM::Cell *cell = mStore.cells.searchExtByName (cellName)) - return cell; - - // didn't work -> now check for regions - std::string cellName2 = ESMS::RecListT::toLower (cellName); - - for (ESMS::RecListT::MapType::const_iterator iter (mStore.regions.list.begin()); - iter!=mStore.regions.list.end(); ++iter) - { - if (ESMS::RecListT::toLower (iter->second.name)==cellName2) - { - if (const ESM::Cell *cell = mStore.cells.searchExtByRegion (iter->first)) - return cell; - - break; - } - } - - return 0; + return mWorldScene->changeToExteriorCell(position); } void World::markCellAsUnchanged() { - mCellChanged = false; + return mWorldScene->markCellAsUnchanged(); } std::string World::getFacedHandle() @@ -779,13 +568,12 @@ namespace MWWorld if (MWRender::CellRender *render = searchRender (ptr.getCell())) { - if (mActiveCells.find (ptr.getCell())!=mActiveCells.end()) + if (mWorldScene->getActiveCells().find (ptr.getCell())!=mWorldScene->getActiveCells().end()) { Class::get (ptr).disable (ptr, mEnvironment); mEnvironment.mSoundManager->stopSound3D (ptr); - if (!DoingPhysics::isDoingPhysics()) - mScene.removeObject (ptr.getRefData().getHandle()); + mPhysics->removeObject (ptr.getRefData().getHandle()); } render->deleteObject (ptr.getRefData().getHandle()); @@ -794,7 +582,7 @@ namespace MWWorld } } - void World::moveObject (Ptr ptr, float x, float y, float z) + void World::moveObjectImp (Ptr ptr, float x, float y, float z) { ptr.getCellRef().pos.pos[0] = x; ptr.getCellRef().pos.pos[1] = y; @@ -802,9 +590,10 @@ namespace MWWorld if (ptr==mPlayer->getPlayer()) { - if (mCurrentCell) + Ptr::CellStore *currentCell = mWorldScene->getCurrentCell(); + if (currentCell) { - if (!(mCurrentCell->cell->data.flags & ESM::Cell::Interior)) + if (!(currentCell->cell->data.flags & ESM::Cell::Interior)) { // exterior -> adjust loaded cells int cellX = 0; @@ -812,19 +601,27 @@ namespace MWWorld positionToIndex (x, y, cellX, cellY); - if (mCurrentCell->cell->data.gridX!=cellX || mCurrentCell->cell->data.gridY!=cellY) + if (currentCell->cell->data.gridX!=cellX || currentCell->cell->data.gridY!=cellY) { - changeCell (cellX, cellY, mPlayer->getPlayer().getCellRef().pos, false); + mWorldScene->changeCell (cellX, cellY, mPlayer->getPlayer().getCellRef().pos, false); } } } } - mScene.moveObject (ptr.getRefData().getHandle(), Ogre::Vector3 (x, y, z), - !DoingPhysics::isDoingPhysics()); + // \todo cell change for non-player ref + + // \todo this should go into the new scene class and eventually into the objects/actors classes. + mScene.getMgr()->getSceneNode (ptr.getRefData().getHandle())-> + setPosition (Ogre::Vector3 (x, y, z)); + } + + void World::moveObject (Ptr ptr, float x, float y, float z) + { + moveObjectImp(ptr, x, y, z); - // TODO cell change for non-player ref + mPhysics->moveObject (ptr.getRefData().getHandle(), Ogre::Vector3 (x, y, z)); } void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const @@ -859,12 +656,34 @@ namespace MWWorld void World::doPhysics (const std::vector >& actors, float duration) { - mScene.doPhysics (duration, *this, actors); + std::vector< std::pair > vectors = mPhysics->doPhysics (duration, actors); + + std::vector< std::pair >::iterator player = vectors.end(); + + for (std::vector< std::pair >::iterator it = vectors.begin(); + it!= vectors.end(); ++it) + { + if (it->first=="player") + { + player = it; + } + else + { + MWWorld::Ptr ptr = getPtrViaHandle (it->first); + moveObjectImp (ptr, it->second.x, it->second.y, it->second.z); + } + } + + // Make sure player is moved last (otherwise the cell might change in the middle of an update + // loop) + if (player!=vectors.end()) + moveObjectImp (getPtrViaHandle (player->first), + player->second.x, player->second.y, player->second.z); } bool World::toggleCollisionMode() { - return mScene.toggleCollisionMode(); + return mPhysics->toggleCollisionMode(); } bool World::toggleRenderMode (RenderMode mode) diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp index cccd8816df..90d6121634 100644 --- a/apps/openmw/mwworld/world.hpp +++ b/apps/openmw/mwworld/world.hpp @@ -9,10 +9,14 @@ #include #include "../mwrender/mwscene.hpp" +#include "../mwrender/rendering_manager.hpp" #include "refdata.hpp" #include "ptr.hpp" #include "globals.hpp" +#include "scene.hpp" +#include "physicssystem.hpp" +#include "cells.hpp" #include @@ -62,55 +66,35 @@ namespace MWWorld private: - typedef std::map CellRenderCollection; - - MWRender::SkyManager* mSkyManager; MWRender::MWScene mScene; + MWWorld::Scene *mWorldScene; MWWorld::Player *mPlayer; - Ptr::CellStore *mCurrentCell; // the cell, the player is in - CellRenderCollection mActiveCells; - CellRenderCollection mBufferedCells; // loaded, but not active (buffering not implementd yet) ESM::ESMReader mEsm; ESMS::ESMStore mStore; - std::map mInteriors; - std::map, Ptr::CellStore> mExteriors; ScriptList mLocalScripts; MWWorld::Globals *mGlobalVariables; + MWWorld::PhysicsSystem *mPhysics; bool mSky; - bool mCellChanged; Environment& mEnvironment; + MWRender::RenderingManager *mRenderingManager; int mNextDynamicRecord; + Cells mCells; + OEngine::Physic::PhysicEngine* mPhysEngine; // not implemented World (const World&); World& operator= (const World&); - void insertInteriorScripts (ESMS::CellStore& cell); - - Ptr getPtr (const std::string& name, Ptr::CellStore& cellStore); - Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore); MWRender::CellRender *searchRender (Ptr::CellStore *store); int getDaysPerMonth (int month) const; - void removeScripts (Ptr::CellStore *cell); - - void unloadCell (CellRenderCollection::iterator iter); - - void loadCell (Ptr::CellStore *cell, MWRender::CellRender *render); - - void playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, - bool adjustPlayerPos = true); - - void adjustSky(); + void moveObjectImp (Ptr ptr, float x, float y, float z); - void changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos); - ///< Move from exterior to interior or from interior cell to a different - /// interior cell. public: World (OEngine::Render::OgreRenderer& renderer, OEngine::Physic::PhysicEngine* physEng, @@ -120,10 +104,22 @@ namespace MWWorld ~World(); + Ptr::CellStore *getExterior (int x, int y); + + Ptr::CellStore *getInterior (const std::string& name); + + void removeScripts (Ptr::CellStore *cell); + + void insertInteriorScripts (ESMS::CellStore& cell); + + void adjustSky(); + MWWorld::Player& getPlayer(); const ESMS::ESMStore& getStore() const; + ESM::ESMReader& getEsmReader(); + const ScriptList& getLocalScripts() const; ///< Names and local variable state of all local scripts in active cells. diff --git a/components/cfg/configurationmanager.cpp b/components/cfg/configurationmanager.cpp new file mode 100644 index 0000000000..0998debeeb --- /dev/null +++ b/components/cfg/configurationmanager.cpp @@ -0,0 +1,157 @@ +#include "configurationmanager.hpp" + +#include +#include +#include + +namespace Cfg +{ + +static const char* const openmwCfgFile = "openmw.cfg"; +static const char* const ogreCfgFile = "ogre.cfg"; +static const char* const pluginsCfgFile = "plugins.cfg"; + + +ConfigurationManager::ConfigurationManager() + : mPath("openmw") +{ + /** + * According to task #168 plugins.cfg file shall be located in global + * configuration path or in runtime configuration path. + */ + mPluginsCfgPath = mPath.getGlobalConfigPath() / pluginsCfgFile; + if (!boost::filesystem::is_regular_file(mPluginsCfgPath)) + { + mPluginsCfgPath = mPath.getRuntimeConfigPath() / pluginsCfgFile; + if (!boost::filesystem::is_regular_file(mPluginsCfgPath)) + { + std::cerr << "Failed to find " << pluginsCfgFile << " file!" << std::endl; + mPluginsCfgPath.clear(); + } + } + + /** + * According to task #168 ogre.cfg file shall be located only + * in user configuration path. + */ + mOgreCfgPath = mPath.getLocalConfigPath() / ogreCfgFile; + + mLogPath = mPath.getLocalConfigPath(); +} + +ConfigurationManager::~ConfigurationManager() +{ +} + +void ConfigurationManager::readConfiguration(boost::program_options::variables_map& variables, + boost::program_options::options_description& description) +{ + loadConfig(mPath.getLocalConfigPath(), variables, description); + boost::program_options::notify(variables); + loadConfig(mPath.getRuntimeConfigPath(), variables, description); + boost::program_options::notify(variables); + loadConfig(mPath.getGlobalConfigPath(), variables, description); + boost::program_options::notify(variables); +} + +void ConfigurationManager::loadConfig(const boost::filesystem::path& path, + boost::program_options::variables_map& variables, + boost::program_options::options_description& description) +{ + boost::filesystem::path cfgFile(path); + cfgFile /= std::string(openmwCfgFile); + if (boost::filesystem::is_regular_file(cfgFile)) + { + std::cout << "Loading config file: " << cfgFile.string() << "... "; + + std::ifstream configFileStream(cfgFile.string().c_str()); + if (configFileStream.is_open()) + { + boost::program_options::store(boost::program_options::parse_config_file( + configFileStream, description), variables); + + std::cout << "done." << std::endl; + } + else + { + std::cout << "failed." << std::endl; + } + } +} + +const boost::filesystem::path& ConfigurationManager::getGlobalConfigPath() const +{ + return mPath.getGlobalConfigPath(); +} + +void ConfigurationManager::setGlobalConfigPath(const boost::filesystem::path& newPath) +{ + mPath.setGlobalConfigPath(newPath); +} + +const boost::filesystem::path& ConfigurationManager::getLocalConfigPath() const +{ + return mPath.getLocalConfigPath(); +} + +void ConfigurationManager::setLocalConfigPath(const boost::filesystem::path& newPath) +{ + mPath.setLocalConfigPath(newPath); +} + +const boost::filesystem::path& ConfigurationManager::getRuntimeConfigPath() const +{ + return mPath.getRuntimeConfigPath(); +} + +void ConfigurationManager::setRuntimeConfigPath(const boost::filesystem::path& newPath) +{ + mPath.setRuntimeConfigPath(newPath); +} + +const boost::filesystem::path& ConfigurationManager::getGlobalDataPath() const +{ + return mPath.getGlobalDataPath(); +} + +void ConfigurationManager::setGlobalDataPath(const boost::filesystem::path& newPath) +{ + mPath.setGlobalDataPath(newPath); +} + +const boost::filesystem::path& ConfigurationManager::getLocalDataPath() const +{ + return mPath.getLocalDataPath(); +} + +void ConfigurationManager::setLocalDataPath(const boost::filesystem::path& newPath) +{ + mPath.setLocalDataPath(newPath); +} + +const boost::filesystem::path& ConfigurationManager::getRuntimeDataPath() const +{ + return mPath.getRuntimeDataPath(); +} + +void ConfigurationManager::setRuntimeDataPath(const boost::filesystem::path& newPath) +{ + mPath.setRuntimeDataPath(newPath); +} + +const boost::filesystem::path& ConfigurationManager::getOgreConfigPath() const +{ + return mOgreCfgPath; +} + +const boost::filesystem::path& ConfigurationManager::getPluginsConfigPath() const +{ + return mPluginsCfgPath; +} + +const boost::filesystem::path& ConfigurationManager::getLogPath() const +{ + return mLogPath; +} + +} /* namespace Cfg */ diff --git a/components/cfg/configurationmanager.hpp b/components/cfg/configurationmanager.hpp new file mode 100644 index 0000000000..7f13d0914c --- /dev/null +++ b/components/cfg/configurationmanager.hpp @@ -0,0 +1,62 @@ +#ifndef COMPONENTS_CFG_CONFIGURATIONMANAGER_HPP +#define COMPONENTS_CFG_CONFIGURATIONMANAGER_HPP + +#include +#include + +#include + +/** + * \namespace Cfg + */ +namespace Cfg +{ + +/** + * \struct ConfigurationManager + */ +struct ConfigurationManager +{ + ConfigurationManager(); + virtual ~ConfigurationManager(); + + void readConfiguration(boost::program_options::variables_map& variables, + boost::program_options::options_description& description); + + const boost::filesystem::path& getGlobalConfigPath() const; + void setGlobalConfigPath(const boost::filesystem::path& newPath); + + const boost::filesystem::path& getLocalConfigPath() const; + void setLocalConfigPath(const boost::filesystem::path& newPath); + + const boost::filesystem::path& getRuntimeConfigPath() const; + void setRuntimeConfigPath(const boost::filesystem::path& newPath); + + const boost::filesystem::path& getGlobalDataPath() const; + void setGlobalDataPath(const boost::filesystem::path& newPath); + + const boost::filesystem::path& getLocalDataPath() const; + void setLocalDataPath(const boost::filesystem::path& newPath); + + const boost::filesystem::path& getRuntimeDataPath() const; + void setRuntimeDataPath(const boost::filesystem::path& newPath); + + const boost::filesystem::path& getOgreConfigPath() const; + const boost::filesystem::path& getPluginsConfigPath() const; + const boost::filesystem::path& getLogPath() const; + + private: + void loadConfig(const boost::filesystem::path& path, + boost::program_options::variables_map& variables, + boost::program_options::options_description& description); + + Files::Path<> mPath; + + boost::filesystem::path mOgreCfgPath; + boost::filesystem::path mPluginsCfgPath; + boost::filesystem::path mLogPath; +}; + +} /* namespace Cfg */ + +#endif /* COMPONENTS_CFG_CONFIGURATIONMANAGER_HPP */ diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp index 2d10852603..80a0f3e5a4 100644 --- a/components/esm/loadcell.cpp +++ b/components/esm/loadcell.cpp @@ -1,5 +1,8 @@ #include "loadcell.hpp" +#include +#include + namespace ESM { @@ -47,6 +50,20 @@ void Cell::restore(ESMReader &esm) const esm.restoreContext(context); } +std::string Cell::getDescription() const +{ + if (data.flags & Interior) + { + return name; + } + else + { + std::ostringstream stream; + stream << data.gridX << ", " << data.gridY; + return stream.str(); + } +} + bool Cell::getNextRef(ESMReader &esm, CellRef &ref) { if (!esm.hasMoreSubs()) diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp index bf3ec6f739..671f702cab 100644 --- a/components/esm/loadcell.hpp +++ b/components/esm/loadcell.hpp @@ -126,6 +126,9 @@ struct Cell // exactly. void restore(ESMReader &esm) const; + std::string getDescription() const; + ///< Return a short string describing the cell (mostly used for debugging/logging purpose) + /* Get the next reference in this cell, if any. Returns false when there are no more references in the cell. diff --git a/components/esm_store/cell_store.hpp b/components/esm_store/cell_store.hpp index 59464236fd..1336cc2ab3 100644 --- a/components/esm_store/cell_store.hpp +++ b/components/esm_store/cell_store.hpp @@ -13,8 +13,10 @@ #include "store.hpp" #include "components/esm/records.hpp" #include "components/esm/loadcell.hpp" -#include +#include +#include +#include #include #include #include @@ -81,9 +83,17 @@ namespace ESMS class CellStore { public: - CellStore() : cell (0) {} + + enum State + { + State_Unloaded, State_Preloaded, State_Loaded + }; + + CellStore (const ESM::Cell *cell_) : cell (cell_), mState (State_Unloaded) {} const ESM::Cell *cell; + State mState; + std::vector mIds; // Lists for each individual object type CellRefList activators; @@ -107,31 +117,29 @@ namespace ESMS CellRefList statics; CellRefList weapons; - /** Look up and load an interior cell from the given ESM data - storage. */ - void loadInt(const std::string &name, const ESMStore &store, ESMReader &esm) + void load (const ESMStore &store, ESMReader &esm) { - std::cout << "loading cell '" << name << "'\n"; + if (mState!=State_Loaded) + { + if (mState==State_Preloaded) + mIds.clear(); - cell = store.cells.findInt(name); + std::cout << "loading cell " << cell->getDescription() << std::endl; - if(cell == NULL) - throw std::runtime_error("Cell not found - " + name); + loadRefs (store, esm); - loadRefs(store, esm); + mState = State_Loaded; + } } - /** Ditto for exterior cell. */ - void loadExt(int X, int Y, const ESMStore &store, ESMReader &esm) + void preload (const ESMStore &store, ESMReader &esm) { - std::cout << "loading exterior cell '" << X << ", " << Y << "'\n"; - - cell = store.cells.searchExt (X, Y); - - if(cell == NULL) - throw std::runtime_error("Exterior cell not found"); + if (mState==State_Unloaded) + { + listRefs (store, esm); - loadRefs(store, esm); + mState = State_Preloaded; + } } /// Call functor (ref) for each reference. functor must return a bool. Returning @@ -176,6 +184,30 @@ namespace ESMS return true; } + /// Run through references and store IDs + void listRefs(const ESMStore &store, ESMReader &esm) + { + assert (cell); + + // Reopen the ESM reader and seek to the right position. + cell->restore (esm); + + CellRef ref; + + // Get each reference in turn + while (cell->getNextRef (esm, ref)) + { + std::string lowerCase; + + std::transform (ref.refID.begin(), ref.refID.end(), std::back_inserter (lowerCase), + (int(*)(int)) std::tolower); + + mIds.push_back (lowerCase); + } + + std::sort (mIds.begin(), mIds.end()); + } + void loadRefs(const ESMStore &store, ESMReader &esm) { assert (cell); diff --git a/components/esm_store/reclists.hpp b/components/esm_store/reclists.hpp index 19ee18b628..7d3afbb96b 100644 --- a/components/esm_store/reclists.hpp +++ b/components/esm_store/reclists.hpp @@ -287,8 +287,7 @@ namespace ESMS IntCells intCells; // List of exterior cells. Indexed as extCells[gridX][gridY]. - typedef std::map ExtCellsCol; - typedef std::map ExtCells; + typedef std::map, ESM::Cell*> ExtCells; ExtCells extCells; virtual void listIdentifier (std::vector& identifier) const @@ -303,13 +302,7 @@ namespace ESMS delete it->second; for (ExtCells::iterator it = extCells.begin(); it!=extCells.end(); ++it) - { - ExtCellsCol& col = it->second; - for (ExtCellsCol::iterator it = col.begin(); it!=col.end(); ++it) - { delete it->second; - } - } } @@ -318,36 +311,36 @@ namespace ESMS IntCells::const_iterator it = intCells.find(id); if(it == intCells.end()) - return NULL; + throw std::runtime_error ("Interior cell not found - " + id); return it->second; } const ESM::Cell *searchExt (int x, int y) const { - ExtCells::const_iterator it = extCells.find (x); + ExtCells::const_iterator it = extCells.find (std::make_pair (x, y)); if (it==extCells.end()) return 0; - ExtCellsCol::const_iterator it2 = it->second.find (y); + return it->second; + } - if (it2 == it->second.end()) - return 0; + const ESM::Cell *findExt (int x, int y) const + { + const ESM::Cell *cell = searchExt (x, y); - return it2->second; - } + if (!cell) + throw std::runtime_error ("Exterior cell not found"); + return cell; + } const ESM::Cell *searchExtByName (const std::string& id) const { for (ExtCells::const_iterator iter = extCells.begin(); iter!=extCells.end(); ++iter) { - const ExtCellsCol& column = iter->second; - for (ExtCellsCol::const_iterator iter = column.begin(); iter!=column.end(); ++iter) - { - if ( toLower(iter->second->name) == toLower(id)) - return iter->second; - } + if (toLower (iter->second->name) == toLower (id)) + return iter->second; } return 0; @@ -358,14 +351,8 @@ namespace ESMS std::string id2 = toLower (id); for (ExtCells::const_iterator iter = extCells.begin(); iter!=extCells.end(); ++iter) - { - const ExtCellsCol& column = iter->second; - for (ExtCellsCol::const_iterator iter = column.begin(); iter!=column.end(); ++iter) - { - if (toLower (iter->second->region)==id) - return iter->second; - } - } + if (toLower (iter->second->region)==id) + return iter->second; return 0; } @@ -389,7 +376,7 @@ namespace ESMS else { // Store exterior cells by grid position - extCells[cell->data.gridX][cell->data.gridY] = cell; + extCells[std::make_pair (cell->data.gridX, cell->data.gridY)] = cell; } } }; diff --git a/components/files/collections.cpp b/components/files/collections.cpp index 8cd4865b39..424b558e60 100644 --- a/components/files/collections.cpp +++ b/components/files/collections.cpp @@ -3,21 +3,27 @@ namespace Files { - Collections::Collections() : mFoldCase (false) {} - - Collections::Collections (const std::vector& directories, bool foldCase) - : mDirectories (directories), mFoldCase (foldCase) - {} + Collections::Collections() + : mDirectories() + , mFoldCase(false) + , mCollections() + { + } - const MultiDirCollection& Collections::getCollection (const std::string& extension) const + Collections::Collections(const Files::PathContainer& directories, bool foldCase) + : mDirectories(directories) + , mFoldCase(foldCase) + , mCollections() { - std::map::iterator iter = mCollections.find (extension); + } + const MultiDirCollection& Collections::getCollection(const std::string& extension) const + { + MultiDirCollectionContainer::iterator iter = mCollections.find(extension); if (iter==mCollections.end()) { - std::pair::iterator, bool> result = - mCollections.insert (std::make_pair (extension, - MultiDirCollection (mDirectories, extension, mFoldCase))); + std::pair result = + mCollections.insert(std::make_pair(extension, MultiDirCollection(mDirectories, extension, mFoldCase))); iter = result.first; } diff --git a/components/files/collections.hpp b/components/files/collections.hpp index 6eaf0303ee..1ddca9a5b7 100644 --- a/components/files/collections.hpp +++ b/components/files/collections.hpp @@ -1,27 +1,32 @@ #ifndef COMPONENTS_FILES_COLLECTION_HPP #define COMPONENTS_FILES_COLLECTION_HPP +#include +#include +#include + #include "multidircollection.hpp" namespace Files { class Collections { - std::vector mDirectories; - bool mFoldCase; - mutable std::map mCollections; - public: - Collections(); - Collections (const std::vector& directories, bool foldCase); ///< Directories are listed with increasing priority. + Collections(const Files::PathContainer& directories, bool foldCase); - const MultiDirCollection& getCollection (const std::string& extension) const; ///< Return a file collection for the given extension. Extension must contain the /// leading dot and must be all lower-case. + const MultiDirCollection& getCollection(const std::string& extension) const; + + private: + typedef std::map MultiDirCollectionContainer; + Files::PathContainer mDirectories; + bool mFoldCase; + mutable MultiDirCollectionContainer mCollections; }; } diff --git a/components/files/fileops.cpp b/components/files/fileops.cpp new file mode 100644 index 0000000000..329e4eb05f --- /dev/null +++ b/components/files/fileops.cpp @@ -0,0 +1,12 @@ +#include "fileops.hpp" +#include + +namespace Files +{ + +bool isFile(const char *name) +{ + return boost::filesystem::exists(boost::filesystem::path(name)); +} + +} diff --git a/components/files/fileops.hpp b/components/files/fileops.hpp new file mode 100644 index 0000000000..a541beffc2 --- /dev/null +++ b/components/files/fileops.hpp @@ -0,0 +1,13 @@ +#ifndef COMPONENTS_FILES_FILEOPS_HPP +#define COMPONENTS_FILES_FILEOPS_HPP + +namespace Files +{ + +///\brief Check if a given path is an existing file (not a directory) +///\param [in] name - filename +bool isFile(const char *name); + +} + +#endif /* COMPONENTS_FILES_FILEOPS_HPP */ diff --git a/components/files/linuxpath.cpp b/components/files/linuxpath.cpp new file mode 100644 index 0000000000..c485002fdb --- /dev/null +++ b/components/files/linuxpath.cpp @@ -0,0 +1,160 @@ +/** + * Open Morrowind - an opensource Elder Scrolls III: Morrowind + * engine implementation. + * + * Copyright (C) 2011 Open Morrowind Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file components/files/linuxpath.cpp */ + +#include "linuxpath.hpp" + +#if defined(__linux__) + +#include +#include +#include +#include + +/** + * \namespace Files + */ +namespace Files +{ + +boost::filesystem::path LinuxPath::getLocalConfigPath() const +{ + boost::filesystem::path localConfigPath("."); + boost::filesystem::path suffix("/"); + + const char* theDir = getenv("OPENMW_CONFIG"); + if (theDir == NULL) + { + theDir = getenv("XDG_CONFIG_HOME"); + if (theDir == NULL) + { + theDir = getenv("HOME"); + if (theDir == NULL) + { + struct passwd* pwd = getpwuid(getuid()); + if (pwd != NULL) + { + theDir = pwd->pw_dir; + } + } + if (theDir != NULL) + { + suffix = boost::filesystem::path("/.config/"); + } + } + } + + if (theDir != NULL) { + localConfigPath = boost::filesystem::path(theDir); + } + + localConfigPath /= suffix; + + return localConfigPath; +} + +boost::filesystem::path LinuxPath::getGlobalConfigPath() const +{ + boost::filesystem::path globalConfigPath("/etc/xdg/"); + + char* theDir = getenv("XDG_CONFIG_DIRS"); + if (theDir != NULL) + { + // We take only first path from list + char* ptr = strtok(theDir, ":"); + if (ptr != NULL) + { + globalConfigPath = boost::filesystem::path(ptr); + globalConfigPath /= boost::filesystem::path("/"); + } + } + + return globalConfigPath; +} + +boost::filesystem::path LinuxPath::getRuntimeConfigPath() const +{ + return boost::filesystem::path("./"); +} + +boost::filesystem::path LinuxPath::getLocalDataPath() const +{ + boost::filesystem::path localDataPath("."); + boost::filesystem::path suffix("/"); + + const char* theDir = getenv("OPENMW_DATA"); + if (theDir == NULL) + { + theDir = getenv("XDG_DATA_HOME"); + if (theDir == NULL) + { + theDir = getenv("HOME"); + if (theDir == NULL) + { + struct passwd* pwd = getpwuid(getuid()); + if (pwd != NULL) + { + theDir = pwd->pw_dir; + } + } + if (theDir != NULL) + { + suffix = boost::filesystem::path("/.local/share/"); + } + } + } + + if (theDir != NULL) { + localDataPath = boost::filesystem::path(theDir); + } + + localDataPath /= suffix; + return localDataPath; +} + +boost::filesystem::path LinuxPath::getGlobalDataPath() const +{ + boost::filesystem::path globalDataPath("/usr/local/share/"); + + char* theDir = getenv("XDG_DATA_DIRS"); + if (theDir != NULL) + { + // We take only first path from list + char* ptr = strtok(theDir, ":"); + if (ptr != NULL) + { + globalDataPath = boost::filesystem::path(ptr); + globalDataPath /= boost::filesystem::path("/"); + } + } + + return globalDataPath; +} + +boost::filesystem::path LinuxPath::getRuntimeDataPath() const +{ + return boost::filesystem::path("./data/"); +} + + +} /* namespace Files */ + +#endif /* defined(__linux__) */ diff --git a/components/files/linuxpath.hpp b/components/files/linuxpath.hpp new file mode 100644 index 0000000000..d6e717fc44 --- /dev/null +++ b/components/files/linuxpath.hpp @@ -0,0 +1,90 @@ +/** + * Open Morrowind - an opensource Elder Scrolls III: Morrowind + * engine implementation. + * + * Copyright (C) 2011 Open Morrowind Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file components/files/linuxpath.hpp */ + +#ifndef COMPONENTS_FILES_LINUXPATH_H +#define COMPONENTS_FILES_LINUXPATH_H + +#if defined(__linux__) + +#include + +/** + * \namespace Files + */ +namespace Files +{ + +/** + * \struct LinuxPath + */ +struct LinuxPath +{ + /** + * \brief Return path to the local configuration directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getLocalConfigPath() const; + + /** + * \brief Return path to the global (system) configuration directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getGlobalConfigPath() const; + + /** + * \brief Return path to the runtime configuration directory which is the + * place where an application was started. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getRuntimeConfigPath() const; + + /** + * \brief Return path to the local data directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getLocalDataPath() const; + + /** + * \brief Return path to the global (system) data directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getGlobalDataPath() const; + + /** + * \brief Return runtime data path which is a location where + * an application was started with 'data' suffix. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getRuntimeDataPath() const; +}; + +} /* namespace Files */ + +#endif /* defined(__linux__) */ + +#endif /* COMPONENTS_FILES_LINUXPATH_H */ diff --git a/components/files/macospath.cpp b/components/files/macospath.cpp new file mode 100644 index 0000000000..46e775030f --- /dev/null +++ b/components/files/macospath.cpp @@ -0,0 +1,118 @@ +/** + * Open Morrowind - an opensource Elder Scrolls III: Morrowind + * engine implementation. + * + * Copyright (C) 2011 Open Morrowind Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file components/files/macospath.cpp */ + +#include "macospath.hpp" + +#if defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__) + +#include +#include +#include + +/** + * \namespace Files + */ +namespace Files +{ + +boost::filesystem::path MacOsPath::getLocalConfigPath() const +{ + boost::filesystem::path localConfigPath("."); + boost::filesystem::path suffix("/"); + + const char* theDir = getenv("HOME"); + if (theDir == NULL) + { + struct passwd* pwd = getpwuid(getuid()); + if (pwd != NULL) + { + theDir = pwd->pw_dir; + } + } + if (theDir != NULL) + { + localConfigPath = boost::filesystem::path(theDir) / "Library/Preferences/"; + } + + localConfigPath /= suffix; + + return localConfigPath; +} + +boost::filesystem::path MacOsPath::getGlobalConfigPath() const +{ + boost::filesystem::path globalConfigPath("/Library/Preferences/"); + return globalConfigPath; +} + +boost::filesystem::path MacOsPath::getRuntimeConfigPath() const +{ + return boost::filesystem::path("./"); +} + +boost::filesystem::path MacOsPath::getLocalDataPath() const +{ + boost::filesystem::path localDataPath("."); + boost::filesystem::path suffix("/"); + + const char* theDir = getenv("OPENMW_DATA"); + if (theDir == NULL) + { + theDir = getenv("HOME"); + if (theDir == NULL) + { + struct passwd* pwd = getpwuid(getuid()); + if (pwd != NULL) + { + theDir = pwd->pw_dir; + } + } + if (theDir != NULL) + { + suffix = boost::filesystem::path("/Library/Application Support/"); + } + } + + if (theDir != NULL) + { + localDataPath = boost::filesystem::path(theDir); + } + + localDataPath /= suffix; + return localDataPath; +} + +boost::filesystem::path MacOsPath::getGlobalDataPath() const +{ + boost::filesystem::path globalDataPath("/Library/Application Support/"); + return globalDataPath; +} + +boost::filesystem::path MacOsPath::getRuntimeDataPath() const +{ + return boost::filesystem::path("./data/"); +} + + +} /* namespace Files */ + +#endif /* defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__) */ diff --git a/components/files/macospath.hpp b/components/files/macospath.hpp new file mode 100644 index 0000000000..26f2c907f7 --- /dev/null +++ b/components/files/macospath.hpp @@ -0,0 +1,90 @@ +/** + * Open Morrowind - an opensource Elder Scrolls III: Morrowind + * engine implementation. + * + * Copyright (C) 2011 Open Morrowind Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file components/files/macospath.hpp */ + +#ifndef COMPONENTS_FILES_MACOSPATH_H +#define COMPONENTS_FILES_MACOSPATH_H + +#if defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__) + +#include + +/** + * \namespace Files + */ +namespace Files +{ + +/** + * \struct MacOsPath + */ +struct MacOsPath +{ + /** + * \brief Return path to the local configuration directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getLocalConfigPath() const; + + /** + * \brief Return path to the global (system) configuration directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getGlobalConfigPath() const; + + /** + * \brief Return path to the runtime configuration directory which is the + * place where an application was started. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getRuntimeConfigPath() const; + + /** + * \brief Return path to the local data directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getLocalDataPath() const; + + /** + * \brief Return path to the global (system) data directory. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getGlobalDataPath() const; + + /** + * \brief Return runtime data path which is a location where + * an application was started with 'data' suffix. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getRuntimeDataPath() const; +}; + +} /* namespace Files */ + +#endif /* defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__) */ + +#endif /* COMPONENTS_FILES_MACOSPATH_H */ diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp index 9a0d31c42f..b44c429867 100644 --- a/components/files/multidircollection.cpp +++ b/components/files/multidircollection.cpp @@ -5,6 +5,7 @@ #include #include +#include #include @@ -39,21 +40,25 @@ namespace Files } }; - MultiDirCollection::MultiDirCollection (const std::vector& directories, + MultiDirCollection::MultiDirCollection(const Files::PathContainer& directories, const std::string& extension, bool foldCase) : mFiles (NameLess (!foldCase)) { NameEqual equal (!foldCase); - for (std::vector::const_iterator iter = directories.begin(); + for (PathContainer::const_iterator iter = directories.begin(); iter!=directories.end(); ++iter) { - boost::filesystem::path dataDirectory = *iter; + if (!boost::filesystem::is_directory(*iter)) + { + std::cout << "Skipping invalid directory: " << (*iter).string() << std::endl; + continue; + } - for (boost::filesystem::directory_iterator iter (dataDirectory); - iter!=boost::filesystem::directory_iterator(); ++iter) + for (boost::filesystem::directory_iterator dirIter(*iter); + dirIter != boost::filesystem::directory_iterator(); ++dirIter) { - boost::filesystem::path path = *iter; + boost::filesystem::path path = *dirIter; if (!equal (extension, boost::filesystem::path (path.extension()).string())) continue; diff --git a/components/files/multidircollection.hpp b/components/files/multidircollection.hpp index 898700c06e..391f8b6a4e 100644 --- a/components/files/multidircollection.hpp +++ b/components/files/multidircollection.hpp @@ -11,6 +11,8 @@ namespace Files { + typedef std::vector PathContainer; + struct NameLess { bool mStrict; @@ -58,7 +60,7 @@ namespace Files public: - MultiDirCollection (const std::vector& directories, + MultiDirCollection (const Files::PathContainer& directories, const std::string& extension, bool foldCase); ///< Directories are listed with increasing priority. /// \param extension The extension that should be listed in this collection. Must diff --git a/components/files/path.cpp b/components/files/path.cpp deleted file mode 100644 index d540f1c141..0000000000 --- a/components/files/path.cpp +++ /dev/null @@ -1,61 +0,0 @@ -#include "path.hpp" - -#include - -#include -#include - -#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE -#include -#endif - -#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_APPLE -#include //getenv -#endif - -std::string Files::getPath (PathTypeEnum parType, const std::string parApp, const std::string parFile) -{ - std::string theBasePath; - if (parType==Path_ConfigGlobal) - { -#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE - boost::filesystem::path path(Ogre::macBundlePath()); - path = path.parent_path(); - theBasePath = path.string() + "/"; -#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX - theBasePath = "/etc/"+parApp+"/"; -#else - theBasePath = ""; -#endif - - } - else if (parType==Path_ConfigUser) - { -#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_APPLE - const char* theDir; - if ((theDir = getenv("OPENMW_HOME")) != NULL) - { - theBasePath = std::string(theDir)+"/"; - } - else - { - if ((theDir = getenv("XDG_CONFIG_HOME"))) - { - theBasePath = std::string(theDir)+"/"+parApp+"/"; - } - else - { - if ((theDir = getenv("HOME")) == NULL) - return parFile; - theBasePath = std::string(theDir)+"/.config/"+parApp+"/"; - } - } - boost::filesystem::create_directories(boost::filesystem::path(theBasePath)); -#else - theBasePath = ""; -#endif - } - - theBasePath.append(parFile); - return theBasePath; -} diff --git a/components/files/path.hpp b/components/files/path.hpp index a426464040..0788cefb15 100644 --- a/components/files/path.hpp +++ b/components/files/path.hpp @@ -1,17 +1,232 @@ +/** + * Open Morrowind - an opensource Elder Scrolls III: Morrowind + * engine implementation. + * + * Copyright (C) 2011 Open Morrowind Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file components/files/path.hpp */ + #ifndef COMPONENTS_FILES_PATH_HPP #define COMPONENTS_FILES_PATH_HPP #include +#include + +#if defined(__linux__) + #include + namespace Files { typedef LinuxPath TargetPathType; } +#elif defined(__WIN32) || defined(__WINDOWS__) + #include + namespace Files { typedef WindowsPath TargetPathType; } + +#elif defined(macintosh) || defined(Macintosh) || defined(__APPLE__) || defined(__MACH__) + #include + namespace Files { typedef MacOsPath TargetPathType; } + +#else + #error "Unknown platform!" +#endif + + +/** + * \namespace Files + */ namespace Files { - enum PathTypeEnum + +/** + * \struct Path + * + * \tparam P - Path strategy class type (depends on target system) + * + */ +template +< + class P = TargetPathType +> +struct Path +{ + typedef P PathType; + + /** + * \brief Path constructor. + * + * \param [in] application_name - Name of the application + */ + Path(const std::string& application_name) + : mPath() + , mLocalConfigPath(mPath.getLocalConfigPath()) + , mGlobalConfigPath(mPath.getGlobalConfigPath()) + , mRuntimeConfigPath(mPath.getRuntimeConfigPath()) + , mLocalDataPath(mPath.getLocalDataPath()) + , mGlobalDataPath(mPath.getGlobalDataPath()) + , mRuntimeDataPath(mPath.getRuntimeDataPath()) { - Path_ConfigUser, - Path_ConfigGlobal - }; + if (!application_name.empty()) + { + boost::filesystem::path suffix(application_name + std::string("/")); - std::string getPath (PathTypeEnum parType, const std::string parApp, const std::string parFile); -} + mLocalConfigPath /= suffix; + mGlobalConfigPath /= suffix; -#endif + mLocalDataPath /= suffix; + mGlobalDataPath /= suffix; + } + } + + /** + * \brief Return path pointing to the user local configuration directory. + * + * \return boost::filesystem::path + */ + const boost::filesystem::path& getLocalConfigPath() const + { + return mLocalConfigPath; + } + + /** + * \brief Sets new local configuration path. + * + * \param [in] path - New path + */ + void setLocalConfigPath(const boost::filesystem::path& path) + { + mLocalConfigPath = path; + } + + /** + * \brief Return path pointing to the global (system) configuration directory. + * + * \return boost::filesystem::path + */ + const boost::filesystem::path& getGlobalConfigPath() const + { + return mGlobalConfigPath; + } + + /** + * \brief Sets new global configuration path. + * + * \param [in] path - New path + */ + void setGlobalConfigPath(const boost::filesystem::path& path) + { + mGlobalConfigPath = path; + } + + /** + * \brief Return path pointing to the directory where application was started. + * + * \return boost::filesystem::path + */ + const boost::filesystem::path& getRuntimeConfigPath() const + { + return mRuntimeConfigPath; + } + + /** + * \brief Sets new runtime configuration path. + * + * \param [in] path - New path + */ + void setRuntimeConfigPath(const boost::filesystem::path& path) + { + mRuntimeConfigPath = path; + } + + /** + * \brief Return path pointing to the user local data directory. + * + * \return boost::filesystem::path + */ + const boost::filesystem::path& getLocalDataPath() const + { + return mLocalDataPath; + } + + /** + * \brief Sets new local data path. + * + * \param [in] path - New path + */ + void setLocalDataPath(const boost::filesystem::path& path) + { + mLocalDataPath = path; + } + + /** + * \brief Return path pointing to the global (system) data directory. + * + * \return boost::filesystem::path + */ + const boost::filesystem::path& getGlobalDataPath() const + { + return mGlobalDataPath; + } + + /** + * \brief Sets new global (system) data directory. + * + * \param [in] path - New path + */ + void setGlobalDataPath(const boost::filesystem::path& path) + { + mGlobalDataPath = path; + } + + /** + * \brief Return path pointing to the directory where application was started. + * + * \return boost::filesystem::path + */ + const boost::filesystem::path& getRuntimeDataPath() const + { + return mRuntimeDataPath; + } + + /** + * \brief Sets new runtime data directory. + * + * \param [in] path - New path + */ + void setRuntimeDataPath(const boost::filesystem::path& path) + { + mRuntimeDataPath = path; + } + + private: + PathType mPath; + + boost::filesystem::path mLocalConfigPath; /**< User local path to the configuration files */ + boost::filesystem::path mGlobalConfigPath; /**< Global path to the configuration files */ + boost::filesystem::path mRuntimeConfigPath; /**< Runtime path to the configuration files. + By default it is the same directory where + application was run */ + + boost::filesystem::path mLocalDataPath; /**< User local application data path (user plugins / mods / etc.) */ + boost::filesystem::path mGlobalDataPath; /**< Global application data path */ + boost::filesystem::path mRuntimeDataPath; /**< Runtime path to the configuration files. + By default it is a 'data' directory in same + directory where application was run */ + +}; + + +} /* namespace Files */ + +#endif /* COMPONENTS_FILES_PATH_HPP */ diff --git a/components/files/windowspath.cpp b/components/files/windowspath.cpp new file mode 100644 index 0000000000..f42f149c14 --- /dev/null +++ b/components/files/windowspath.cpp @@ -0,0 +1,72 @@ +#include "windowspath.hpp" + +#if defined(_WIN32) || defined(__WINDOWS__) + +#include + +#include +#include + +namespace Files +{ + +boost::filesystem::path WindowsPath::getLocalConfigPath() const +{ + boost::filesystem::path localConfigPath("."); + boost::filesystem::path suffix("/"); + + TCHAR path[MAX_PATH]; + memset(path, 0, sizeof(path)); + + if(SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL, 0, path))) + { + PathAppend(path, TEXT("My Games")); + localConfigPath = boost::filesystem::path(path); + } + + localConfigPath /= suffix; + + return localConfigPath; +} + +boost::filesystem::path WindowsPath::getGlobalConfigPath() const +{ + boost::filesystem::path globalConfigPath("."); + boost::filesystem::path suffix("/"); + + TCHAR path[MAX_PATH]; + memset(path, 0, sizeof(path)); + + if(SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES | CSIDL_FLAG_CREATE, NULL, 0, path))) + { + globalConfigPath = boost::filesystem::path(path); + } + + globalConfigPath /= suffix; + + return globalConfigPath; +} + +boost::filesystem::path WindowsPath::getRuntimeConfigPath() const +{ + return boost::filesystem::path("./"); +} + +boost::filesystem::path WindowsPath::getLocalDataPath() const +{ + return getLocalConfigPath(); +} + +boost::filesystem::path WindowsPath::getGlobalDataPath() const +{ + return getGlobalConfigPath(); +} + +boost::filesystem::path WindowsPath::getRuntimeDataPath() const +{ + return boost::filesystem::path("./data/"); +} + +} /* namespace Files */ + +#endif /* defined(_WIN32) || defined(__WINDOWS__) */ diff --git a/components/files/windowspath.hpp b/components/files/windowspath.hpp new file mode 100644 index 0000000000..47dfc08d8e --- /dev/null +++ b/components/files/windowspath.hpp @@ -0,0 +1,90 @@ +/** + * Open Morrowind - an opensource Elder Scrolls III: Morrowind + * engine implementation. + * + * Copyright (C) 2011 Open Morrowind Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file components/files/windowspath.hpp */ + +#ifndef COMPONENTS_FILES_WINDOWSPATH_HPP +#define COMPONENTS_FILES_WINDOWSPATH_HPP + +#if defined(_WIN32) || defined(__WINDOWS__) + +#include + +/** + * \namespace Files + */ +namespace Files +{ + +/** + * \struct WindowsPath + */ +struct WindowsPath +{ + /** + * \brief Returns "X:\Documents And Settings\\My Documents\My Games\" + * + * \return boost::filesystem::path + */ + boost::filesystem::path getLocalConfigPath() const; + + /** + * \brief Returns "X:\Program Files\" + * + * \return boost::filesystem::path + */ + boost::filesystem::path getGlobalConfigPath() const; + + /** + * \brief Return runtime configuration path which is a location where + * an application was started + * + * \return boost::filesystem::path + */ + boost::filesystem::path getRuntimeConfigPath() const; + + /** + * \brief Return same path like getLocalConfigPath + * + * \return boost::filesystem::path + */ + boost::filesystem::path getLocalDataPath() const; + + /** + * \brief Return same path like getGlobalConfigPath + * + * \return boost::filesystem::path + */ + boost::filesystem::path getGlobalDataPath() const; + + /** + * \brief Return runtime data path which is a location where + * an application was started with 'data' suffix. + * + * \return boost::filesystem::path + */ + boost::filesystem::path getRuntimeDataPath() const; +}; + +} /* namespace Files */ + +#endif /* defined(_WIN32) || defined(__WINDOWS__) */ + +#endif /* COMPONENTS_FILES_WINDOWSPATH_HPP */ diff --git a/components/misc/fileops.cpp b/components/misc/fileops.cpp deleted file mode 100644 index eb3b58d84d..0000000000 --- a/components/misc/fileops.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "fileops.hpp" -#include -#include - -#include - -namespace Misc -{ - -bool isFile(const char *name) -{ - boost::filesystem::path cfg_file_path(name); - return boost::filesystem::exists(cfg_file_path); -} - -} diff --git a/components/misc/fileops.hpp b/components/misc/fileops.hpp deleted file mode 100644 index f4e7701bb8..0000000000 --- a/components/misc/fileops.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef MISC_FILEOPS_H -#define MISC_FILEOPS_H - -#include - -namespace Misc -{ - -/// Check if a given path is an existing file (not a directory) -bool isFile(const char *name); - -#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE -std::string macBundlePath(); -#endif - -} - -#endif diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp index 94a3a5aac8..32ca8c41c7 100644 --- a/components/nifbullet/bullet_nif_loader.cpp +++ b/components/nifbullet/bullet_nif_loader.cpp @@ -88,8 +88,7 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource) resourceName = cShape->getName(); cShape->collide = false; - currentShape = new btCompoundShape(); - cShape->Shape = currentShape; + mTriMesh = new btTriangleMesh(); if (!vfs) vfs = new OgreVFS(resourceGroup); @@ -135,6 +134,9 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource) { handleNode(node,0,Ogre::Matrix3::IDENTITY,Ogre::Vector3::ZERO,1,hasCollisionNode,false,true); } + + currentShape = new btBvhTriangleMeshShape(mTriMesh,true); + cShape->Shape = currentShape; } bool ManualBulletShapeLoader::hasRootCollisionNode(Nif::Node* node) @@ -247,7 +249,6 @@ void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags bool raycastingOnly) { assert(shape != NULL); - btCollisionShape* NodeShape; // Interpret flags bool hidden = (flags & 0x01) != 0; // Not displayed @@ -289,7 +290,6 @@ void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags /* Do in-place transformation.the only needed transfo is the scale. (maybe not in fact) */ - btTriangleMesh *mTriMesh = new btTriangleMesh(); Nif::NiTriShapeData *data = shape->data.getPtr(); @@ -303,8 +303,6 @@ void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags btVector3 b3(vertices[triangles[i+2]*3]*parentScale,vertices[triangles[i+2]*3+1]*parentScale,vertices[triangles[i+2]*3+2]*parentScale); mTriMesh->addTriangle(b1,b2,b3); } - NodeShape = new btBvhTriangleMeshShape(mTriMesh,true); - currentShape->addChildShape(tr,NodeShape); } void ManualBulletShapeLoader::load(const std::string &name,const std::string &group) diff --git a/components/nifbullet/bullet_nif_loader.hpp b/components/nifbullet/bullet_nif_loader.hpp index 360d9850bf..1fa2b6aa5f 100644 --- a/components/nifbullet/bullet_nif_loader.hpp +++ b/components/nifbullet/bullet_nif_loader.hpp @@ -125,7 +125,8 @@ private: std::string resourceGroup; BulletShape* cShape;//current shape - btCompoundShape* currentShape;//the shape curently under construction + btTriangleMesh *mTriMesh; + btBvhTriangleMeshShape* currentShape;//the shape curently under construction }; } diff --git a/libs/openengine b/libs/openengine index 0f7d59b4fb..26b9d0fdc3 160000 --- a/libs/openengine +++ b/libs/openengine @@ -1 +1 @@ -Subproject commit 0f7d59b4fb742c6479d988f6fc4ec9cdb4330b53 +Subproject commit 26b9d0fdc374fac648f6293e1d4a4abdc2c20c19