summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-06-30 23:34:00 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-06-30 23:34:00 +0200
commit13135210973ac4254b4d6cbcb45fec0a7651276c (patch)
treee25d7aacc480ff57660f800943b7541b0815c1f4
parent804a080a971d4705e38ec008705f8a414bf7c798 (diff)
Use new Texture-API.HEADmaster
-rw-r--r--engine/enemy.cpp2
-rw-r--r--engine/engine.cpp2
-rw-r--r--engine/player.cpp2
-rw-r--r--engine/stage.cpp2
m---------wriggle0
5 files changed, 4 insertions, 4 deletions
diff --git a/engine/enemy.cpp b/engine/enemy.cpp
index 87e9e87..383ddc7 100644
--- a/engine/enemy.cpp
+++ b/engine/enemy.cpp
@@ -18,7 +18,7 @@ void Enemy::draw() {
glColor4f(1, 1, 1, 1);
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, texture->tex());
+ texture->bind();
glBegin(GL_POINTS);
glVertex2f(pos.x, pos.y);
diff --git a/engine/engine.cpp b/engine/engine.cpp
index 6d4a019..eccf495 100644
--- a/engine/engine.cpp
+++ b/engine/engine.cpp
@@ -69,7 +69,7 @@ void Engine::update() {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
- glBindTexture(GL_TEXTURE_2D, background->tex());
+ background->bind();
glBegin(GL_QUADS);
glTexCoord2f(0, 1);
glVertex2f(-1.9/9.0, 0);
diff --git a/engine/player.cpp b/engine/player.cpp
index 7d2ac08..c9a4ee2 100644
--- a/engine/player.cpp
+++ b/engine/player.cpp
@@ -23,7 +23,7 @@ void Player::draw() {
glColor4f(1, 1, 1, 1);
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, texture->tex());
+ texture->bind();
glBegin(GL_POINTS);
glVertex2f(x, y);
diff --git a/engine/stage.cpp b/engine/stage.cpp
index 59fda88..46e18a8 100644
--- a/engine/stage.cpp
+++ b/engine/stage.cpp
@@ -65,7 +65,7 @@ void Stage::draw() {
shader->use();
glPointSize(32.0);
glEnable(GL_TEXTURE_2D);
- glBindTexture(GL_TEXTURE_2D, texture->tex());
+ texture->bind();
for(std::vector<BulletPattern*>::iterator it = patterns.begin(); it < patterns.end(); it++) {
BulletPattern *bp = (*it);
diff --git a/wriggle b/wriggle
-Subproject d74b4f20e722ecd732e70e76985c7c936d0f82a
+Subproject ab8c1e0eeffedb0e5979874fba64b305effdb2d