Revision: 2559
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2559&view=rev
Author: ulteq
Date: 2012-05-14 14:29:24 +0000 (Mon, 14 May 2012)
Log Message:
-----------
-Fix: fixes the awful recently occurred menu lag
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-14 12:27:02 UTC
(rev 2558)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-14 14:29:24 UTC
(rev 2559)
@@ -2128,8 +2128,8 @@
if (loading_state==ALL_LOADED)
{
if (CameraManager::singletonExists() &&
- CameraManager::getSingleton().hasActiveBehavior() &&
- CameraManager::getSingleton().getCameraMode() !=
CameraManager::CAMERA_BEHAVIOR_FREE)
+ (!CameraManager::getSingleton().hasActiveBehavior() ||
+ CameraManager::getSingleton().getCameraMode() !=
CameraManager::CAMERA_BEHAVIOR_FREE))
{
if (!curr_truck)
{
@@ -2945,11 +2945,10 @@
if
(INPUTENGINE.getEventBoolValueBounce(EV_COMMON_SHOW_SKELETON))
{
if (curr_truck->skeleton)
- {
curr_truck->hideSkeleton(true);
- }
else
curr_truck->showSkeleton(true,
true);
+
curr_truck->updateVisual();
}
@@ -2994,11 +2993,6 @@
}//end of truck!=-1
}
-
- static unsigned char brushNum=0;
-
-
-
#ifdef USE_CAELUM
if (SSETTING("Sky effects", "Caelum (best looking, slower)") ==
"Caelum (best looking, slower)")
{
@@ -5133,11 +5127,6 @@
void RoRFrameListener::changedCurrentTruck(Beam *previousTruck, Beam
*currentTruck)
{
- if (!CameraManager::singletonExists() ||
- !CameraManager::getSingleton().hasActiveBehavior())
- {
- return;
- }
// hide any old dashes
if (previousTruck && previousTruck->dash)
previousTruck->dash->setVisible3d(false);
@@ -5181,7 +5170,7 @@
previousTruck->dash->setVisible(false);
// this workaround enables trucks to spawn that have no
cinecam. required for cmdline options
- if (previousTruck->cinecameranodepos[0] != -1)
+ if (previousTruck->cinecameranodepos[0] != -1 &&
previousTruck->cameranodepos[0] != -1 && previousTruck->cameranoderoll[0] != -1)
{
// truck has a cinecam
position=previousTruck->nodes[previousTruck->cinecameranodepos[0]].AbsPosition;
@@ -5392,8 +5381,10 @@
#endif // USE_MUMBLE
}
- if (CameraManager::singletonExists())
+ if (CameraManager::singletonExists() && loading_state == ALL_LOADED)
+ {
CameraManager::getSingleton().update(dt);
+ }
Beam *curr_truck = BeamFactory::getSingleton().getCurrentTruck();
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
