X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTexture.cc;h=48e6e1b6193909766df411c85757ab6393201a41;hp=6769d8887644a1924d2fdc67974b1afa4df4083d;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=a295f8def17036c8071b56e181364f99a377cae7 diff --git a/src/Moof/Texture.cc b/src/Moof/Texture.cc index 6769d88..48e6e1b 100644 --- a/src/Moof/Texture.cc +++ b/src/Moof/Texture.cc @@ -1,59 +1,44 @@ -/******************************************************************************* - - Copyright (c) 2009, Charles McGarvey - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*******************************************************************************/ +/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +**] All rights reserved. +* +* vi:ts=4 sw=4 tw=75 +* +* Distributable under the terms and conditions of the 2-clause BSD license; +* see the file COPYING for a complete text of the license. +* +**************************************************************************/ #include // FILE #include // strncmp +#include #include #include "Dispatch.hh" -#include "Engine.hh" #include "Error.hh" -#include "Image.hh" -#include "Library.hh" +#include "Manager.hh" #include "Log.hh" #include "OpenGL.hh" +#include "Script.hh" #include "Texture.hh" +#include "Video.hh" namespace Mf { /** - * The texture implementation just contains all the information about the image - * which is worth having in memory. The image data itself is not worth keeping - * in memory if the texture has been loaded to GL, but the name of the resource - * is retained so that it can be reloaded if necessary. The implementation is a - * library so that multiple texture objects can share the same internal objects - * and avoid having duplicate textures loaded to GL. + * The texture implementation just contains all the information about the + * image which is worth having in memory. The image data itself is not + * worth keeping in memory if the texture has been loaded to GL, but the + * name of the resource is retained so that it can be reloaded if + * necessary. The implementation is a manager so that multiple texture + * objects can share the same internal objects and avoid having duplicate + * textures loaded to GL. */ -class Texture::Impl : public Library +class Texture::Impl : public Manager { /** @@ -75,9 +60,9 @@ class Texture::Impl : public Library } /** - * If the GL context was recreated, we need to reload the texture. This may - * involve reading it from disk again, but hopefully the OS was smart enough - * to cache it if the client has plenty of RAM. + * If the GL context was recreated, we need to reload the texture. + * This may involve reading it from disk again, but hopefully the OS + * was smart enough to cache it if the client has plenty of RAM. */ void contextRecreated() @@ -87,8 +72,9 @@ class Texture::Impl : public Library } /** - * This is a helper method used by some of the texture loading code. It - * returns the first power of two which is greater than the input value. + * This is a helper method used by some of the texture loading code. + * It returns the first power of two which is greater than the input + * value. */ static int powerOfTwo(int input) @@ -102,34 +88,45 @@ class Texture::Impl : public Library return value; } + + static void bindScriptConstants(Mf::Script& script) + { + script.push(GL_CLAMP); script.set("CLAMP"); + script.push(GL_REPEAT); script.set("REPEAT"); + script.push(GL_LINEAR); script.set("LINEAR"); + script.push(GL_NEAREST); script.set("NEAREST"); + script.push(GL_LINEAR_MIPMAP_LINEAR); + script.set("LINEAR_MIPMAP_LINEAR"); + script.push(GL_LINEAR_MIPMAP_NEAREST); + script.set("LINEAR_MIPMAP_NEAREST"); + script.push(GL_NEAREST_MIPMAP_LINEAR); + script.set("NEAREST_MIPMAP_LINEAR"); + script.push(GL_NEAREST_MIPMAP_NEAREST); + script.set("NEAREST_MIPMAP_NEAREST"); + } + public: /** * Construction is initialization. */ - explicit Impl(const std::string& name) : - Library(name), - //mContext(0), - mImage(Texture::getPath(getName())), - mWidth(0), - mHeight(0), - mMode(0), + Impl() : mMinFilter(GL_NEAREST), mMagFilter(GL_NEAREST), mWrapS(GL_CLAMP), mWrapT(GL_CLAMP), + mTilesS(1), + mTilesT(1), mObject(0) { - // make sure we have a video - VideoP video = engine.getVideo(); - ASSERT(video && "cannot load textures without a current video context"); + // make sure we have a video context + ASSERT(video && + "cannot load textures without a current video context"); // we want to know when the GL context is recreated - mDispatchHandler = engine.addHandler("video.newcontext", + mDispatchHandler = core.addHandler("video.newcontext", boost::bind(&Impl::contextRecreated, this)); - - loadFromFile(); } ~Impl() @@ -139,10 +136,10 @@ public: /** - * Adapted from some public domain code. This stuff is common enough that - * it really should be included in SDL_image... We need this because images - * loaded with SDL_image aren't exactly GL-ready right out of the box. This - * method makes them ready. + * Adapted from some public domain code. This stuff is common enough + * that it really should be included in SDL_image... We need this + * because images loaded with SDL_image aren't exactly GL-ready right + * out of the box. This method makes them ready. */ /* @@ -151,16 +148,17 @@ public: int w = powerOfTwo(surface->w); int h = powerOfTwo(surface->h); - // 2. OpenGL textures make more sense within the coordinate system when - // they are "upside down," so let's flip it. + // 2. OpenGL textures make more sense within the coordinate system + // when they are "upside down," so let's flip it. flipSurface(surface); - // 1. OpenGL images must (generally) have dimensions of a power-of-two. - // If this one doesn't, we can at least be more friendly by expanding - // the dimensions so that they are, though there will be some empty - // space within the range of normal texture coordinates. It's better if - // textures are the right size to begin with. + // 1. OpenGL images must (generally) have dimensions of a + // power-of-two. If this one doesn't, we can at least be more + // friendly by expanding the dimensions so that they are, though + // there will be some empty space within the range of normal + // texture coordinates. It's better if textures are the right size + // to begin with. SDL_Surface* image = SDL_CreateRGBSurface ( @@ -209,24 +207,61 @@ public: */ /** - * Use SDL_image to load images from file. A surface with the image data is - * returned. + * Use SDL_image to load images from file. A surface with the image + * data is returned. * @return Image data. */ - void loadFromFile() + void init(const std::string& name) { - if (!mImage.isValid()) + std::string path = Texture::getPath(name); + + mImage = Image::alloc(path); + if (!mImage->isValid()) + { + logWarning << "texture not found: " << path << std::endl; + Error(Error::RESOURCE_NOT_FOUND, path).raise(); + } + + mImage->flip(); + + Mf::Script script; + + importLogFunctions(script); + bindScriptConstants(script); + + if (script.doString(mImage->getComment()) != Mf::Script::SUCCESS) { - logWarning << "texture not found: " << getName() << std::endl; - throw Error(Error::RESOURCE_NOT_FOUND, getName()); + std::string str; + script[-1].get(str); + Mf::logWarning(str); } + else + { + Mf::logInfo << "loading tiles from texture " << path + << std::endl; + + Mf::Script::Slot globals = script.getGlobalTable(); + Mf::Script::Slot top = script[-1]; - mImage.flip(); + globals.pushField("tiles_s"); + top.get(mTilesS); - mWidth = mImage.getWidth(); - mHeight = mImage.getHeight(); - mMode = mImage.getColorMode(); + globals.pushField("tiles_t"); + top.get(mTilesT); + + globals.pushField("min_filter"); + top.get(mMinFilter); + + globals.pushField("mag_filter"); + top.get(mMagFilter); + + globals.pushField("wrap_s"); + top.get(mWrapS); + + globals.pushField("wrap_t"); + top.get(mWrapT); + } } @@ -243,8 +278,6 @@ public: return; } - //if (!mContext) loadFromFile(); - glGenTextures(1, &mObject); glBindTexture(GL_TEXTURE_2D, mObject); @@ -253,26 +286,23 @@ public: ( GL_TEXTURE_2D, 0, - mMode, + mImage->getMode(), //3, - mWidth, - mHeight, + mImage->getWidth(), + mImage->getHeight(), 0, - mMode, + mImage->getMode(), GL_UNSIGNED_BYTE, - mImage.getPixels() + mImage->getPixels() ); setProperties(); - - //SDL_FreeSurface(mContext); - //mContext = 0; } /** - * Sets some texture properties such as the filters and external coordinate - * behavior. + * Sets some texture properties such as the filters and external + * coordinate behavior. */ void setProperties() @@ -326,18 +356,37 @@ public: } - Image mImage; - unsigned mWidth; ///< Horizontal dimension of the image. - unsigned mHeight; ///< Vertical dimension. + bool getTileCoords(Texture::TileIndex index, Scalar coords[8]) const + { + // make sure the index represents a real tile + if (index >= mTilesS * mTilesT) return false; + + Scalar w = 1.0 / Scalar(mTilesS); + Scalar h = 1.0 / Scalar(mTilesT); + + coords[0] = Scalar(index % mTilesS) * w; + coords[1] = (Scalar(mTilesT - 1) - Scalar(index / mTilesS)) * h; + coords[2] = coords[0] + w; + coords[3] = coords[1]; + coords[4] = coords[2]; + coords[5] = coords[1] + h; + coords[6] = coords[0]; + coords[7] = coords[5]; + + return true; + } + + ImageP mImage; - GLuint mMode; ///< GL_RGB or GL_RGBA. - GLuint mMinFilter; ///< Minifcation filter. - GLuint mMagFilter; ///< Magnification filter. - GLuint mWrapS; ///< Wrapping behavior horizontally. - GLuint mWrapT; ///< Wrapping behavior vertically. + GLuint mMinFilter; ///< Minification filter. + GLuint mMagFilter; ///< Magnification filter. + GLuint mWrapS; ///< Wrapping behavior horizontally. + GLuint mWrapT; ///< Wrapping behavior vertically. + unsigned mTilesS; + unsigned mTilesT; - GLuint mObject; ///< GL texture handle. - static GLuint gObject; ///< Global GL texture handle. + GLuint mObject; ///< GL texture handle. + static GLuint gObject; ///< Global GL texture handle. Dispatch::Handler mDispatchHandler; }; @@ -346,6 +395,7 @@ GLuint Texture::Impl::gObject = 0; Texture::Texture(const std::string& name) : + Image(Texture::getPath(name)), // pass through mImpl(Texture::Impl::getInstance(name)) {} @@ -379,19 +429,6 @@ void Texture::resetBind() } -unsigned Texture::getWidth() const -{ - // pass through - return mImpl->mWidth; -} - -unsigned Texture::getHeight() const -{ - // pass through - return mImpl->mHeight; -} - - void Texture::setMinFilter(GLuint filter) { // pass through @@ -417,14 +454,56 @@ void Texture::setWrapT(GLuint wrap) } +bool Texture::getTileCoords(TileIndex index, Scalar coords[8]) const +{ + // pass through + return mImpl->getTileCoords(index, coords); +} + +bool Texture::getTileCoords(TileIndex index, Scalar coords[8], + Orientation orientation) const +{ + if (getTileCoords(index, coords)) + { + if (orientation & FLIP) + { + // this looks kinda weird, but it's just swapping in a way that + // doesn't require an intermediate variable + coords[1] = coords[5]; + coords[5] = coords[3]; + coords[3] = coords[7]; + coords[7] = coords[5]; + } + if (orientation & REVERSE) + { + coords[0] = coords[2]; + coords[2] = coords[6]; + coords[4] = coords[6]; + coords[6] = coords[0]; + } + + return true; + } + + return false; +} + + std::string Texture::getPath(const std::string& name) { - std::string path = Resource::getPath("textures/" + name + ".png"); - return path; + if (boost::find_last(name, ".png")) + { + return Resource::getPath(name); + } + else + { + std::string path("textures/"); + path += name; + path += ".png"; + return Resource::getPath(path); + } } } // namespace Mf -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -