From 699da2fb0d9012cef5e45cc1b547a01fd92dbc1c Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 2 Jan 2013 01:55:30 +0000 Subject: Yet another big style clean-up patch by Bastien Montagne, thanks a lot! Now the code style is acceptable for the merge now, according to Bastien. Thanks again Bastien for having this done! :) --- .../blender/freestyle/intern/view_map/ViewMapIO.h | 233 +++++++++++---------- 1 file changed, 123 insertions(+), 110 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/ViewMapIO.h') diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h index 185841a90ec..44521f03317 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h @@ -1,116 +1,129 @@ -// -// Filename : ViewMapIO.h -// Author(s) : Emmanuel Turquin -// Purpose : Functions to manage I/O for the view map -// Date of creation : 09/01/2003 -// -/////////////////////////////////////////////////////////////////////////////// - - -// -// Copyright (C) : Please refer to the COPYRIGHT file distributed -// with this source distribution. -// -// This program 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. -// -// This program 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 this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef VIEWMAPIO_H -# define VIEWMAPIO_H - -# include "ViewMap.h" -# include -# include -# include "../system/FreestyleConfig.h" -# include "../system/ProgressBar.h" +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program 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. + * + * This program 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 this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2010 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef __FREESTYLE_VIEW_MAP_IO_H__ +#define __FREESTYLE_VIEW_MAP_IO_H__ + +/** \file blender/freestyle/intern/view_map/ViewMapIO.h + * \ingroup freestyle + * \brief Functions to manage I/O for the view map + * \author Emmanuel Turquin + * \date 09/01/2003 + */ + +#include +#include + +#include "ViewMap.h" + +#include "../system/FreestyleConfig.h" +#include "../system/ProgressBar.h" namespace ViewMapIO { - static const unsigned ZERO = UINT_MAX; - - LIB_VIEW_MAP_EXPORT - int load(istream& in, ViewMap* vm, ProgressBar* pb = NULL); - - LIB_VIEW_MAP_EXPORT - int save(ostream& out, ViewMap* vm, ProgressBar* pb = NULL); - - namespace Options { - - static const unsigned char FLOAT_VECTORS = 1; - static const unsigned char NO_OCCLUDERS = 2; - - LIB_VIEW_MAP_EXPORT - void setFlags(const unsigned char flags); - - LIB_VIEW_MAP_EXPORT - void addFlags(const unsigned char flags); - - LIB_VIEW_MAP_EXPORT - void rmFlags(const unsigned char flags); - - LIB_VIEW_MAP_EXPORT - unsigned char getFlags(); - - LIB_VIEW_MAP_EXPORT - void setModelsPath(const string& path); - - LIB_VIEW_MAP_EXPORT - string getModelsPath(); - - }; // End of namepace Options - -# ifdef IRIX - - namespace Internal { - - template - ostream& write(ostream& out, const char* str) { - out.put(str[S - 1]); - return write(out, str); - } - - template<> - ostream& write<1>(ostream& out, const char* str) { - return out.put(str[0]); - } - - template<> - ostream& write<0>(ostream& out, const char*) { - return out; - } - - template - istream& read(istream& in, char* str) { - in.get(str[S - 1]); - return read(in, str); - } - - template<> - istream& read<1>(istream& in, char* str) { - return in.get(str[0]); - } - - template<> - istream& read<0>(istream& in, char*) { - return in; - } - - } // End of namespace Internal - -# endif // IRIX +static const unsigned ZERO = UINT_MAX; + +LIB_VIEW_MAP_EXPORT +int load(istream& in, ViewMap *vm, ProgressBar *pb = NULL); + +LIB_VIEW_MAP_EXPORT +int save(ostream& out, ViewMap *vm, ProgressBar *pb = NULL); + +namespace Options { + +static const unsigned char FLOAT_VECTORS = 1; +static const unsigned char NO_OCCLUDERS = 2; + +LIB_VIEW_MAP_EXPORT +void setFlags(const unsigned char flags); + +LIB_VIEW_MAP_EXPORT +void addFlags(const unsigned char flags); + +LIB_VIEW_MAP_EXPORT +void rmFlags(const unsigned char flags); + +LIB_VIEW_MAP_EXPORT +unsigned char getFlags(); + +LIB_VIEW_MAP_EXPORT +void setModelsPath(const string& path); + +LIB_VIEW_MAP_EXPORT +string getModelsPath(); + +}; // End of namepace Options + +#ifdef IRIX + +namespace Internal { + +template +ostream& write(ostream& out, const char *str) +{ + out.put(str[S - 1]); + return write(out, str); +} + +template<> +ostream& write<1>(ostream& out, const char *str) +{ + return out.put(str[0]); +} + +template<> +ostream& write<0>(ostream& out, const char*) +{ + return out; +} + +template +istream& read(istream& in, char *str) +{ + in.get(str[S - 1]); + return read(in, str); +} + +template<> +istream& read<1>(istream& in, char *str) +{ + return in.get(str[0]); +} + +template<> +istream& read<0>(istream& in, char*) +{ + return in; +} + +} // End of namespace Internal + +#endif // IRIX } // End of namespace ViewMapIO -#endif // VIEWMAPIO_H +#endif // __FREESTYLE_VIEW_MAP_IO_H__ -- cgit v1.2.3