Merge remote branch 'scrawl/next' into next

This commit is contained in:
Marc Zinnschlag 2012-02-20 14:36:27 +01:00
commit 420e611a4b
4 changed files with 210 additions and 0 deletions

View file

@ -1,4 +1,5 @@
#include "renderer.hpp"
#include "fader.hpp"
#include "OgreRoot.h"
#include "OgreRenderWindow.h"
@ -12,6 +13,8 @@ using namespace OEngine::Render;
void OgreRenderer::cleanup()
{
delete mFader;
if(mRoot)
delete mRoot;
mRoot = NULL;
@ -22,6 +25,11 @@ void OgreRenderer::start()
mRoot->startRendering();
}
void OgreRenderer::update(float dt)
{
mFader->update(dt);
}
void OgreRenderer::screenshot(const std::string &file)
{
mWindow->writeContentsToFile(file);
@ -104,4 +112,6 @@ void OgreRenderer::createScene(const std::string camName, float fov, float nearC
// Alter the camera aspect ratio to match the viewport
mCamera->setAspectRatio(Real(mView->getActualWidth()) / Real(mView->getActualHeight()));
mFader = new Fader();
}