Revision: 2597
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2597&view=rev
Author: ulteq
Date: 2012-05-19 14:32:22 +0000 (Sat, 19 May 2012)
Log Message:
-----------
style++
Modified Paths:
--------------
trunk/source/main/gfx/camera/CameraBehaviorStatic.cpp
trunk/source/main/gfx/dof/DepthOfFieldEffect.cpp
trunk/source/main/gui/MapControl.cpp
trunk/source/main/gui/MapTextureCreator.cpp
trunk/source/main/gui/MapTextureCreator.h
trunk/source/main/gui/TextureToolWindow.cpp
trunk/source/main/gui/TruckHUD.cpp
trunk/source/main/gui/TruckHUD.h
Modified: trunk/source/main/gfx/camera/CameraBehaviorStatic.cpp
===================================================================
--- trunk/source/main/gfx/camera/CameraBehaviorStatic.cpp 2012-05-19
13:17:12 UTC (rev 2596)
+++ trunk/source/main/gfx/camera/CameraBehaviorStatic.cpp 2012-05-19
14:32:22 UTC (rev 2597)
@@ -21,10 +21,8 @@
#include "Beam.h"
#include "Character.h"
-#include "Console.h"
#include "DepthOfFieldEffect.h"
#include "heightfinder.h"
-#include "language.h"
#include "Ogre.h"
using namespace Ogre;
Modified: trunk/source/main/gfx/dof/DepthOfFieldEffect.cpp
===================================================================
--- trunk/source/main/gfx/dof/DepthOfFieldEffect.cpp 2012-05-19 13:17:12 UTC
(rev 2596)
+++ trunk/source/main/gfx/dof/DepthOfFieldEffect.cpp 2012-05-19 14:32:22 UTC
(rev 2597)
@@ -23,11 +23,9 @@
// This code is in the public domain. You may do whatever you want with it.
#include "DepthOfFieldEffect.h"
-#include <Ogre.h>
-#include "Lens.h"
-#include "RoRPrerequisites.h"
-
+#include "Lens.h"
+#include "Ogre.h"
#include "Settings.h"
using namespace Ogre;
@@ -35,20 +33,20 @@
const int DepthOfFieldEffect::BLUR_DIVISOR = 2;
DepthOfFieldEffect::DepthOfFieldEffect(Ogre::Viewport *v, Ogre::Camera *cam) :
- mNearDepth(10.0)
- , mFocalDepth(100.0)
- , mFarDepth(190.0)
+ mCamera(cam)
+ , mCompositor(NULL)
+ , mDepthTarget(NULL)
+ , mDepthTechnique(NULL)
+ , mDepthViewport(NULL)
, mFarBlurCutoff(1.0)
+ , mFarDepth(190.0)
+ , mFocalDepth(100.0)
+ , mNearDepth(10.0)
, mViewport(v)
- , mCamera(cam)
{
mWidth = mViewport->getActualWidth();
mHeight = mViewport->getActualHeight();
-
- mCompositor = NULL;
- mDepthTechnique = NULL;
- mDepthTarget = NULL;
- mDepthViewport = NULL;
+
mDepthTexture.setNull();
mDepthMaterial.setNull();
@@ -257,8 +255,7 @@
//mRaySceneQuery->setQueryMask(queryMask);
debugNode = 0;
- bool debug = BSETTING("DOFDebug", false);
- if(debug)
+ if (BSETTING("DOFDebug", false))
{
MaterialPtr material =
MaterialManager::getSingleton().getByName("DoF_DepthDebug");
material->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("DoF_Depth");
Modified: trunk/source/main/gui/MapControl.cpp
===================================================================
--- trunk/source/main/gui/MapControl.cpp 2012-05-19 13:17:12 UTC (rev
2596)
+++ trunk/source/main/gui/MapControl.cpp 2012-05-19 14:32:22 UTC (rev
2597)
@@ -27,10 +27,10 @@
using namespace Ogre;
MapControl::MapControl(int mapsizex, int mapsizez) :
- mapsizex(mapsizex)
+ h(100.0f)
+ , mAlpha(1.0f)
+ , mapsizex(mapsizex)
, mapsizez(mapsizez)
- , h(100.0f)
- , mAlpha(1.0f)
, rWinHeight(1)
, rWinWidth(1)
, w(100.0f)
Modified: trunk/source/main/gui/MapTextureCreator.cpp
===================================================================
--- trunk/source/main/gui/MapTextureCreator.cpp 2012-05-19 13:17:12 UTC (rev
2596)
+++ trunk/source/main/gui/MapTextureCreator.cpp 2012-05-19 14:32:22 UTC (rev
2597)
@@ -73,7 +73,7 @@
mCamera->setAspectRatio(1.0);
mCamera->setFixedYawAxis(false);
mCamera->setProjectionType(PT_ORTHOGRAPHIC);
- //mCamera->setFOVy(Radian(Math::HALF_PI));
+ mCamera->setFOVy(Radian(Math::HALF_PI));
return true;
}
Modified: trunk/source/main/gui/MapTextureCreator.h
===================================================================
--- trunk/source/main/gui/MapTextureCreator.h 2012-05-19 13:17:12 UTC (rev
2596)
+++ trunk/source/main/gui/MapTextureCreator.h 2012-05-19 14:32:22 UTC (rev
2597)
@@ -21,8 +21,9 @@
#define __MAP_TEXTURE_CREATOR_H_
#include "RoRPrerequisites.h"
-#include <Ogre.h>
+#include "Ogre.h"
+
class MapTextureCreator : public Ogre::RenderTargetListener
{
public:
@@ -40,7 +41,6 @@
void setFogVisible(bool value);
bool init();
- static int mCounter;
Ogre::Camera *mCamera;
Ogre::Camera *mMainCam;
Ogre::MaterialPtr mMaterial;
@@ -52,6 +52,7 @@
Ogre::Vector3 mCampos;
Ogre::Viewport *mViewport;
RoRFrameListener *mEfl;
+ static int mCounter;
};
#endif // __MAP_TEXTURE_CREATOR_H_
Modified: trunk/source/main/gui/TextureToolWindow.cpp
===================================================================
--- trunk/source/main/gui/TextureToolWindow.cpp 2012-05-19 13:17:12 UTC (rev
2596)
+++ trunk/source/main/gui/TextureToolWindow.cpp 2012-05-19 14:32:22 UTC (rev
2597)
@@ -23,7 +23,7 @@
#include "Console.h"
#include "Ogre.h"
-#include "Settings.h"
+//#include "Settings.h"
#include "language.h"
#include "utils.h"
Modified: trunk/source/main/gui/TruckHUD.cpp
===================================================================
--- trunk/source/main/gui/TruckHUD.cpp 2012-05-19 13:17:12 UTC (rev 2596)
+++ trunk/source/main/gui/TruckHUD.cpp 2012-05-19 14:32:22 UTC (rev 2597)
@@ -19,10 +19,12 @@
*/
#include "TruckHUD.h"
+#include "aeroengine.h"
+#include "Beam.h"
#include "BeamEngine.h"
#include "InputEngine.h"
#include "language.h"
-#include "turboprop.h"
+#include "Ogre.h"
#include "utils.h"
using namespace Ogre;
Modified: trunk/source/main/gui/TruckHUD.h
===================================================================
--- trunk/source/main/gui/TruckHUD.h 2012-05-19 13:17:12 UTC (rev 2596)
+++ trunk/source/main/gui/TruckHUD.h 2012-05-19 14:32:22 UTC (rev 2597)
@@ -17,11 +17,10 @@
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 __TRUCKHUD_H__
-#define __TRUCKHUD_H__
+#ifndef __TRUCKHUD_H_
+#define __TRUCKHUD_H_
#include "RoRPrerequisites.h"
-#include "Beam.h"
class TruckHUD
{
@@ -29,6 +28,7 @@
TruckHUD();
~TruckHUD();
+
bool update(float dt, Beam *truck, Ogre::SceneManager *sm,
Ogre::Camera* mCamera, Ogre::RenderWindow* mWindow, bool visible=true);
void show(bool value);
bool isVisible();
@@ -53,5 +53,4 @@
static const unsigned int COMMANDS_VISIBLE = 25;
};
-
-#endif
+#endif // __TRUCKHUD_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
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
