projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix all cases of not-optimal UV-coordinates
[supertux.git]
/
src
/
video
/
color.hpp
diff --git
a/src/video/color.hpp
b/src/video/color.hpp
index
1cc32eb
..
391c929
100644
(file)
--- a/
src/video/color.hpp
+++ b/
src/video/color.hpp
@@
-1,7
+1,7
@@
-// $Id
: main.cpp 3314 2006-04-12 12:36:29Z matzebraun
$
-//
+// $Id$
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,15
+12,16
@@
// 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.
// 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
// 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.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
+
#ifndef __COLOR_HPP__
#define __COLOR_HPP__
#include <vector>
#ifndef __COLOR_HPP__
#define __COLOR_HPP__
#include <vector>
+#include <assert.h>
#include "log.hpp"
class Color
#include "log.hpp"
class Color
@@
-38,6
+39,7
@@
public:
}
Color(const std::vector<float>& vals)
{
}
Color(const std::vector<float>& vals)
{
+ assert(vals.size() >= 3);
red = vals[0];
green = vals[1];
blue = vals[2];
red = vals[0];
green = vals[1];
blue = vals[2];
@@
-62,4
+64,3
@@
public:
};
#endif
};
#endif
-