~ubuntu-branches/debian/wheezy/gource/wheezy

« back to all changes in this revision

Viewing changes to src/core/texture.h

Committer: Package Import Robot
Author(s): Andrew Caudwell
Date: 2012-04-24 11:25:45 UTC
mfrom: (1.2.13)
Revision ID: package-import@ubuntu.com-20120424112545-18fbnycu9xrsl4s5

Tags: 0.38-1

http://bugs.debian.org/667189

* New upstream release (closes: #667189)
* New build dependencies on libglm-dev and libboost-filesystem-dev.

files added:
data/user.png

m4/m4_ax_boost_base.m4

m4/m4_ax_boost_filesystem.m4

m4/m4_ax_boost_system.m4

src/core/util.h

src/core/vectors.cpp

src/formats

src/formats/apache.cpp

src/formats/apache.h

src/formats/bzr.cpp

src/formats/bzr.h

src/formats/commitlog.cpp

src/formats/commitlog.h

src/formats/custom.cpp

src/formats/custom.h

src/formats/cvs-exp.cpp

src/formats/cvs-exp.h

src/formats/cvs2cl.cpp

src/formats/cvs2cl.h

src/formats/git.cpp

src/formats/git.h

src/formats/gitraw.cpp

src/formats/gitraw.h

src/formats/hg.cpp

src/formats/hg.h

src/formats/svn.cpp

src/formats/svn.h

src/logmill.cpp

src/logmill.h

files removed:
data/cursor.png

data/no_photo.png

src/apache.cpp

src/apache.h

src/bzr.cpp

src/bzr.h

src/commitlog.cpp

src/commitlog.h

src/core/camera.cpp

src/core/camera.h

src/custom.cpp

src/custom.h

src/cvs-exp.cpp

src/cvs-exp.h

src/cvs2cl.cpp

src/cvs2cl.h

src/git.cpp

src/git.h

src/gitraw.cpp

src/gitraw.h

src/hg.cpp

src/hg.h

src/svn.cpp

src/svn.h

files modified:
ChangeLog

INSTALL

Makefile.am

Makefile.in

README

aclocal.m4

configure

configure.ac

data/file.png

data/fonts/FreeSans.ttf

data/fonts/README

data/gource.1

data/shaders/text.frag

debian/changelog

debian/control

gource.win32.cbp

src/action.cpp

src/action.h

src/bloom.cpp

src/bloom.h

src/core/bounds.h

src/core/conffile.cpp

src/core/conffile.h

src/core/display.cpp

src/core/display.h

src/core/frustum.cpp

src/core/frustum.h

src/core/fxfont.cpp

src/core/fxfont.h

src/core/gl.h

src/core/logger.cpp

src/core/logger.h

src/core/mousecursor.cpp

src/core/mousecursor.h

src/core/plane.cpp

src/core/plane.h

src/core/ppm.cpp

src/core/ppm.h

src/core/quadtree.cpp

src/core/quadtree.h

src/core/resource.cpp

src/core/resource.h

src/core/sdlapp.cpp

src/core/sdlapp.h

src/core/seeklog.cpp

src/core/settings.cpp

src/core/settings.h

src/core/shader.cpp

src/core/shader.h

src/core/stringhash.cpp

src/core/stringhash.h

src/core/texture.cpp

src/core/texture.h

src/core/utf8/checked.h

src/core/vbo.cpp

src/core/vbo.h

src/core/vectors.h

src/dirnode.cpp

src/dirnode.h

src/file.cpp

src/file.h

src/gource.cpp

src/gource.h

src/gource_settings.cpp

src/gource_settings.h

src/gource_shell.cpp

src/gource_shell.h

src/key.cpp

src/key.h

src/main.cpp

src/pawn.cpp

src/pawn.h

src/slider.cpp

src/slider.h

src/spline.cpp

src/spline.h

src/textbox.cpp

src/textbox.h

src/user.cpp

src/user.h

src/zoomcamera.cpp

src/zoomcamera.h

Show diffs side-by-side

added added

removed removed

src/core/texture.h

#include "SDL_image.h"

#include "resource.h"

#include "display.h"

#include "gl.h"

class TextureException : public ResourceException {

public:

};

class TextureResource : public Resource {

int colourFormat(SDL_Surface* surface);

void loadTexture(std::string file, bool mipmaps, bool clamp, bool trilinear, bool external_file);

bool mipmaps;

GLint wrap;

GLint min_filter;

GLint mag_filter;

std::string filename;

GLenum colourFormat(SDL_Surface* surface);

public:

int w, h;

GLenum target;

GLenum format;

GLuint textureid;

TextureResource(std::string name, bool mipmaps, bool clamp, bool trilinear, bool external_file);

GLubyte* data;

TextureResource();

TextureResource(int width, int height, bool mipmaps, GLint wrap, GLenum format, GLubyte* data = 0);

TextureResource(const std::string& filename, bool mipmaps, GLint wrap, bool external);

void setWrapStyle(GLint wrap);

void setFiltering(GLint min_filter, GLint mag_filter);

void setDefaultFiltering();

void bind();

void createTexture();

void reload();

void load(bool reload = false);

void unload();

~TextureResource();

};

class TextureManager : public ResourceManager {

int resource_seq;

void addResource(TextureResource* r);

public:

bool trilinear;

TextureManager();

TextureResource* grabFile(std::string name, bool mipmaps=true, bool clamp=true, bool trilinear=false);

TextureResource* grab(std::string file, bool mipmaps=true, bool clamp=true, bool trilinear=false, bool external_file = false);

TextureResource* grabFile(const std::string& filename, bool mipmaps = true, GLint wrap = GL_CLAMP_TO_EDGE);

TextureResource* grab(const std::string& filename, bool mipmaps = true, GLint wrap = GL_CLAMP_TO_EDGE, bool external_file = false);

TextureResource* create(int width, int height, bool mipmaps, GLint wrap, GLenum format, GLubyte* data = 0);

TextureResource* create(GLenum target = GL_TEXTURE_2D);

void unload();

void reload();

};

extern TextureManager texturemanager;

Older »