Revision: 1557
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1557&view=rev
Author: aperion
Date: 2010-12-19 07:11:27 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
general cleanup, removal of using namespace Ogre and removal of a lot of dead
code
Modified Paths:
--------------
trunk/source/main/mirrors.cpp
trunk/source/main/mirrors.h
Modified: trunk/source/main/mirrors.cpp
===================================================================
--- trunk/source/main/mirrors.cpp 2010-12-19 05:45:25 UTC (rev 1556)
+++ trunk/source/main/mirrors.cpp 2010-12-19 07:11:27 UTC (rev 1557)
@@ -19,71 +19,42 @@
*/
#include "mirrors.h"
#include "ResourceBuffer.h"
+#include <Ogre.h>
-Camera *mloCamera;
-
-class MirrorsListener : public RenderTargetListener
+Mirrors::Mirrors(Ogre::SceneManager *mSceneMgr, Ogre::RenderWindow *mWindow,
Ogre::Camera *camera)
+:
+mCamera(camera)
+, mMirrorCam(mSceneMgr->createCamera("MirrorCam"))
+, rttTex(0)
+, mat(Ogre::MaterialManager::getSingleton().getByName("mirror"))
{
-public:
- void preRenderTargetUpdate(const RenderTargetEvent& evt)
- {
- //mloCamera->setFOVy(mloCamera->getFOVy()/2.0);
- }
- void postRenderTargetUpdate(const RenderTargetEvent& evt)
- {
- //mloCamera->setFOVy(mloCamera->getFOVy()*2.0);
- }
-};
-
-MirrorsListener mMirrorsListener;
-
-Mirrors::Mirrors(SceneManager *mSceneMgr, RenderWindow *mWindow, Camera
*camera)
-{
- /* Entity *teo = mSceneMgr->createEntity("mirroro", "beam.mesh");
- tnodeo=mSceneMgr->getRootSceneNode()->createChildSceneNode();
- tnodeo->attachObject(teo);
- tnodeo->setScale(0.001, 0.001, 0.001);
-
- Entity *tei = mSceneMgr->createEntity("mirrori", "beam.mesh");
- tei->setMaterialName("tracks/beam");
- tnoden=mSceneMgr->getRootSceneNode()->createChildSceneNode();
- tnoden->attachObject(tei);
- tnoden->setScale(0.001, 0.001, 0.001);
-*/
- //mScene=mSceneMgr;
- rttTex=0;
- mloCamera=camera;
- mCamera=camera;
-
- TexturePtr rttTexPtr =
TextureManager::getSingleton().createManual("mirrortexture",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, TEX_TYPE_2D, 128, 256, 0,
PF_R8G8B8, TU_RENDERTARGET, new ResourceBuffer());
+ Ogre::TexturePtr rttTexPtr
+ =
Ogre::TextureManager::getSingleton().createManual("mirrortexture"
+ ,
Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME
+ , Ogre::TEX_TYPE_2D
+ , 128
+ , 256
+ , 0
+ , Ogre::PF_R8G8B8
+ , Ogre::TU_RENDERTARGET
+ , new ResourceBuffer());
rttTex = rttTexPtr->getBuffer()->getRenderTarget();
- {
- mMirrorCam = mSceneMgr->createCamera("MirrorCam");
- mMirrorCam->setNearClipDistance(0.2);
-
mMirrorCam->setFarClipDistance(mCamera->getFarClipDistance());
- mMirrorCam->setFOVy(Degree(50));
- mMirrorCam->setAspectRatio(
-
((Real)mWindow->getViewport(0)->getActualWidth() /
-
(Real)mWindow->getViewport(0)->getActualHeight())/2.0);
+
+ mMirrorCam->setNearClipDistance(0.2);
+ mMirrorCam->setFarClipDistance(mCamera->getFarClipDistance());
+ mMirrorCam->setFOVy(Ogre::Degree(50));
+ mMirrorCam->setAspectRatio(
+ ((Ogre::Real)mWindow->getViewport(0)->getActualWidth()
/
+
(Ogre::Real)mWindow->getViewport(0)->getActualHeight())/2.0);
- Viewport *v = rttTex->addViewport( mMirrorCam );
- v->setClearEveryFrame( true );
- v->setBackgroundColour(
camera->getViewport()->getBackgroundColour() );
+ Ogre::Viewport *v = rttTex->addViewport( mMirrorCam );
+ v->setClearEveryFrame( true );
+ v->setBackgroundColour(
camera->getViewport()->getBackgroundColour() );
- mat =
MaterialManager::getSingleton().getByName("mirror");
-
mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("mirrortexture");
-
//mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setProjectiveTexturing(true,
mMirrorCam);
-
//mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureAddressingMode(TextureUnitState::TAM_CLAMP);
-
mat->getTechnique(0)->getPass(0)->setLightingEnabled(false);
- v->setOverlaysEnabled(false);
-
- //rttTex->addListener(&mMirrorsListener);
-
- // set up linked reflection
- //mMirrorCam->enableReflection(mirrorPlane);
- // mMirrorCam->enableCustomNearClipPlane(mirrorPlane);
- }
+
mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("mirrortexture");
+ mat->getTechnique(0)->getPass(0)->setLightingEnabled(false);
+ v->setOverlaysEnabled(false);
}
void Mirrors::setActive(bool state)
@@ -96,36 +67,12 @@
}
-void Mirrors::update(Vector3 normal, Vector3 center, Radian rollangle)
+void Mirrors::update(Ogre::Vector3 normal, Ogre::Vector3 center, Ogre::Radian
rollangle)
{
- //mMirrorCam->setOrientation(mCamera->getOrientation());
- //mMirrorCam->setPosition(mCamera->getPosition());
- //mMirrorCam->setFOVy(mCamera->getFOVy());
-// mMirrorCam->setNearClipDistance(mCamera->getNearClipDistance());
-// mMirrorCam->setFarClipDistance(mCamera->getFarClipDistance());
- //mirrorPlane=mplane;
-// mMirrorCam->enableReflection(mplane);
- Plane plane=Plane(normal, center);
- //mMirrorCam->enableCustomNearClipPlane(plane);
- //Vector3 project=plane.projectVector(center-mCamera->getPosition());
- //Vector3 perp=center-mCamera->getPosition()-project;
-// mMirrorCam->setPosition(2.0*center-mCamera->getPosition()+2.0*project);
- //mMirrorCam->setPosition(mCamera->getPosition()+2*perp);
- //mMirrorCam->lookAt(center);
- //mMirrorCam->setFOVy();
- //tnodeo->setPosition(center);
- //tnoden->setPosition(mMirrorCam->getPosition());
+ Ogre::Plane plane=Ogre::Plane(normal, center);
mMirrorCam->setPosition(center);
- Vector3 project=plane.projectVector(mCamera->getPosition()-center);
-// Vector3 upvec=mCamera->getUp();
-// Vector3 dirvec=center-(mCamera->getPosition()-2*project);
-// mMirrorCam->setOrientation(Quaternion(upvec.crossProduct(dirvec),
upvec, dirvec));
+ Ogre::Vector3
project=plane.projectVector(mCamera->getPosition()-center);
mMirrorCam->lookAt(mCamera->getPosition()-2*project);
mMirrorCam->roll(rollangle);
}
-void Mirrors::prepareShutdown()
-{
- //if (rttTex) rttTex->removeListener(&mMirrorsListener);
-}
-
Modified: trunk/source/main/mirrors.h
===================================================================
--- trunk/source/main/mirrors.h 2010-12-19 05:45:25 UTC (rev 1556)
+++ trunk/source/main/mirrors.h 2010-12-19 07:11:27 UTC (rev 1557)
@@ -21,30 +21,26 @@
#ifndef __Mirrors_H__
#define __Mirrors_H__
-#include "Ogre.h"
+#include <OgrePrerequisites.h>
+#include <OgreMaterial.h>
+
#include "rormemory.h"
-using namespace Ogre;
-
class Mirrors : public MemoryAllocatedObject
{
private:
- Camera *mCamera;
- Camera *mMirrorCam;
- RenderTexture* rttTex;
- //Plane mirrorPlane;
- SceneNode *tnodeo;
- SceneNode *tnoden;
- MaterialPtr mat;
+ Ogre::Camera *mCamera;
+ Ogre::Camera *mMirrorCam;
+ Ogre::RenderTexture* rttTex;
+ Ogre::MaterialPtr mat;
public:
- Mirrors(SceneManager *mSceneMgr, RenderWindow *mWindow, Camera *camera);
-void setActive(bool state);
+ Mirrors(Ogre::SceneManager *mSceneMgr, Ogre::RenderWindow *mWindow,
Ogre::Camera *camera);
+ void setActive(bool state);
+
+ void update(Ogre::Vector3 normal, Ogre::Vector3 center, Ogre::Radian
rollangle);
-void update(Vector3 normal, Vector3 center, Ogre::Radian rollangle);
-void prepareShutdown();
-
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
