Revision: 2567
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2567&view=rev
Author: ulteq
Date: 2012-05-14 20:59:22 +0000 (Mon, 14 May 2012)
Log Message:
-----------
moved render mode toggle to the correct place
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gfx/camera/CameraManager.cpp
trunk/source/main/gfx/camera/CameraManager.h
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-14 20:37:22 UTC
(rev 2566)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-14 20:59:22 UTC
(rev 2567)
@@ -2945,7 +2945,6 @@
curr_truck->toggleCustomParticles();
}
-
if
(INPUTENGINE.getEventBoolValueBounce(EV_COMMON_SHOW_SKELETON))
{
if (curr_truck->skeleton)
@@ -3037,8 +3036,26 @@
#endif // USE_MYGUI
}
}
-#endif //CAELUM
+#endif // USE_CAELUM
+ if
(INPUTENGINE.getEventBoolValueBounce(EV_COMMON_TOGGLE_RENDER_MODE, 0.5f))
+ {
+ static int mSceneDetailIndex;
+ mSceneDetailIndex = (mSceneDetailIndex + 1) % 3;
+ switch (mSceneDetailIndex)
+ {
+ case 0:
+ mCamera->setPolygonMode(Ogre::PM_SOLID);
+ break;
+ case 1:
+ mCamera->setPolygonMode(Ogre::PM_WIREFRAME);
+ break;
+ case 2:
+ mCamera->setPolygonMode(Ogre::PM_POINTS);
+ break;
+ }
+ }
+
#ifdef USE_MYGUI
if (INPUTENGINE.getEventBoolValueBounce(EV_COMMON_VIEW_MAP))
{
Modified: trunk/source/main/gfx/camera/CameraManager.cpp
===================================================================
--- trunk/source/main/gfx/camera/CameraManager.cpp 2012-05-14 20:37:22 UTC
(rev 2566)
+++ trunk/source/main/gfx/camera/CameraManager.cpp 2012-05-14 20:59:22 UTC
(rev 2567)
@@ -122,23 +122,6 @@
switchToNextBehavior();
}
- if ( INPUTENGINE.getEventBoolValueBounce(EV_COMMON_TOGGLE_RENDER_MODE,
0.5f) )
- {
- mSceneDetailIndex = (mSceneDetailIndex + 1) % 3 ;
- switch (mSceneDetailIndex)
- {
- case 0:
- ctx.mCamera->setPolygonMode(Ogre::PM_SOLID);
- break;
- case 1:
- ctx.mCamera->setPolygonMode(Ogre::PM_WIREFRAME);
- break;
- case 2:
- ctx.mCamera->setPolygonMode(Ogre::PM_POINTS);
- break;
- }
- }
-
ctx.mCurrTruck = BeamFactory::getSingleton().getCurrentTruck();
ctx.mDt = dt;
ctx.mRotScale = Degree(mRotScale);
Modified: trunk/source/main/gfx/camera/CameraManager.h
===================================================================
--- trunk/source/main/gfx/camera/CameraManager.h 2012-05-14 20:37:22 UTC
(rev 2566)
+++ trunk/source/main/gfx/camera/CameraManager.h 2012-05-14 20:59:22 UTC
(rev 2567)
@@ -70,8 +70,6 @@
cameraContext_t ctx;
- int mSceneDetailIndex;
-
float mTransScale, mTransSpeed;
float mRotScale, mRotateSpeed;
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
