Merge pull request #24 from pjanck/transitionDuration

allowed for the duration of the camera transition to be specified
tumcms · Feb 20, 2021 · 9e89e5e · 9e89e5e
2 parents ca91e7f + 8fe4470
commit 9e89e5e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/Engine/src/BlueFramework/Engine/Camera/Camera.cpp b/Engine/src/BlueFramework/Engine/Camera/Camera.cpp
@@ -506,10 +506,14 @@ void CameraController::tick(const float delta) {
 }
 
 void CameraController::setViewDirection(const buw::Vector3f &dir) {
+ setViewDirection(dir, 0.5f);
+}
+
+void CameraController::setViewDirection(const buw::Vector3f &dir, const float duration) {
  auto target = camera_->transformation();
  target.setViewDirection(dir);
 
- startInterpolation(0.5f, target);
+ startInterpolation(duration, target);
 }
 
 buw::Vector3f CameraController::getViewDirectionVector(const buw::eViewDirection &direction) {
@@ -521,20 +525,20 @@ buw::Vector3f CameraController::getViewDirectionVector(const buw::eViewDirection
 }
 
 
-void CameraController::fitToView(const buw::Vector3f &min, const buw::Vector3f &max) {
+void CameraController::fitToView(const buw::Vector3f &min, const buw::Vector3f &max, const float duration /*= 1.0f*/) {
  CameraTransformation target = camera_->transformation();
  target.fitToView(min, max, camera_->frustum().fieldOfView());
 
  state_ = eState::Orbiting;
- startInterpolation(1, target);
+ startInterpolation(duration, target);
 }
 
-void CameraController::lookAt(const buw::Vector3f &target, const buw::Vector3f &origin) {
+void CameraController::lookAt(const buw::Vector3f &target, const buw::Vector3f &origin, const float duration /*= 1.0f*/) {
  CameraTransformation targetTransformation = camera_->transformation();
  targetTransformation.lookAt(target, origin);
 
  state_ = eState::Orbiting;
- startInterpolation(1, targetTransformation);
+ startInterpolation(duration, targetTransformation);
 }
 
 void CameraController::startInterpolation(float duration, const CameraTransformation &target) {
@@ -587,4 +591,4 @@ const bool CameraController::isCameraMoving() const {
  return camera_->velocity().length() > 0.0f;
 }
 
-BLUEFRAMEWORK_ENGINE_NAMESPACE_END
+BLUEFRAMEWORK_ENGINE_NAMESPACE_END
diff --git a/Engine/src/BlueFramework/Engine/Camera/Camera.h b/Engine/src/BlueFramework/Engine/Camera/Camera.h
@@ -217,9 +217,10 @@ class CameraController {
  void tick(const float delta);
 
  void setViewDirection(const buw::Vector3f &dir);
+ void setViewDirection(const buw::Vector3f &dir, const float duration);
 
- void fitToView(const buw::Vector3f &min, const buw::Vector3f &max);
- void lookAt(const buw::Vector3f &target, const buw::Vector3f &origin);
+ void fitToView(const buw::Vector3f &min, const buw::Vector3f &max, const float duration = 1.0f);
+ void lookAt(const buw::Vector3f &target, const buw::Vector3f &origin, const float duration = 1.0f);
 
  void handleKeyDown(eKey key);
  void handleKeyUp(eKey key);