X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FScene.cc;h=7b23ab6431e7a88da48ae3a5fdd38fc7e41a6b3d;hp=45fc3a0ac9bc6f70397206fc49646546c1006614;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=81ff940d1bea07447f8218ab9a764fbf393431e8

diff --git a/src/Scene.cc b/src/Scene.cc
index 45fc3a0..7b23ab6 100644
--- a/src/Scene.cc
+++ b/src/Scene.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 <map>
 
@@ -314,7 +297,8 @@ struct Scene::Impl : public Mf::Manager<Impl>
 		Mf::Scalar value;
 		script[2].requireNumber().get(value);
 
-		cml::matrix_rotate_about_world_axis(mTransform, index, cml::rad(value));
+		cml::matrix_rotate_about_world_axis(mTransform,
+											index, cml::rad(value));
 
 		return 0;
 	}
@@ -339,15 +323,19 @@ struct Scene::Impl : public Mf::Manager<Impl>
 		script.pop();
 
 		nTiles = table.getLength();
-		if (nTiles % width != 0) table.throwError("invalid number of tiles");
+		if (nTiles % width != 0)
+		{
+			table.throwError("invalid number of tiles");
+		}
 
 		if (width == 0) table.throwError("width field must not be zero");
 		height = nTiles / width;
 
 		Mf::Vector3		vertices[height+1][width+1];
 
-		// the indices are stored upside-down in the scene file so that they are
-		// easier to edit as text, so we'll need to load them last row first
+		// the indices are stored upside-down in the scene file so that
+		// they are easier to edit as text, so we'll need to load them last
+		// row first
 
 		// do first row and first column of vertices
 
@@ -514,7 +502,8 @@ void Scene::draw(Mf::Scalar alpha) const
 	mImpl->mBounds.draw();
 }
 
-void Scene::drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const
+void Scene::drawIfVisible(Mf::Scalar alpha,
+						  const Mf::Frustum& frustum) const
 {
 	std::list< boost::shared_ptr<Impl::Quad> >& objects = mImpl->mObjects;
 	std::list< boost::shared_ptr<Impl::Quad> >::const_iterator it;
@@ -537,7 +526,7 @@ void Scene::drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const
 
 
 bool Scene::castRay(const Mf::Ray<2>& ray,
-		std::list<Mf::Ray<2>::Intersection>& hits) const
+					std::list<Mf::Ray<2>::Intersection>& hits) const
 {
 	std::list< Mf::Line<2> >& lines = mImpl->mLines;
 	std::list< Mf::Line<2> >::const_iterator it;
@@ -625,6 +614,3 @@ std::string Scene::getPath(const std::string& name)
 	return Mf::Resource::getPath("scenes/" + name + ".lua");
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-