diff options
author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-02-27 23:48:41 +0100 |
---|---|---|
committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-02-27 23:48:41 +0100 |
commit | 77361abc13c02469d41af5d937adf517ac5326b9 (patch) | |
tree | 2d2fa8316867349413764dee21eade239fe8d8ce /pattern.cpp | |
parent | b353185ff989e2dd058284dc5b1a6d5d6197bcbd (diff) |
Added SDL_image based texture loader.
Diffstat (limited to 'pattern.cpp')
-rw-r--r-- | pattern.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pattern.cpp b/pattern.cpp index 87d39f3..63b3bcc 100644 --- a/pattern.cpp +++ b/pattern.cpp @@ -8,7 +8,7 @@ #include <SDL/SDL.h> #include <SDL/SDL_opengl.h> -#include "texturepng.h" +#include "texturesdl.h" Pattern::Pattern(std::string filename) { patt_width = 25.0; @@ -29,12 +29,11 @@ void Pattern::update(ARMarkerInfo* marker_info, int marker_num) { } } -KakePattern::KakePattern() : Pattern("patt.hiro") { - - tex = new TexturePNG("foo.png"); +SpritePattern::SpritePattern(Texture* _tex) : Pattern("patt.jon") { + tex = _tex; } -void KakePattern::draw() { +void SpritePattern::draw() { double gl_para[16]; arglCameraView(patt_trans_kake, gl_para, 1.0); @@ -55,3 +54,6 @@ void KakePattern::draw() { glVertex3f(30, -30, 0); glEnd(); } + +KakePattern::KakePattern() : SpritePattern(new TextureSDL("foo.png")) { +} |