Revision: 2713
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2713&view=rev
Author: ulteq
Date: 2012-05-26 21:53:51 +0000 (Sat, 26 May 2012)
Log Message:
-----------
compiles again
Modified Paths:
--------------
trunk/source/main/gui/MapTextureCreator.cpp
trunk/source/main/gui/MapTextureCreator.h
Modified: trunk/source/main/gui/MapTextureCreator.cpp
===================================================================
--- trunk/source/main/gui/MapTextureCreator.cpp 2012-05-26 21:34:30 UTC (rev
2712)
+++ trunk/source/main/gui/MapTextureCreator.cpp 2012-05-26 21:53:51 UTC (rev
2713)
@@ -20,9 +20,8 @@
#include "MapTextureCreator.h"
#include "BeamFactory.h"
-#include "IWater.h"
-#include "MapControl.h"
#include "ResourceBuffer.h"
+#include "TerrainManager.h"
using namespace Ogre;
@@ -101,7 +100,7 @@
{
if ( !mRttTex ) return;
- Vector3 mapSize = mMapControl->getMapSize();
+ Vector3 mapSize = gEnv->terrainManager->getMax();
float orthoWindowWidth = mapSize.x - (mapSize.x - 20.0f) * mMapZoom;
float orthoWindowHeight = mapSize.z - (mapSize.z - 20.0f) * mMapZoom;
Modified: trunk/source/main/gui/MapTextureCreator.h
===================================================================
--- trunk/source/main/gui/MapTextureCreator.h 2012-05-26 21:34:30 UTC (rev
2712)
+++ trunk/source/main/gui/MapTextureCreator.h 2012-05-26 21:53:51 UTC (rev
2713)
@@ -28,7 +28,7 @@
{
public:
- MapTextureCreator(MapControl *ctrl);
+ MapTextureCreator();
Ogre::String getMaterialName();
Ogre::String getRTName();
@@ -47,9 +47,7 @@
void preRenderTargetUpdate();
void postRenderTargetUpdate();
- MapControl *mMapControl;
Ogre::Camera *mCamera;
- Ogre::Camera *mMainCam;
Ogre::MaterialPtr mMaterial;
Ogre::Real mMapZoom;
Ogre::RenderTarget *mRttTex;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
