X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FSkybox.h;h=5619a2a851cdbfc741cd658358341ea0a7ca4e64;hb=3455f3a84eef6a73f39a4267da445c7998c3515e;hp=77e0b3797dd853bfe8d7e2b38c3534dfd33337a2;hpb=24004d6ab1e68faaf85ece11b566449997da5013;p=lugaru.git diff --git a/Source/Skybox.h b/Source/Skybox.h index 77e0b37..5619a2a 100644 --- a/Source/Skybox.h +++ b/Source/Skybox.h @@ -1,29 +1,28 @@ /* Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. -Lugaru 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. +Lugaru 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, +Lugaru 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. +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. +along with Lugaru. If not, see . */ #ifndef _SKYBOX_H_ #define _SKYBOX_H_ #include "Quaternions.h" -#include "TGALoader.h" +#include "ImageIO.h" #include "Quaternions.h" #include "gamegl.h" #include "Texture.h" @@ -33,8 +32,8 @@ class SkyBox public: Texture front, left, back, right, up, down; - void load(const char *ffront, const char *fleft, const char *fback, - const char *fright, const char *fup, const char *fdown); + void load(const std::string& ffront, const std::string& fleft, const std::string& fback, + const std::string& fright, const std::string& fup, const std::string& fdown); void draw(); SkyBox() {}