From 77361abc13c02469d41af5d937adf517ac5326b9 Mon Sep 17 00:00:00 2001
From: Vegard Storheil Eriksen <zyp@jvnv.net>
Date: Sat, 27 Feb 2010 23:48:41 +0100
Subject: Added SDL_image based texture loader.

---
 pattern.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'pattern.cpp')

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")) {
+}
-- 
cgit v1.2.3