Revision: 2627
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2627&view=rev
Author: ulteq
Date: 2012-05-22 08:08:07 +0000 (Tue, 22 May 2012)
Log Message:
-----------
-Codechange: Renamed water.h to IWater.h
Modified Paths:
--------------
trunk/source/main/gameplay/Character.cpp
trunk/source/main/gameplay/Character.h
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gameplay/autopilot.cpp
trunk/source/main/gfx/DustPool.cpp
trunk/source/main/gfx/WaterOld.h
trunk/source/main/gui/MapTextureCreator.cpp
trunk/source/main/physics/Beam.cpp
trunk/source/main/physics/BeamForcesEuler.cpp
trunk/source/main/physics/water/buoyance.cpp
trunk/source/main/physics/water/screwprop.cpp
trunk/source/main/scripting/GameScript.cpp
Added Paths:
-----------
trunk/source/main/gfx/IWater.h
Removed Paths:
-------------
trunk/source/main/gfx/water.h
Modified: trunk/source/main/gameplay/Character.cpp
===================================================================
--- trunk/source/main/gameplay/Character.cpp 2012-05-22 05:18:56 UTC (rev
2626)
+++ trunk/source/main/gameplay/Character.cpp 2012-05-22 08:08:07 UTC (rev
2627)
@@ -24,13 +24,13 @@
#include "collisions.h"
#include "heightfinder.h"
#include "InputEngine.h"
+#include "IWater.h"
#include "MapControl.h"
#include "MapEntity.h"
#include "network.h"
#include "NetworkStreamManager.h"
#include "PlayerColours.h"
#include "utils.h"
-#include "water.h"
using namespace Ogre;
Modified: trunk/source/main/gameplay/Character.h
===================================================================
--- trunk/source/main/gameplay/Character.h 2012-05-22 05:18:56 UTC (rev
2626)
+++ trunk/source/main/gameplay/Character.h 2012-05-22 08:08:07 UTC (rev
2627)
@@ -36,7 +36,6 @@
~Character();
Ogre::Radian getRotation() { return characterRotation; };
- Ogre::SceneNode *getSceneNode() { return mCharacterNode; };
Ogre::Vector3 getPosition();
bool getPhysicsEnabled() { return physicsEnabled; };
bool getVisible();
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-22 05:18:56 UTC
(rev 2626)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-22 08:08:07 UTC
(rev 2627)
@@ -32,8 +32,8 @@
#include "Beam.h"
#include "BeamEngine.h"
#include "BeamFactory.h"
+#include "CacheSystem.h"
#include "CameraManager.h"
-#include "CacheSystem.h"
#include "Character.h"
#include "CharacterFactory.h"
#include "ChatSystem.h"
@@ -52,6 +52,7 @@
#include "hdrlistener.h"
#include "Heathaze.h"
#include "InputEngine.h"
+#include "IWater.h"
#include "language.h"
#include "MeshObject.h"
#include "MumbleIntegration.h"
@@ -68,17 +69,16 @@
#include "RoRVersion.h"
#include "SceneMouse.h"
#include "ScopeLog.h"
-#include "SoundScriptManager.h"
#include "screwprop.h"
#include "Scripting.h"
#include "Settings.h"
#include "ShadowManager.h"
#include "SkyManager.h"
+#include "SoundScriptManager.h"
#include "TruckHUD.h"
#include "turboprop.h"
#include "utils.h"
#include "vidcam.h"
-#include "water.h"
#include "WaterOld.h"
#include "writeTextToTexture.h"
@@ -2717,7 +2717,7 @@
if (curr_truck->cc_mode)
{
-
updateCruiseControl(curr_truck,dt);
+ updateCruiseControl(curr_truck,
dt);
}
checkSpeedlimit(curr_truck, dt);
}
Modified: trunk/source/main/gameplay/autopilot.cpp
===================================================================
--- trunk/source/main/gameplay/autopilot.cpp 2012-05-22 05:18:56 UTC (rev
2626)
+++ trunk/source/main/gameplay/autopilot.cpp 2012-05-22 08:08:07 UTC (rev
2627)
@@ -19,14 +19,13 @@
*/
#include "autopilot.h"
-#include <Ogre.h>
-using namespace Ogre;
-
-#include "SoundScriptManager.h"
-#include "heightfinder.h"
-#include "water.h"
#include "BeamData.h"
+#include "heightfinder.h"
+#include "IWater.h"
+#include "SoundScriptManager.h"
+using namespace Ogre;
+
Autopilot::Autopilot(HeightFinder *hfd, Water *w, int trucknum)
{
this->trucknum=trucknum;
Modified: trunk/source/main/gfx/DustPool.cpp
===================================================================
--- trunk/source/main/gfx/DustPool.cpp 2012-05-22 05:18:56 UTC (rev 2626)
+++ trunk/source/main/gfx/DustPool.cpp 2012-05-22 08:08:07 UTC (rev 2627)
@@ -18,7 +18,7 @@
along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DustPool.h"
-#include "water.h"
+#include "IWater.h"
#include "RoRPrerequisites.h"
DustPool::DustPool(char* dname, int dsize, SceneNode *parent, SceneManager
*smgr, Water *mw)
Added: trunk/source/main/gfx/IWater.h
===================================================================
--- trunk/source/main/gfx/IWater.h (rev 0)
+++ trunk/source/main/gfx/IWater.h 2012-05-22 08:08:07 UTC (rev 2627)
@@ -0,0 +1,51 @@
+/*
+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 __I_Water_H_
+#define __I_Water_H_
+
+#include "RoRPrerequisites.h"
+
+// interface only
+class Water
+{
+public:
+ Water() {};
+ Water(int type, Ogre::Camera *mCamera, Ogre::SceneManager *mSceneMgr,
Ogre::RenderWindow *mWindow, float wHeight, float *MapSizeX, float *MapSizeZ,
bool useWaves);
+ virtual ~Water() {};
+
+ virtual float getHeight() = 0;
+ virtual float getHeightWaves(Ogre::Vector3 pos) = 0;
+ virtual Ogre::Vector3 getVelocity(Ogre::Vector3 pos) = 0;
+
+ virtual void setFadeColour(Ogre::ColourValue ambient) = 0;
+ virtual void setHeight(float value) = 0;
+ virtual void setSunPosition(Ogre::Vector3) = 0;
+ virtual void setVisible(bool value) = 0;
+
+ virtual bool allowUnderWater() = 0;
+ virtual void framestep(float dt) = 0;
+ virtual void moveTo(Ogre::Camera *cam, float centerheight) = 0;
+ virtual void prepareShutdown() = 0;
+ virtual void showWave(Ogre::Vector3 refpos) = 0;
+ virtual void update() = 0;
+ virtual void updateReflectionPlane(float h) = 0;
+};
+
+#endif // __I_Water_H_
Modified: trunk/source/main/gfx/WaterOld.h
===================================================================
--- trunk/source/main/gfx/WaterOld.h 2012-05-22 05:18:56 UTC (rev 2626)
+++ trunk/source/main/gfx/WaterOld.h 2012-05-22 08:08:07 UTC (rev 2627)
@@ -23,7 +23,7 @@
#include "RoRPrerequisites.h"
#include "Ogre.h"
-#include "water.h"
+#include "IWater.h"
extern float mrtime;
Deleted: trunk/source/main/gfx/water.h
===================================================================
--- trunk/source/main/gfx/water.h 2012-05-22 05:18:56 UTC (rev 2626)
+++ trunk/source/main/gfx/water.h 2012-05-22 08:08:07 UTC (rev 2627)
@@ -1,51 +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 __Water_H__
-#define __Water_H__
-
-#include "RoRPrerequisites.h"
-//#include "Ogre.h"
-
-// interface only
-class Water
-{
-public:
- Water() {};
- Water(int type, Ogre::Camera *camera, Ogre::SceneManager *mSceneMgr,
Ogre::RenderWindow *mWindow, float wheight, float *mapsizex, float *mapsizez,
bool usewaves);
- virtual ~Water() {};
-
- bool visible;
- virtual Ogre::Vector3 getVelocity(Ogre::Vector3 pos)= 0;
- virtual bool allowUnderWater()= 0;
- virtual float getHeight()= 0;
- virtual float getHeightWaves(Ogre::Vector3 pos)= 0;
- virtual void framestep(float dt)= 0;
- virtual void moveTo(Ogre::Camera *cam, float centerheight)= 0;
- virtual void prepareShutdown()= 0;
- virtual void setFadeColour(Ogre::ColourValue ambient)= 0;
- virtual void setHeight(float value)= 0;
- virtual void setSunPosition(Ogre::Vector3)= 0;
- virtual void setVisible(bool value)= 0;
- virtual void showWave(Ogre::Vector3 refpos) = 0;
- virtual void update()= 0;
- virtual void updateReflectionPlane(float h)= 0;
-};
-
-#endif // __Water_H__
Modified: trunk/source/main/gui/MapTextureCreator.cpp
===================================================================
--- trunk/source/main/gui/MapTextureCreator.cpp 2012-05-22 05:18:56 UTC (rev
2626)
+++ trunk/source/main/gui/MapTextureCreator.cpp 2012-05-22 08:08:07 UTC (rev
2627)
@@ -20,9 +20,9 @@
#include "MapTextureCreator.h"
#include "BeamFactory.h"
+#include "IWater.h"
#include "ResourceBuffer.h"
#include "RoRFrameListener.h"
-#include "water.h"
using namespace Ogre;
Modified: trunk/source/main/physics/Beam.cpp
===================================================================
--- trunk/source/main/physics/Beam.cpp 2012-05-22 05:18:56 UTC (rev 2626)
+++ trunk/source/main/physics/Beam.cpp 2012-05-22 08:08:07 UTC (rev 2627)
@@ -42,6 +42,7 @@
#include "FlexObj.h"
#include "heightfinder.h"
#include "InputEngine.h"
+#include "IWater.h"
#include "language.h"
#include "MeshObject.h"
#include "MovableText.h"
@@ -58,7 +59,6 @@
#include "SoundScriptManager.h"
#include "turbojet.h"
#include "turboprop.h"
-#include "water.h"
// some gcc fixes
#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
Modified: trunk/source/main/physics/BeamForcesEuler.cpp
===================================================================
--- trunk/source/main/physics/BeamForcesEuler.cpp 2012-05-22 05:18:56 UTC
(rev 2626)
+++ trunk/source/main/physics/BeamForcesEuler.cpp 2012-05-22 08:08:07 UTC
(rev 2627)
@@ -31,10 +31,10 @@
#include "Differentials.h"
#include "FlexAirfoil.h"
#include "InputEngine.h"
+#include "IWater.h"
#include "Replay.h"
#include "screwprop.h"
#include "SoundScriptManager.h"
-#include "water.h"
extern float mrtime;
Modified: trunk/source/main/physics/water/buoyance.cpp
===================================================================
--- trunk/source/main/physics/water/buoyance.cpp 2012-05-22 05:18:56 UTC
(rev 2626)
+++ trunk/source/main/physics/water/buoyance.cpp 2012-05-22 08:08:07 UTC
(rev 2627)
@@ -21,7 +21,7 @@
#include "BeamData.h"
#include "DustManager.h"
-#include "water.h"
+#include "IWater.h"
Buoyance::Buoyance(Water *water)
{
Modified: trunk/source/main/physics/water/screwprop.cpp
===================================================================
--- trunk/source/main/physics/water/screwprop.cpp 2012-05-22 05:18:56 UTC
(rev 2626)
+++ trunk/source/main/physics/water/screwprop.cpp 2012-05-22 08:08:07 UTC
(rev 2627)
@@ -21,8 +21,8 @@
#include "BeamData.h"
#include "DustManager.h"
+#include "IWater.h"
#include "SoundScriptManager.h"
-#include "water.h"
Screwprop::Screwprop(node_t *nodes, int noderef, int nodeback, int nodeup,
float fullpower, Water* water, int trucknum) :
nodes(nodes)
Modified: trunk/source/main/scripting/GameScript.cpp
===================================================================
--- trunk/source/main/scripting/GameScript.cpp 2012-05-22 05:18:56 UTC (rev
2626)
+++ trunk/source/main/scripting/GameScript.cpp 2012-05-22 08:08:07 UTC (rev
2627)
@@ -43,15 +43,15 @@
#include "Character.h"
#include "Console.h"
#include "heightfinder.h"
+#include "IWater.h"
+#include "language.h"
+#include "network.h"
#include "RoRFrameListener.h"
#include "RoRVersion.h"
#include "SelectorWindow.h"
#include "Settings.h"
#include "SkyManager.h"
-#include "language.h"
-#include "network.h"
#include "utils.h"
-#include "water.h"
using namespace Ogre;
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
