Revision: 2780
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2780&view=rev
Author: ulteq
Date: 2012-06-05 20:44:45 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
-Codechange: removed an ugly reinterpret_cast
Modified Paths:
--------------
trunk/source/main/terrain/TerrainManager.cpp
trunk/source/main/terrain/TerrainManager.h
Modified: trunk/source/main/terrain/TerrainManager.cpp
===================================================================
--- trunk/source/main/terrain/TerrainManager.cpp 2012-06-05 11:39:03 UTC
(rev 2779)
+++ trunk/source/main/terrain/TerrainManager.cpp 2012-06-05 20:44:45 UTC
(rev 2780)
@@ -595,3 +595,8 @@
return Vector3::ZERO;
return geometry_manager->getMaxTerrainSize();
}
+
+IHeightFinder* TerrainManager::getHeightFinder()
+{
+ return geometry_manager;
+}
Modified: trunk/source/main/terrain/TerrainManager.h
===================================================================
--- trunk/source/main/terrain/TerrainManager.h 2012-06-05 11:39:03 UTC (rev
2779)
+++ trunk/source/main/terrain/TerrainManager.h 2012-06-05 20:44:45 UTC (rev
2780)
@@ -30,6 +30,7 @@
{
friend class CacheSystem;
friend class TerrainObjectManager;
+
public:
TerrainManager();
@@ -49,7 +50,7 @@
// some getters
Collisions *getCollisions() { return collisions; };
Envmap *getEnvmap() { return envmap; };
- IHeightFinder *getHeightFinder() { return
reinterpret_cast<IHeightFinder *>(geometry_manager); };
+ IHeightFinder *getHeightFinder();
SkyManager *getSkyManager() { return sky_manager; };
Water *getWater() { return water; };
Ogre::Light *getMainLight() { return main_light; };
@@ -93,6 +94,7 @@
int pagedMode;
float pagedDetailFactor;
bool trucksLoaded;
+
// internal methods
void initCamera();
void initCollisions();
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
