X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Ftexturelib.h;h=d9da1e89dfb4c49d837d9fcbdf4b06013b0d2401;hb=refs%2Fheads%2FTimePath%2Fdevelop;hp=8b44597ea41616ca2bf99d2a32d9a1bbd3d80ce2;hpb=bfc8a12a6b315ae261101a34db8ba1b682c67bb7;p=xonotic%2Fnetradiant.git diff --git a/libs/texturelib.h b/libs/texturelib.h index 8b44597e..d9da1e89 100644 --- a/libs/texturelib.h +++ b/libs/texturelib.h @@ -1,25 +1,25 @@ /* -Copyright (C) 2001-2006, William Joseph. -All Rights Reserved. + Copyright (C) 2001-2006, William Joseph. + All Rights Reserved. -This file is part of GtkRadiant. + This file is part of GtkRadiant. -GtkRadiant is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -GtkRadiant is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GtkRadiant; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ -#if !defined (INCLUDED_TEXTURELIB_H) +#if !defined ( INCLUDED_TEXTURELIB_H ) #define INCLUDED_TEXTURELIB_H #include "generic/vector.h" @@ -30,15 +30,14 @@ class LoadImageCallback; // describes a GL texture struct qtexture_t { - qtexture_t(const LoadImageCallback& load, const char* name) : load(load), name(name) - { - } - const LoadImageCallback& load; - const char* name; - std::size_t width, height; - GLuint texture_number; // gl bind number - Colour3 color; // for flat shade mode - int surfaceFlags, contentFlags, value; + qtexture_t( const LoadImageCallback& load, const char* name ) : load( load ), name( name ){ + } + const LoadImageCallback& load; + const char* name; + std::size_t width, height; + GLuint texture_number; // gl bind number + Colour3 color; // for flat shade mode + int surfaceFlags, contentFlags, value; }; #endif