Revision: 2605
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2605&view=rev
Author: ulteq
Date: 2012-05-20 01:40:52 +0000 (Sun, 20 May 2012)
Log Message:
-----------
-Codechange: added methods
bool hasActiveCharacterBehavior()
bool hasActiveVehicleBehavior()
Modified Paths:
--------------
trunk/source/main/gfx/camera/CameraManager.cpp
trunk/source/main/gfx/camera/CameraManager.h
Modified: trunk/source/main/gfx/camera/CameraManager.cpp
===================================================================
--- trunk/source/main/gfx/camera/CameraManager.cpp 2012-05-19 23:02:13 UTC
(rev 2604)
+++ trunk/source/main/gfx/camera/CameraManager.cpp 2012-05-20 01:40:52 UTC
(rev 2605)
@@ -69,15 +69,49 @@
globalBehaviors.clear();
}
-void CameraManager::createGlobalBehaviors()
+void CameraManager::update(float dt)
{
- globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_CHARACTER, new CameraBehaviorCharacter()));
- globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_STATIC, new CameraBehaviorStatic()));
- globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_VEHICLE, new CameraBehaviorVehicle()));
- globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_VEHICLE_SPLINE, new
CameraBehaviorVehicleSpline()));
- globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_VEHICLE_CINECAM, new
CameraBehaviorVehicleCineCam()));
- globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_FREE, new CameraBehaviorFree()));
- globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_FIXED, new CameraBehaviorFixed()));
+ if ( dt == 0 ) return;
+
+ mTransScale = mTransSpeed * dt;
+ mRotScale = mRotateSpeed * dt;
+
+ ctx.mCurrTruck = BeamFactory::getSingleton().getCurrentTruck();
+ ctx.mDt = dt;
+ ctx.mHfinder = RoRFrameListener::hfinder;
+ ctx.mRotScale = Degree(mRotScale);
+ ctx.mTransScale = mTransScale;
+
+ if ( currentBehaviorID < CAMERA_BEHAVIOR_END &&
INPUTENGINE.getEventBoolValueBounce(EV_CAMERA_CHANGE) )
+ {
+ switchToNextBehavior();
+ }
+
+ if ( INPUTENGINE.getEventBoolValueBounce(EV_CAMERA_FREE_MODE_FIX) )
+ {
+ toggleBehavior(CAMERA_BEHAVIOR_FIXED);
+ }
+
+ if ( INPUTENGINE.getEventBoolValueBounce(EV_CAMERA_FREE_MODE) )
+ {
+ toggleBehavior(CAMERA_BEHAVIOR_FREE);
+ }
+
+ if ( !ctx.mCurrTruck && hasActiveVehicleBehavior() )
+ {
+ switchBehavior(CAMERA_BEHAVIOR_CHARACTER);
+ } else if ( ctx.mCurrTruck && hasActiveCharacterBehavior() )
+ {
+ switchBehavior(CAMERA_BEHAVIOR_VEHICLE);
+ }
+
+ if ( currentBehavior )
+ {
+ currentBehavior->update(ctx);
+ } else
+ {
+ switchBehavior(CAMERA_BEHAVIOR_CHARACTER);
+ }
}
void CameraManager::switchToNextBehavior()
@@ -136,49 +170,35 @@
}
}
-void CameraManager::update(float dt)
+bool CameraManager::hasActiveBehavior()
{
- if ( dt == 0 ) return;
+ return currentBehavior != 0;
+}
- mTransScale = mTransSpeed * dt;
- mRotScale = mRotateSpeed * dt;
+bool CameraManager::hasActiveCharacterBehavior()
+{
+ return dynamic_cast<CameraBehaviorCharacter*>(currentBehavior) != 0;
+}
- ctx.mCurrTruck = BeamFactory::getSingleton().getCurrentTruck();
- ctx.mDt = dt;
- ctx.mHfinder = RoRFrameListener::hfinder;
- ctx.mRotScale = Degree(mRotScale);
- ctx.mTransScale = mTransScale;
+bool CameraManager::hasActiveVehicleBehavior()
+{
+ return dynamic_cast<CameraBehaviorVehicle*>(currentBehavior) != 0;
+}
- if ( currentBehaviorID < CAMERA_BEHAVIOR_END &&
INPUTENGINE.getEventBoolValueBounce(EV_CAMERA_CHANGE) )
- {
- switchToNextBehavior();
- }
+int CameraManager::getCameraBehavior()
+{
+ return currentBehaviorID;
+}
- if ( INPUTENGINE.getEventBoolValueBounce(EV_CAMERA_FREE_MODE_FIX) )
- {
- toggleBehavior(CAMERA_BEHAVIOR_FIXED);
- }
-
- if ( INPUTENGINE.getEventBoolValueBounce(EV_CAMERA_FREE_MODE) )
- {
- toggleBehavior(CAMERA_BEHAVIOR_FREE);
- }
-
- if ( !ctx.mCurrTruck &&
dynamic_cast<CameraBehaviorVehicle*>(currentBehavior) )
- {
- switchBehavior(CAMERA_BEHAVIOR_CHARACTER);
- } else if ( ctx.mCurrTruck &&
dynamic_cast<CameraBehaviorCharacter*>(currentBehavior) )
- {
- switchBehavior(CAMERA_BEHAVIOR_VEHICLE);
- }
-
- if ( currentBehavior )
- {
- currentBehavior->update(ctx);
- } else
- {
- switchBehavior(CAMERA_BEHAVIOR_CHARACTER);
- }
+void CameraManager::createGlobalBehaviors()
+{
+ globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_CHARACTER, new CameraBehaviorCharacter()));
+ globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_STATIC, new CameraBehaviorStatic()));
+ globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_VEHICLE, new CameraBehaviorVehicle()));
+ globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_VEHICLE_SPLINE, new
CameraBehaviorVehicleSpline()));
+ globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_VEHICLE_CINECAM, new
CameraBehaviorVehicleCineCam()));
+ globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_FREE, new CameraBehaviorFree()));
+ globalBehaviors.insert(std::pair<int,
ICameraBehavior*>(CAMERA_BEHAVIOR_FIXED, new CameraBehaviorFixed()));
}
bool CameraManager::mouseMoved(const OIS::MouseEvent& _arg)
Modified: trunk/source/main/gfx/camera/CameraManager.h
===================================================================
--- trunk/source/main/gfx/camera/CameraManager.h 2012-05-19 23:02:13 UTC
(rev 2604)
+++ trunk/source/main/gfx/camera/CameraManager.h 2012-05-20 01:40:52 UTC
(rev 2605)
@@ -67,9 +67,12 @@
void switchToNextBehavior();
void toggleBehavior(int behavior);
- bool hasActiveBehavior() { return currentBehavior!=0; };
- int getCameraBehavior() { return currentBehaviorID; };
+ bool hasActiveBehavior();
+ bool hasActiveCharacterBehavior();
+ bool hasActiveVehicleBehavior();
+ int getCameraBehavior();
+
protected:
cameraContext_t ctx;
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
