From 8a598e713f504c88402ff204907044c0d62c5f29 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Mon, 12 Sep 2005 22:15:35 +0000 Subject: Added SDLImageLoader class to make guichan support physfs. --- src/resources/resourcemanager.cpp | 7 ---- src/resources/resourcemanager.h | 5 --- src/resources/sdlimageloader.cpp | 84 +++++++++++++++++++++++++++++++++++++++ src/resources/sdlimageloader.h | 37 +++++++++++++++++ 4 files changed, 121 insertions(+), 12 deletions(-) create mode 100644 src/resources/sdlimageloader.cpp create mode 100644 src/resources/sdlimageloader.h (limited to 'src/resources') diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 3567ac35..39b8dfff 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -113,13 +113,6 @@ bool ResourceManager::isDirectory(const std::string &path) return PHYSFS_isDirectory(path.c_str()); } -std::string ResourceManager::getRealPath(const std::string &path) -{ - const char *dirSep = PHYSFS_getDirSeparator(); - - return std::string(PHYSFS_getRealDir(path.c_str())) + dirSep + path; -} - Resource* ResourceManager::get(const E_RESOURCE_TYPE &type, const std::string &idPath) { diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index a5a01987..a11ea4cb 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -96,11 +96,6 @@ class ResourceManager */ bool isDirectory(const std::string &path); - /** - * Returns the real path to the given path in the PhysFS search path - */ - std::string getRealPath(const std::string &path); - /** * Creates a resource and adds it to the resource map. The idPath is * converted into the appropriate path for the current operating system diff --git a/src/resources/sdlimageloader.cpp b/src/resources/sdlimageloader.cpp new file mode 100644 index 00000000..42bbf1ca --- /dev/null +++ b/src/resources/sdlimageloader.cpp @@ -0,0 +1,84 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World 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 + * any later version. + * + * The Mana World 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 The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + */ + +#include "sdlimageloader.h" + +#include +#include +#include + +#include + +#include "resourcemanager.h" + +void SDLImageLoader::prepare(const std::string &filename) +{ + if (mCurrentImage) + { + throw GCN_EXCEPTION("Function called before finalizing or discarding last loaded image."); + } + + ResourceManager *resman = ResourceManager::getInstance(); + + int fileSize; + void *buffer = resman->loadFile(filename, fileSize); + + SDL_Surface *tmp = NULL; + if (buffer) { + SDL_RWops *rw = SDL_RWFromMem(buffer, fileSize); + tmp = IMG_Load_RW(rw, 1); + ::free(buffer); + } + + if (!tmp) + { + throw GCN_EXCEPTION(std::string("Unable to load image file: ")+filename); + } + + Uint32 rmask, gmask, bmask, amask; +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + rmask = 0xff000000; + gmask = 0x00ff0000; + bmask = 0x0000ff00; + amask = 0x000000ff; +#else + rmask = 0x000000ff; + gmask = 0x0000ff00; + bmask = 0x00ff0000; + amask = 0xff000000; +#endif + + mCurrentImage = SDL_CreateRGBSurface(SDL_SWSURFACE, 0, 0, 32, + rmask, gmask, bmask, amask); + + if (!mCurrentImage) + { + throw GCN_EXCEPTION(std::string("Not enough memory to load: ")+filename); + } + + SDL_Surface* tmp2 = SDL_ConvertSurface(tmp, mCurrentImage->format, SDL_SWSURFACE); + SDL_FreeSurface(tmp); + SDL_FreeSurface(mCurrentImage); + + mCurrentImage = tmp2; +} diff --git a/src/resources/sdlimageloader.h b/src/resources/sdlimageloader.h new file mode 100644 index 00000000..b34b98fe --- /dev/null +++ b/src/resources/sdlimageloader.h @@ -0,0 +1,37 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World 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 + * any later version. + * + * The Mana World 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 The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + */ + +#ifndef _TMW_SDLIMAGELOADER_H +#define _TMW_SDLIMAGELOADER_H + +#include + +#include + +class SDLImageLoader : public gcn::SDLImageLoader +{ + public: + void prepare(const std::string &filename); +}; + +#endif -- cgit v1.2.3-70-g09d2