Revision: 2471
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2471&view=rev
Author: rorthomas
Date: 2012-03-16 09:35:24 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
character chase camera by default
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gfx/camera/CameraBehaviorFree.cpp
trunk/source/main/gfx/camera/CameraManager.cpp
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-03-16 06:46:40 UTC
(rev 2470)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-03-16 09:35:24 UTC
(rev 2471)
@@ -762,7 +762,6 @@
freeTruckPosition=false;
mCamera = cam;
- new CameraManager(scm, mCamera);
terrainHasTruckShop=false;
@@ -791,7 +790,10 @@
new Console();
#endif //USE_MYGUI
+ // init cameramanager after mygui
+ new CameraManager(scm, mCamera);
+
#ifdef USE_OIS_G27
leds=0;
#endif // USE_OIS_G27
Modified: trunk/source/main/gfx/camera/CameraBehaviorFree.cpp
===================================================================
--- trunk/source/main/gfx/camera/CameraBehaviorFree.cpp 2012-03-16 06:46:40 UTC
(rev 2470)
+++ trunk/source/main/gfx/camera/CameraBehaviorFree.cpp 2012-03-16 09:35:24 UTC
(rev 2471)
@@ -34,6 +34,8 @@
DOFManager *dof = CameraManager::getSingleton().getDOFManager();
if(dof) dof->setFocusMode(DOFManager::Auto);
+ ctx.cam->setFixedYawAxis(true, Vector3::UNIT_Y);
+
LOG("entering free camera mode");
CONSOLE_PUTMESSAGE(Console::CONSOLE_MSGTYPE_INFO,
Console::CONSOLE_SYSTEM_NOTICE, _L("free camera"), "camera_go.png", 3000,
false);
Modified: trunk/source/main/gfx/camera/CameraManager.cpp
===================================================================
--- trunk/source/main/gfx/camera/CameraManager.cpp 2012-03-16 06:46:40 UTC
(rev 2470)
+++ trunk/source/main/gfx/camera/CameraManager.cpp 2012-03-16 09:35:24 UTC
(rev 2471)
@@ -72,7 +72,7 @@
ctx.cam = mCamera;
- switchBehavior(CAMBEHAVIOR_FREE);
+ switchBehavior(CAMBEHAVIOR_CHARACTER_ORBIT);
}
CameraManager::~CameraManager()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
