reformatting

[chaz/yoink] / src / Moof / Camera.cc

diff --git a/src/Moof/Camera.cc b/src/Moof/Camera.cc
index 8f313b7aaf7d83b15ee8a97dc8ec12562c8c40e3..d7f1fe2d34c20752aa2667c9e8723c0472ee7ca7 100644 (file)
--- a/src/Moof/Camera.cc
+++ b/src/Moof/Camera.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include "Camera.hh"
 #include "OpenGL.hh"
@@ -46,8 +29,9 @@ void Camera::setRotation(const Quaternion& rotation)
 void Camera::lookAt(const Vector3& point)
 {
        // FIXME this doesn't work as expected
-       cml::quaternion_rotation_aim_at(mState.orientation, mState.position, point,
-                       Vector3(0.0, 1.0, 0.0));
+       cml::quaternion_rotation_aim_at(mState.orientation,
+                                                                       mState.position, point,
+                                                                       Vector3(0.0, 1.0, 0.0));
 }
 
 
@@ -57,10 +41,10 @@ void Camera::setProjection(const Matrix4& projection)
 }
 
 void Camera::setProjection(Scalar fovy, Scalar aspect, Scalar abutting,
-               Scalar distant)
+                                                  Scalar distant)
 {
        cml::matrix_perspective_yfov_RH(mProjection, fovy, aspect, abutting,
-                       distant, cml::z_clip_neg_one);
+                                                                       distant, cml::z_clip_neg_one);
 }
 
 
@@ -166,5 +150,3 @@ void Camera::handleEvent(const Event& event)
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-