reformatting

[chaz/yoink] / src / Moof / Texture.hh

diff --git a/src/Moof/Texture.hh b/src/Moof/Texture.hh
index 41add2bca92638f135dc1b58abea615cb32f3d72..27ec414369c8bdb2493c30f25c1563fbaa4479db 100644 (file)
--- a/src/Moof/Texture.hh
+++ b/src/Moof/Texture.hh
@@ -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.
+*
+**************************************************************************/

 
 #ifndef _MOOF_TEXTURE_HH_
 #define _MOOF_TEXTURE_HH_
 
 #ifndef _MOOF_TEXTURE_HH_
 #define _MOOF_TEXTURE_HH_


@@ -34,6 +17,8 @@
  * Image-loading and OpenGL texture loading.
  */
 
  * Image-loading and OpenGL texture loading.
  */
 

+#include <string>
+

 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Image.hh>
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Image.hh>


@@ -86,14 +71,16 @@ public:
 
 
        /**
 
 
        /**

-        * Calculate texture coordinates for a tile at a certain index.  Tiles are
-        * indexed start with zero as the to-left tile and moving across, then down.
+        * Calculate texture coordinates for a tile at a certain index.  Tiles
+        * are indexed start with zero as the to-left tile and moving across,
+        * then down.

         * @param index The tile index.
         * @param index The tile index.

-        * @param coords An array of scalars where the texture coordinates will be
-        * stored after this call.  The first coordinate (u,v) will be in the first
-        * two places and so on until all four coordinates are stored, therefore
-        * requiring enough room for an array of eight scalars.  The winding of the
-        * coordinates is always counter-clockwise (the GL default).
+        * @param coords An array of scalars where the texture coordinates will
+        * be stored after this call.  The first coordinate (u,v) will be in
+        * the first two places and so on until all four coordinates are
+        * stored, therefore requiring enough room for an array of eight
+        * scalars.  The winding of the coordinates is always counter-clockwise
+        * (the GL default).

         * @return True if index is valid, false otherwise.
         */
 
         * @return True if index is valid, false otherwise.
         */
 


@@ -101,14 +88,16 @@ public:
 
 
        /**
 
 
        /**

-        * This version let's you specify an orientation that will be reflected in
-        * the texture coordinates.  This allows you to easily map a texture
+        * This version let's you specify an orientation that will be reflected
+        * in the texture coordinates.  This allows you to easily map a texture

         * backwards or upside-down.
         * backwards or upside-down.

-        * @param what The orientation; can be flip, reverse, or flip_and_reverse.
+        * @param what The orientation; can be flip, reverse, or
+        * flip_and_reverse.

         * @return True if index is valid, false otherwise.
         */
 
         * @return True if index is valid, false otherwise.
         */
 

-       bool getTileCoords(TileIndex index, Scalar coords[8], Orientation what) const;
+       bool getTileCoords(TileIndex index, Scalar coords[8],
+                                          Orientation what) const;

 
 
        static std::string getPath(const std::string& name);
 
 
        static std::string getPath(const std::string& name);


@@ -124,5 +113,3 @@ private:
 
 #endif // _MOOF_TEXTURE_HH_
 
 
 #endif // _MOOF_TEXTURE_HH_
 

-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-