From 13135210973ac4254b4d6cbcb45fec0a7651276c Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Wed, 30 Jun 2010 23:34:00 +0200 Subject: Use new Texture-API. --- engine/enemy.cpp | 2 +- engine/engine.cpp | 2 +- engine/player.cpp | 2 +- engine/stage.cpp | 2 +- wriggle | 2 +- 5 files changed, 5 insertions(+), 5 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::iterator it = patterns.begin(); it < patterns.end(); it++) { BulletPattern *bp = (*it); diff --git a/wriggle b/wriggle index d74b4f2..ab8c1e0 160000 --- a/wriggle +++ b/wriggle @@ -1 +1 @@ -Subproject commit d74b4f20e722ecd732e70e76985c7c936d0f82a2 +Subproject commit ab8c1e0eeffedb0e5979874fba64b305effdb2d3 -- cgit v1.2.3