Revision: 2748
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2748&view=rev
Author: ulteq
Date: 2012-05-28 20:47:34 +0000 (Mon, 28 May 2012)
Log Message:
-----------
re-added garage camera (forcecam)
Modified Paths:
--------------
trunk/source/main/gfx/camera/CameraBehavior.cpp
trunk/source/main/gfx/camera/CameraBehaviorVehicle.cpp
Modified: trunk/source/main/gfx/camera/CameraBehavior.cpp
===================================================================
--- trunk/source/main/gfx/camera/CameraBehavior.cpp 2012-05-28 20:20:25 UTC
(rev 2747)
+++ trunk/source/main/gfx/camera/CameraBehavior.cpp 2012-05-28 20:47:34 UTC
(rev 2748)
@@ -20,8 +20,9 @@
#include "CameraBehavior.h"
#include "Beam.h"
+#include "Collisions.h"
+#include "IHeightFinder.h"
#include "InputEngine.h"
-#include "IHeightFinder.h"
#include "Ogre.h"
#include "TerrainManager.h"
@@ -123,7 +124,15 @@
Vector3 camPosition = (1.0f / (camRatio + 1.0f)) * desiredPosition +
(camRatio / (camRatio + 1.0f)) * precedingPosition;
- gEnv->mainCamera->setPosition(camPosition);
+ if ( gEnv->collisions && gEnv->collisions->forcecam )
+ {
+ gEnv->mainCamera->setPosition(gEnv->collisions->forcecampos);
+ gEnv->collisions->forcecam = false;
+ } else
+ {
+ gEnv->mainCamera->setPosition(camPosition);
+ }
+
gEnv->mainCamera->lookAt(camLookAt);
}
Modified: trunk/source/main/gfx/camera/CameraBehaviorVehicle.cpp
===================================================================
--- trunk/source/main/gfx/camera/CameraBehaviorVehicle.cpp 2012-05-28
20:20:25 UTC (rev 2747)
+++ trunk/source/main/gfx/camera/CameraBehaviorVehicle.cpp 2012-05-28
20:47:34 UTC (rev 2748)
@@ -73,5 +73,5 @@
CameraBehaviorOrbit::reset(ctx);
camRotY = 0.35f;
camDistMin = std::min(ctx.mCurrTruck->getMinimalCameraRadius() * 2.0f,
33.0f);
- camDist = ctx.mCurrTruck->getMinimalCameraRadius() * 1.5f + 2.0f;
+ camDist = camDistMin * 1.5f + 2.0f;
}
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
