Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 853 vs 867 for /trunk/Source Code/Rendering/Camera/Camera.cpp

Diff revisions: vs.
  @@ -198,7 +198,7 @@
198 198 _target.set(target);
199 199 _viewMatrix.lookAt(_eye, _target, up);
200 200 // Extract the pitch angle from the view matrix.
201 - _accumPitchDegrees = Angle::RadiansToDegrees(std::asinf(getForwardDir().y));
201 + _accumPitchDegrees = Angle::to_DEGREES(std::asinf(getForwardDir().y));
202 202 _orientation.fromLookAt(_eye - _target, up);
203 203
204 204 _viewMatrixDirty = false;
  @@ -236,7 +236,7 @@
236 236 _zPlanes.x,
237 237 _zPlanes.y);
238 238 } else {
239 - _projectionMatrix.perspective(Angle::DegreesToRadians(_verticalFoV),
239 + _projectionMatrix.perspective(Angle::to_RADIANS(_verticalFoV),
240 240 _aspectRatio,
241 241 _zPlanes.x,
242 242 _zPlanes.y);
  @@ -283,10 +283,7 @@
283 283 }
284 284
285 285 void Camera::setHorizontalFoV(F32 horizontalFoV) {
286 - _verticalFoV = Angle::RadiansToDegrees(
287 - 2.0f *
288 - std::atan(tan(Angle::DegreesToRadians(horizontalFoV) * 0.5f) /
289 - _aspectRatio));
286 + _verticalFoV = Angle::to_DEGREES(2.0f * std::atan(tan(Angle::to_RADIANS(horizontalFoV) * 0.5f) / _aspectRatio));
290 287 _projectionDirty = true;
291 288 }
292 289
  @@ -311,7 +308,8 @@
311 308 _viewMatrix.m[3][0] = -xAxis.dot(_eye);
312 309 _viewMatrix.m[3][1] = -yAxis.dot(_eye);
313 310 _viewMatrix.m[3][2] = -zAxis.dot(_eye);
314 - _orientation.getEuler(_euler, true);
311 + _orientation.getEuler(_euler);
312 + _euler = Angle::to_DEGREES(_euler);
315 313
316 314 _viewMatrixDirty = false;
317 315 _frustumDirty = true;