Revision: 2750
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2750&view=rev
Author: rorthomas
Date: 2012-05-29 02:13:31 +0000 (Tue, 29 May 2012)
Log Message:
-----------
terrain geometry loading
Modified Paths:
--------------
trunk/source/main/terrain/TerrainGeometryManager.cpp
trunk/source/main/terrain/TerrainManager.cpp
trunk/source/main/terrain/TerrainManager.h
Modified: trunk/source/main/terrain/TerrainGeometryManager.cpp
===================================================================
--- trunk/source/main/terrain/TerrainGeometryManager.cpp 2012-05-29
01:05:54 UTC (rev 2749)
+++ trunk/source/main/terrain/TerrainGeometryManager.cpp 2012-05-29
02:13:31 UTC (rev 2750)
@@ -126,7 +126,7 @@
{
OGRE_NEW TerrainGlobalOptions();
- Light *light = gEnv->terrainManager->getSkyManager()->getMainLight();
+ Light *light = gEnv->terrainManager->getMainLight();
TerrainGlobalOptions *terrainOptions =
TerrainGlobalOptions::getSingletonPtr();
// Configure global
terrainOptions->setMaxPixelError(PARSEINT(terrainConfig.getSetting("MaxPixelError")));
Modified: trunk/source/main/terrain/TerrainManager.cpp
===================================================================
--- trunk/source/main/terrain/TerrainManager.cpp 2012-05-29 01:05:54 UTC
(rev 2749)
+++ trunk/source/main/terrain/TerrainManager.cpp 2012-05-29 02:13:31 UTC
(rev 2750)
@@ -109,6 +109,9 @@
fixCompositorClearColor();
+ // load the terrain geometry
+ geometry_manager->loadOgreTerrainConfig(ogre_terrain_config_filename);
+
loadTerrainObjects();
collisions->printStats();
@@ -128,12 +131,12 @@
void TerrainManager::initSubSystems()
{
+ // geometry - ogre terrain things
+ initGeometry();
+
// objects - .odef support
- object_manager = new TerrainObjectManager(this);
+ initObjects();
- // geometry - ogre terrain things
- geometry_manager = new TerrainGeometryManager(this);
-
// collisions
initCollisions();
@@ -513,3 +516,13 @@
{
//survey_map = new MapControl(mapsizex, mapsizey, mapsizez);
}
+
+void TerrainManager::initGeometry()
+{
+ geometry_manager = new TerrainGeometryManager(this);
+}
+
+void TerrainManager::initObjects()
+{
+ object_manager = new TerrainObjectManager(this);
+}
Modified: trunk/source/main/terrain/TerrainManager.h
===================================================================
--- trunk/source/main/terrain/TerrainManager.h 2012-05-29 01:05:54 UTC (rev
2749)
+++ trunk/source/main/terrain/TerrainManager.h 2012-05-29 02:13:31 UTC (rev
2750)
@@ -44,11 +44,13 @@
Ogre::Vector3 getMax() { return Ogre::Vector3::ZERO; };
+ // some getters
Collisions *getCollisions() { return collisions; };
Envmap *getEnvmap() { return envmap; };
IHeightFinder *getHeightFinder() { return
reinterpret_cast<IHeightFinder *>(geometry_manager); };
SkyManager *getSkyManager() { return sky_manager; };
Water *getWater() { return water; };
+ Ogre::Light *getMainLight() { return main_light; };
protected:
// members
@@ -106,6 +108,8 @@
void fixCompositorClearColor();
void loadTerrainObjects();
+ void initGeometry();
+ void initObjects();
};
#endif // __TerrainManager_H_
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
