From d9f44af7aee41a111a3d7427d8735bc821f1824f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 15 Dec 2009 19:37:12 +0100 Subject: Moved source files to src; sort triangles by texture. --- Texture.cpp | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 Texture.cpp (limited to 'Texture.cpp') 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 - * - * 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 . - */ - -#include "Texture.h" -#include "gl.h" -#include - -namespace Zoom { - -std::map Texture::textures; - -unsigned Texture::loadTexture(const std::string &name) { - std::map::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; -} - -} -- cgit v1.2.3