Revision: 2704
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2704&view=rev
Author: ulteq
Date: 2012-05-26 18:13:25 +0000 (Sat, 26 May 2012)
Log Message:
-----------
moved GEnv.h one layer up
Modified Paths:
--------------
trunk/source/main/terrain/IHeightFinder.h
trunk/source/main/terrain/TerrainManager.h
Added Paths:
-----------
trunk/source/main/GEnv.h
Removed Paths:
-------------
trunk/source/main/gameplay/GEnv.h
Added: trunk/source/main/GEnv.h
===================================================================
--- trunk/source/main/GEnv.h (rev 0)
+++ trunk/source/main/GEnv.h 2012-05-26 18:13:25 UTC (rev 2704)
@@ -0,0 +1,73 @@
+/*
+This source file is part of Rigs of Rods
+Copyright 2005-2012 Pierre-Michel Ricordel
+Copyright 2007-2012 Thomas Fischer
+
+For more information, see http://www.rigsofrods.com/
+
+Rigs of Rods is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3, as
+published by the Free Software Foundation.
+
+Rigs of Rods is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef GEnv_H__
+#define GEnv_H__
+
+class RoRFrameListener;
+class TerrainManager;
+class Collisions;
+class IHeightFinder;
+class Water;
+class Network;
+class MapControl;
+class Character;
+class SkyManager;
+
+class GlobalEnvironment
+{
+public:
+ GlobalEnvironment() :
+ ogreRoot(0)
+ , ogreViewPort(0)
+ , ogreRenderWindow(0)
+ , ogreCamera(0)
+ , ogreSceneManager(0)
+ , frameListener(0)
+ , terrainManager(0)
+ , collisions(0)
+ , heightFinder(0)
+ , water(0)
+ , network(0)
+ , surveyMap(0)
+ , player(0)
+ , sky(0)
+ , embeddedMode(false)
+ {
+ }
+ Ogre::Root *ogreRoot;
+ Ogre::Viewport *ogreViewPort;
+ Ogre::RenderWindow *ogreRenderWindow;
+ Ogre::Camera *ogreCamera;
+ Ogre::SceneManager *ogreSceneManager;
+
+ RoRFrameListener *frameListener;
+ TerrainManager *terrainManager;
+ Collisions *collisions;
+ IHeightFinder *heightFinder;
+ Water *water;
+ Network *network;
+ MapControl *surveyMap;
+ Character *player;
+ SkyManager *sky;
+
+ bool embeddedMode;
+};
+
+#endif // GEnv_H__
Deleted: trunk/source/main/gameplay/GEnv.h
===================================================================
--- trunk/source/main/gameplay/GEnv.h 2012-05-26 11:45:42 UTC (rev 2703)
+++ trunk/source/main/gameplay/GEnv.h 2012-05-26 18:13:25 UTC (rev 2704)
@@ -1,73 +0,0 @@
-/*
-This source file is part of Rigs of Rods
-Copyright 2005-2012 Pierre-Michel Ricordel
-Copyright 2007-2012 Thomas Fischer
-
-For more information, see http://www.rigsofrods.com/
-
-Rigs of Rods is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License version 3, as
-published by the Free Software Foundation.
-
-Rigs of Rods is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef GEnv_H__
-#define GEnv_H__
-
-class RoRFrameListener;
-class TerrainManager;
-class Collisions;
-class IHeightFinder;
-class Water;
-class Network;
-class MapControl;
-class Character;
-class SkyManager;
-
-class GlobalEnvironment
-{
-public:
- GlobalEnvironment() :
- ogreRoot(0)
- , ogreViewPort(0)
- , ogreRenderWindow(0)
- , ogreCamera(0)
- , ogreSceneManager(0)
- , frameListener(0)
- , terrainManager(0)
- , collisions(0)
- , heightFinder(0)
- , water(0)
- , network(0)
- , surveyMap(0)
- , player(0)
- , sky(0)
- , embeddedMode(false)
- {
- }
- Ogre::Root *ogreRoot;
- Ogre::Viewport *ogreViewPort;
- Ogre::RenderWindow *ogreRenderWindow;
- Ogre::Camera *ogreCamera;
- Ogre::SceneManager *ogreSceneManager;
-
- RoRFrameListener *frameListener;
- TerrainManager *terrainManager;
- Collisions *collisions;
- IHeightFinder *heightFinder;
- Water *water;
- Network *network;
- MapControl *surveyMap;
- Character *player;
- SkyManager *sky;
-
- bool embeddedMode;
-};
-
-#endif // GEnv_H__
Modified: trunk/source/main/terrain/IHeightFinder.h
===================================================================
--- trunk/source/main/terrain/IHeightFinder.h 2012-05-26 11:45:42 UTC (rev
2703)
+++ trunk/source/main/terrain/IHeightFinder.h 2012-05-26 18:13:25 UTC (rev
2704)
@@ -17,16 +17,17 @@
You should have received a copy of the GNU General Public License
along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef IHEightFinder_H__
-#define IHEightFinder_H__
+#ifndef __I_HeightFinder_H_
+#define __I_HeightFinder_H_
#include "RoRPrerequisites.h"
class IHeightFinder
{
public:
+
virtual float getHeightAt(float x, float z) = 0;
virtual Ogre::Vector3 getNormalAt(float x, float y, float z, float
precision = 0.1f) = 0;
};
-#endif // IHEightFinder_H__
\ No newline at end of file
+#endif // __I_HeightFinder_H_
Modified: trunk/source/main/terrain/TerrainManager.h
===================================================================
--- trunk/source/main/terrain/TerrainManager.h 2012-05-26 11:45:42 UTC (rev
2703)
+++ trunk/source/main/terrain/TerrainManager.h 2012-05-26 18:13:25 UTC (rev
2704)
@@ -39,6 +39,8 @@
void setGravity(float value);
float getGravity() { return gravity; };
+ Ogre::Vector3 getMax() { return Ogre::Vector3::ZERO; };
+
protected:
// members
Ogre::ConfigFile mTerrainConfig;
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
