Changeset 3280 for code/trunk/src/orxonox/objects/worldentities/Camera.cc
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/Camera.cc
r3196 r3280 29 29 #include "Camera.h" 30 30 31 #include <algorithm> 31 32 #include <OgreCamera.h> 32 33 #include <OgreSceneManager.h> … … 34 35 35 36 #include "util/Exception.h" 36 #include "util/String .h"37 #include "util/StringUtils.h" 37 38 #include "core/CoreIncludes.h" 38 39 #include "core/ConfigValueIncludes.h" … … 104 105 { 105 106 // this stuff here may need some adjustments 106 float coeff = min(1.0f, 15.0f * dt);107 float coeff = std::min(1.0f, 15.0f * dt); 107 108 108 109 Vector3 offset = this->getWorldPosition() - this->cameraNode_->_getDerivedPosition();
Note: See TracChangeset
for help on using the changeset viewer.