Revision: 2601
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2601&view=rev
Author: ulteq
Date: 2012-05-19 19:25:50 +0000 (Sat, 19 May 2012)
Log Message:
-----------
-Bugfix: Overview map (WIP)-Bugfix: Overview map (WIP)
style++
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-19 18:44:07 UTC (rev
2600)
+++ trunk/source/main/gui/MapTextureCreator.cpp 2012-05-19 19:25:50 UTC (rev
2601)
@@ -19,6 +19,7 @@
*/
#include "MapTextureCreator.h"
+#include "BeamFactory.h"
#include "ResourceBuffer.h"
#include "RoRFrameListener.h"
#include "water.h"
@@ -27,9 +28,9 @@
int MapTextureCreator::mCounter = 0;
-MapTextureCreator::MapTextureCreator(SceneManager *mgr, Camera *maincam,
RoRFrameListener *efl) :
- mSceneManager(mgr)
- , mMainCam(mMainCam)
+MapTextureCreator::MapTextureCreator(SceneManager *scm, Camera *cam,
RoRFrameListener *efl) :
+ mSceneManager(scm)
+ , mMainCam(cam)
, mEfl(efl)
, mCamOrientation(Quaternion::ZERO)
, mCamLookAt(Vector3::ZERO)
@@ -71,9 +72,6 @@
mRttTex->addListener(this);
- mCamera->setPosition(0.0f, 1000.0f, 0.0f);
- mCamera->lookAt(Vector3::ZERO);
-
mCamera->setFarClipDistance(0.0f);
mCamera->setAspectRatio(1.0f);
mCamera->setFixedYawAxis(false);
@@ -94,6 +92,11 @@
mCamZoom = std::max(0.3f, zoom);
}
+void MapTextureCreator::setCameraZoomRelative(Real zoomDelta)
+{
+ mCamZoom = std::max(0.3f, mCamZoom + zoomDelta * mCamZoom / 100.0f);
+}
+
void MapTextureCreator::setCamera(Vector3 lookAt, Quaternion orientation)
{
mCamLookAt = lookAt;
@@ -121,29 +124,11 @@
}
mCamera->lookAt(mCamLookAt);
- float f = std::max(20.0f, 50.0f - mCamZoom);
+ preRenderTargetUpdate();
- if ( mStatics )
- {
- mStatics->setRenderingDistance(0);
- }
-
mRttTex->update();
- Water *w = mEfl->getWater();
-
- if ( w )
- {
- w->setVisible(false);
- }
- if ( mStatics )
- {
- mStatics->setRenderingDistance(1000);
- }
- if ( w )
- {
- w->setVisible(true);
- }
+ postRenderTargetUpdate();
}
String MapTextureCreator::getMaterialName()
@@ -156,19 +141,54 @@
return "MapRttTex" + TOSTRING(mCounter);
}
-void MapTextureCreator::preRenderTargetUpdate(const RenderTargetEvent& evt)
+void MapTextureCreator::preRenderTargetUpdate()
{
+ Beam **trucks = BeamFactory::getSingleton().getTrucks();
+
+ float f = std::max(20.0f, 50.0f - mCamZoom);
+
+ for (int i=0; i < BeamFactory::getSingleton().getTruckCount(); i++)
+ {
+ if ( trucks[i] )
+ {
+ trucks[i]->preMapLabelRenderUpdate(true, f);
+ }
+ }
+
Water *w = mEfl->getWater();
+
if ( w )
{
w->setVisible(false);
}
+
+ if ( mStatics )
+ {
+ mStatics->setRenderingDistance(0);
+ }
}
-void MapTextureCreator::postRenderTargetUpdate(const RenderTargetEvent& evt)
+
+void MapTextureCreator::postRenderTargetUpdate()
{
+ Beam **trucks = BeamFactory::getSingleton().getTrucks();
+
+ for (int i=0; i < BeamFactory::getSingleton().getTruckCount(); i++)
+ {
+ if ( trucks[i] )
+ {
+ trucks[i]->preMapLabelRenderUpdate(false);
+ }
+ }
+
Water *w = mEfl->getWater();
+
if ( w )
{
w->setVisible(true);
}
+
+ if ( mStatics )
+ {
+ mStatics->setRenderingDistance(1000);
+ }
}
Modified: trunk/source/main/gui/MapTextureCreator.h
===================================================================
--- trunk/source/main/gui/MapTextureCreator.h 2012-05-19 18:44:07 UTC (rev
2600)
+++ trunk/source/main/gui/MapTextureCreator.h 2012-05-19 19:25:50 UTC (rev
2601)
@@ -28,7 +28,7 @@
{
public:
- MapTextureCreator(Ogre::SceneManager *smgr, Ogre::Camera *mainCam,
RoRFrameListener *efl);
+ MapTextureCreator(Ogre::SceneManager *scm, Ogre::Camera *cam,
RoRFrameListener *efl);
Ogre::String getMaterialName();
Ogre::String getRTName();
@@ -36,6 +36,7 @@
void setCamera(Ogre::Vector3 lookAt, Ogre::Quaternion orientation);
void setCameraMode(Ogre::PolygonMode polygonMode);
void setCameraZoom(Ogre::Real zoom);
+ void setCameraZoomRelative(Ogre::Real zoomDelta);
void setStaticGeometry(Ogre::StaticGeometry *staticGeometry);
void update();
@@ -44,8 +45,8 @@
bool init();
- void preRenderTargetUpdate(const Ogre::RenderTargetEvent& evt);
- void postRenderTargetUpdate(const Ogre::RenderTargetEvent& evt);
+ void preRenderTargetUpdate();
+ void postRenderTargetUpdate();
Ogre::Camera *mCamera;
Ogre::Camera *mMainCam;
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
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
