reformatting

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

diff --git a/src/Moof/Frustum.cc b/src/Moof/Frustum.cc
index 1db6d253299b489bf46690a72c62b5476a3a1491..e56fb7bec94a1056433c91fc2c6c5b8fb980e66f 100644 (file)
--- a/src/Moof/Frustum.cc
+++ b/src/Moof/Frustum.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 <Moof/Aabb.hh>
 #include <Moof/Frustum.hh>
@@ -39,23 +22,29 @@ void Frustum::init(const Matrix4& modelview, const Matrix4& projection)
        Scalar planes[6][4];
 
        cml::extract_frustum_planes(modelview, projection, planes,
-                       cml::z_clip_neg_one);
-
-       mPlanes[0] = Plane(planes[0][0], planes[0][1], planes[0][2], planes[0][3]);
-       mPlanes[1] = Plane(planes[1][0], planes[1][1], planes[1][2], planes[1][3]);
-       mPlanes[2] = Plane(planes[2][0], planes[2][1], planes[2][2], planes[2][3]);
-       mPlanes[3] = Plane(planes[3][0], planes[3][1], planes[3][2], planes[3][3]);
-       mPlanes[4] = Plane(planes[4][0], planes[4][1], planes[4][2], planes[4][3]);
-       mPlanes[5] = Plane(planes[5][0], planes[5][1], planes[5][2], planes[5][3]);
+                                                               cml::z_clip_neg_one);
+
+       mPlanes[0] = Plane(planes[0][0], planes[0][1],
+                                          planes[0][2], planes[0][3]);
+       mPlanes[1] = Plane(planes[1][0], planes[1][1],
+                                          planes[1][2], planes[1][3]);
+       mPlanes[2] = Plane(planes[2][0], planes[2][1],
+                                          planes[2][2], planes[2][3]);
+       mPlanes[3] = Plane(planes[3][0], planes[3][1],
+                                          planes[3][2], planes[3][3]);
+       mPlanes[4] = Plane(planes[4][0], planes[4][1],
+                                          planes[4][2], planes[4][3]);
+       mPlanes[5] = Plane(planes[5][0], planes[5][1],
+                                          planes[5][2], planes[5][3]);
 }
 
 void Frustum::init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
-               Scalar abutting, Scalar distant)
+                                  Scalar abutting, Scalar distant)
 {
        Matrix4 projection;
 
-       cml::matrix_perspective_yfov_RH(projection, fovy, aspect, abutting, distant,
-                       cml::z_clip_neg_one);
+       cml::matrix_perspective_yfov_RH(projection, fovy, aspect, abutting,
+                                                                       distant, cml::z_clip_neg_one);
 
        init(modelview, projection);
 }
@@ -73,8 +62,7 @@ Frustum::Collision Frustum::contains(const Aabb<3>& aabb) const
 
                for (int j = 0; j < 8; ++j)
                {
-                       if (mPlanes[i].intersects(corners[j]) ==
-                                       Plane::NEGATIVE)
+                       if (mPlanes[i].intersects(corners[j]) == Plane::NEGATIVE)
                        {
                                --nInside;
                        }
@@ -105,5 +93,3 @@ Frustum::Collision Frustum::contains(const Sphere<3>& sphere) const
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-