summaryrefslogtreecommitdiffstats
path: root/Texture.cpp
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-12-15 19:37:12 +0100
committerMatthias Schiffer <matthias@gamezock.de>2009-12-15 19:37:12 +0100
commitd9f44af7aee41a111a3d7427d8735bc821f1824f (patch)
tree4814f3dea17eefac6a06d0c6af0da31d87488ff6 /Texture.cpp
parenta4fa46a4fda967348ea18961c177330491bdb953 (diff)
downloadzoom++-d9f44af7aee41a111a3d7427d8735bc821f1824f.tar
zoom++-d9f44af7aee41a111a3d7427d8735bc821f1824f.zip
Moved source files to src; sort triangles by texture.
Diffstat (limited to 'Texture.cpp')
-rw-r--r--Texture.cpp44
1 files changed, 0 insertions, 44 deletions
diff --git a/Texture.cpp b/Texture.cpp
deleted file mode 100644
index d5ec1f2..0000000
--- a/Texture.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Texture.cpp
- *
- * Copyright (C) 2009 Matthias Schiffer <matthias@gamezock.de>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "Texture.h"
-#include "gl.h"
-#include <GL/glpng.h>
-
-namespace Zoom {
-
-std::map<std::string, unsigned> Texture::textures;
-
-unsigned Texture::loadTexture(const std::string &name) {
- std::map<std::string, unsigned>::iterator it = textures.find(name);
-
- if(it != textures.end())
- return it->second;
-
- pngInfo info;
- unsigned texture = pngBind(("tex/" + name).c_str(), PNG_NOMIPMAP, PNG_ALPHA, &info, GL_REPEAT, GL_LINEAR, GL_LINEAR);
-
- if(texture) {
- textures.insert(std::make_pair(name, texture));
- }
-
- return texture;
-}
-
-}