Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 4, 2015, 9:12:21 PM (9 years ago)
Author:
landauf
Message:

merged branch core7 back to trunk

Location:
code/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/modules/designtools/ScreenshotManager.cc

    r9667 r10624  
    4545#include "core/config/ConfigValueIncludes.h"
    4646#include "core/GraphicsManager.h"
    47 #include "core/PathConfig.h"
     47#include "core/ConfigurablePaths.h"
    4848#include "core/Resource.h"
    49 #include "core/command/ConsoleCommand.h"
    50 #include "util/ScopedSingletonManager.h"
     49#include "core/command/ConsoleCommandIncludes.h"
     50#include "core/singleton/ScopedSingletonIncludes.h"
    5151#include "util/StringUtils.h"
    5252
     
    6161    SetConsoleCommand("printScreenHD", &ScreenshotManager::makeScreenshot_s);
    6262   
    63     ManageScopedSingleton(ScreenshotManager, ScopeID::Graphics, false);
     63    ManageScopedSingleton(ScreenshotManager, ScopeID::GRAPHICS, false);
     64
     65    RegisterAbstractClass(ScreenshotManager).inheritsFrom<Configurable>();
    6466
    6567    /**
     
    152154        {
    153155            // Save it.
    154             finalImage->save(PathConfig::getInstance().getLogPathString() + "screenshot_" + getTimestamp() + this->fileExtension_);
     156            finalImage->save(ConfigurablePaths::getLogPathString() + "screenshot_" + getTimestamp() + this->fileExtension_);
    155157            delete finalImage;
    156158            orxout(user_info) << "Finished taking " << this->gridSize_*this->windowWidth_ << "x" << this->gridSize_*this->windowHeight_ << " pixel HD screenshot. Storing in log/." << endl;
  • code/trunk/src/modules/designtools/SkyboxGenerator.cc

    r9667 r10624  
    3838#include <OgreCamera.h>
    3939
    40 #include "util/ScopedSingletonManager.h"
    4140#include "core/CoreIncludes.h"
    4241#include "core/config/ConfigValueIncludes.h"
    4342#include "core/GraphicsManager.h"
    44 #include "core/PathConfig.h"
     43#include "core/ConfigurablePaths.h"
    4544#include "core/Resource.h"
    46 #include "core/command/ConsoleCommand.h"
     45#include "core/command/ConsoleCommandIncludes.h"
    4746#include "core/command/CommandExecutor.h"
     47#include "core/singleton/ScopedSingletonIncludes.h"
    4848
    4949#include "controllers/HumanController.h"
     
    6060    SetConsoleCommand("SkyboxGenerator", "createSkybox", &SkyboxGenerator::createSkybox).addShortcut();
    6161
    62     ManageScopedSingleton(SkyboxGenerator, ScopeID::Graphics, false);
     62    ManageScopedSingleton(SkyboxGenerator, ScopeID::GRAPHICS, false);
     63
     64    RegisterAbstractClass(SkyboxGenerator).inheritsFrom<Configurable>().inheritsFrom<Tickable>();
    6365
    6466    /**
     
    173175                this->setupRenderWindow(renderWindow);
    174176                // Add the log path to the standard resource group.
    175                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation(PathConfig::getInstance().getLogPathString(), "FileSystem", Resource::getDefaultResourceGroup());
     177                Ogre::ResourceGroupManager::getSingleton().addResourceLocation(ConfigurablePaths::getLogPathString(), "FileSystem", Resource::getDefaultResourceGroup());
    176178               
    177179                orxout(internal_status) << "Setting up SkyboxGenerator..." << endl;
     
    208210                this->restoreRenderWindow(renderWindow);
    209211                // Remove the log path from the standard resource group.
    210                 Ogre::ResourceGroupManager::getSingleton().removeResourceLocation(PathConfig::getInstance().getLogPathString(), Resource::getDefaultResourceGroup());
     212                Ogre::ResourceGroupManager::getSingleton().removeResourceLocation(ConfigurablePaths::getLogPathString(), Resource::getDefaultResourceGroup());
    211213               
    212214                // Reset the flow parameters for the next skybox generation.
     
    306308    void SkyboxGenerator::saveImage(Ogre::Image* image, const std::string& name) const
    307309    {
    308         image->save(PathConfig::getInstance().getLogPathString()+name);
     310        image->save(ConfigurablePaths::getLogPathString()+name);
    309311        delete image;
    310312        // Loading the resizing, then saving again. This seems stupid, but resizing doesn't seem to work otherwise.
     
    313315        image->load(name, Resource::getDefaultResourceGroup());
    314316        image->resize(this->size_, this->size_);
    315         image->save(PathConfig::getInstance().getLogPathString()+name);
     317        image->save(ConfigurablePaths::getLogPathString()+name);
    316318        delete image;
    317319        ScreenshotManager::getInstance().cleanup(); // Free memory in ScreenshotManager.
Note: See TracChangeset for help on using the changeset viewer.