Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 823 vs 824 for /trunk/Source Code/Rendering/Camera/Camera.cpp

Diff revisions: vs.
  @@ -41,24 +41,37 @@
41 41 void Camera::fromCamera(Camera& camera) {
42 42 camera.updateLookAt();
43 43
44 + setMoveSpeedFactor(camera.getMoveSpeedFactor());
45 + setTurnSpeedFactor(camera.getTurnSpeedFactor());
46 + setZoomSpeedFactor(camera.getZoomSpeedFactor());
47 + setFixedYawAxis(camera._yawFixed, camera._fixedYawAxis);
48 + lockMovement(camera._movementLocked);
49 + lockRotation(camera._rotationLocked);
50 + _mouseSensitivity = camera._mouseSensitivity;
51 + _cameraMoveSpeed = camera._cameraMoveSpeed;
52 + _cameraTurnSpeed = camera._cameraTurnSpeed;
53 + _cameraZoomSpeed = camera._cameraZoomSpeed;
54 +
55 + lockView(camera._viewMatrixLocked);
56 + lockFrustum(camera._frustumLocked);
57 + _accumPitchDegrees = camera._accumPitchDegrees;
58 +
44 59 if (camera._isOrthoCamera) {
60 + setAspectRatio(camera.getAspectRatio());
61 + setVerticalFoV(camera.getVerticalFoV());
62 +
45 63 setProjection(camera._orthoRect,
46 64 camera.getZPlanes());
47 65 } else {
66 + _orthoRect.set(camera._orthoRect);
67 +
48 68 setProjection(camera.getAspectRatio(),
49 69 camera.getVerticalFoV(),
50 70 camera.getZPlanes());
51 71 }
52 72
53 - lookAt(camera.getEye(), camera.getTarget(), camera.getUpDir());
54 - setMoveSpeedFactor(camera.getMoveSpeedFactor());
55 - setTurnSpeedFactor(camera.getTurnSpeedFactor());
56 - setZoomSpeedFactor(camera.getZoomSpeedFactor());
57 - setFixedYawAxis(camera._yawFixed, camera._fixedYawAxis);
58 - lockView(camera._viewMatrixLocked);
59 - lockFrustum(camera._frustumLocked);
60 -
61 - _accumPitchDegrees = camera._accumPitchDegrees;
73 + setEye(camera.getEye());
74 + setRotation(camera._orientation);
62 75 }
63 76
64 77 void Camera::updateInternal(const U64 deltaTime) {